228039 2021-07-16 15:31:40 -0700 PCM: Add early return when unlinkable token is used and add more happy path Web Inspector logging 2021-07-16 16:53:32 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander bfulgham katherine_cheney webkit-bug-importer oldest_to_newest 1777629 0 wilander 2021-07-16 15:31:40 -0700 We should do an early return when an accepted unlinkable token transaction is happening. We should also add more Web Inspector logging to the happy path for better developer feedback. 1777630 1 webkit-bug-importer 2021-07-16 15:32:06 -0700 <rdar://problem/80705989> 1777631 2 433711 wilander 2021-07-16 15:38:18 -0700 Created attachment 433711 Patch 1777644 3 433711 katherine_cheney 2021-07-16 16:18:43 -0700 Comment on attachment 433711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433711&action=review r=me > Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp:100 > + return; Nice catch. 1777649 4 433711 wilander 2021-07-16 16:46:07 -0700 Comment on attachment 433711 Patch Thank you, Kate! 1777655 5 ews-feeder 2021-07-16 16:53:31 -0700 Committed r280009 (239751@main): <https://commits.webkit.org/239751@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 433711. 433711 2021-07-16 15:38:18 -0700 2021-07-16 16:53:31 -0700 Patch bug-228039-20210716153817.patch text/plain 5050 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5OTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM1YmFlY2Y4ZDNlY2U5Nzgw NjM4ZDlkYmZiNjc2NWRhZjAxMTZlMDguLjdiNmFmMmZmYTY2MzZlY2Q4MDk4NmE5N2Y5MjI1N2Mx MGUwZTFjY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEtMDctMTYgIEpvaG4gV2ls YW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgUENNOiBBZGQgZWFybHkgcmV0 dXJuIHdoZW4gdW5saW5rYWJsZSB0b2tlbiBpcyB1c2VkIGFuZCBhZGQgbW9yZSBoYXBweSBwYXRo IFdlYiBJbnNwZWN0b3IgbG9nZ2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjI4MDM5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MDcwNTk4OT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSdz IGEgbWlzc2luZyByZXR1cm4gYWZ0ZXIgYW4gYWNjZXB0ZWQgdW5saW5rYWJsZSB0b2tlbiB0cmFu c2FjdGlvbi4gVGhlCisgICAgICAgIGF0dHJpYnV0aW9uIG9iamVjdCBpcyB0aGVyZWZvcmUgbW92 ZWQgYW5kIHN0b3JlZCB0d2ljZS4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gYWRkcyBtb3Jl IFdlYiBJbnNwZWN0b3IgbG9nZ2luZyB0byB0aGUgaGFwcHkgcGF0aCBmb3IgYmV0dGVyCisgICAg ICAgIGRldmVsb3BlciBmZWVkYmFjay4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuY3BwOgor ICAgICAgICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnN0b3JlVW5h dHRyaWJ1dGVkKToKKyAgICAgICAgICAgIEFkZCB0aGUgbWlzc2luZyByZXR1cm4uCisgICAgICAg IChXZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6Z2V0VG9rZW5QdWJsaWNL ZXkpOgorICAgICAgICAgICAgQWRkIFdlYiBJbnNwZWN0b3IgbG9nZ2luZy4KKyAgICAgICAgKFdl YktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpnZXRTaWduZWRVbmxpbmthYmxl VG9rZW4pOgorICAgICAgICAgICAgQWRkIFdlYiBJbnNwZWN0b3IgbG9nZ2luZy4KKyAgICAgICAg KFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpoYW5kbGVBdHRyaWJ1dGlv bik6CisgICAgICAgICAgICBBZGQgV2ViIEluc3BlY3RvciBsb2dnaW5nLgorCiAyMDIxLTA3LTE2 ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEFkb3B0 IEJpZnVyY2F0ZWRHcmFwaGljc0NvbnRleHQgZm9yIGJhY2tpbmcgc3RvcmUgKyBkaXNwbGF5IGxp c3QgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcCBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcApp bmRleCBmZTcwNzIyOGExNGQxYzMzNjQwOGQ0NmYyN2VlM2FlZjQyMmZiMTA1Li4yMTNjYTdjNmMz NWMwNDY0MGNmMTQxNjRhZGNlOGU1NTgyYTM1ZWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5jcHAKKysrIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFn ZXIuY3BwCkBAIC05Nyw2ICs5Nyw3IEBAIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5h Z2VyOjpzdG9yZVVuYXR0cmlidXRlZChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCYmCiAjZW5kaWYK IAogICAgICAgICAgICAgZ2V0U2lnbmVkVW5saW5rYWJsZVRva2VuKFdURk1vdmUoYXR0cmlidXRp b24pKTsKKyAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfSk7CiAgICAgfQogCkBAIC0xNzQs NiArMTc1LDggQEAgdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmdldFRva2Vu UHVibGljS2V5KFByaXZhdGVDbGlja01lYXN1cmVtZW50JiYKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgfQogCisgICAgICAgIG1fbmV0d29ya1Byb2Nlc3MtPmJyb2FkY2FzdENvbnNvbGVN ZXNzYWdlKG1fc2Vzc2lvbklELCBNZXNzYWdlU291cmNlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVu dCwgTWVzc2FnZUxldmVsOjpMb2csIG1ha2VTdHJpbmcoIltQcml2YXRlIENsaWNrIE1lYXN1cmVt ZW50XSBHb3QgSlNPTiByZXNwb25zZSBmb3IgdG9rZW4gcHVibGljIGtleSByZXF1ZXN0LiJfcykp OworCiAgICAgICAgIGNhbGxiYWNrKFdURk1vdmUoYXR0cmlidXRpb24pLCBqc29uT2JqZWN0LT5n ZXRTdHJpbmcoInRva2VuX3B1YmxpY19rZXkiX3MpKTsKICAgICB9KTsKIApAQCAtMjE2LDkgKzIx OSwxMCBAQCB2b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6Z2V0U2lnbmVkVW5s aW5rYWJsZVRva2VuKFByaXZhdGVDbGlja01lYXN1cgogICAgICAgICB9CiAKICAgICAgICAgYXV0 byBzaWduYXR1cmVCYXNlNjRVUkwgPSBqc29uT2JqZWN0LT5nZXRTdHJpbmcoInVubGlua2FibGVf dG9rZW4iX3MpOwotICAgICAgICBpZiAoc2lnbmF0dXJlQmFzZTY0VVJMLmlzRW1wdHkoKSkKKyAg ICAgICAgaWYgKHNpZ25hdHVyZUJhc2U2NFVSTC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIG1f bmV0d29ya1Byb2Nlc3MtPmJyb2FkY2FzdENvbnNvbGVNZXNzYWdlKG1fc2Vzc2lvbklELCBNZXNz YWdlU291cmNlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwgTWVzc2FnZUxldmVsOjpFcnJvciwg bWFrZVN0cmluZygiW1ByaXZhdGUgQ2xpY2sgTWVhc3VyZW1lbnRdIEpTT04gcmVzcG9uc2UgZG9l c24ndCBoYXZlIHRoZSBrZXkgJ3VubGlua2FibGVfdG9rZW4nIGZvciB0b2tlbiBzaWduaW5nIHJl cXVlc3QuIl9zKSk7CiAgICAgICAgICAgICByZXR1cm47Ci0KKyAgICAgICAgfQogICAgICAgICAv LyBGSVggTk9XIQogICAgICAgICBpZiAobV9mcmF1ZFByZXZlbnRpb25WYWx1ZXNGb3JUZXN0aW5n KQogICAgICAgICAgICAgYXR0cmlidXRpb24uc2V0U291cmNlU2VjcmV0VG9rZW4oeyBtX2ZyYXVk UHJldmVudGlvblZhbHVlc0ZvclRlc3RpbmctPnNlY3JldFRva2VuLCBtX2ZyYXVkUHJldmVudGlv blZhbHVlc0ZvclRlc3RpbmctPnNpZ25hdHVyZSwgbV9mcmF1ZFByZXZlbnRpb25WYWx1ZXNGb3JU ZXN0aW5nLT5rZXlJRCB9KTsKQEAgLTI1MSwxNSArMjU1LDE3IEBAIHZvaWQgUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRNYW5hZ2VyOjpoYW5kbGVBdHRyaWJ1dGlvbihBdHRyaWJ1dGlvblRyaWdnZXJE YXRhJiYKICAgICBhdXRvJiBmaXJzdFBhcnR5VVJMID0gcmVkaXJlY3RSZXF1ZXN0LmZpcnN0UGFy dHlGb3JDb29raWVzKCk7CiAKICAgICBpZiAoIXJlZGlyZWN0RG9tYWluLm1hdGNoZXMocmVxdWVz dFVSTCkpIHsKLSAgICAgICAgbV9uZXR3b3JrUHJvY2Vzcy0+YnJvYWRjYXN0Q29uc29sZU1lc3Nh Z2UobV9zZXNzaW9uSUQsIE1lc3NhZ2VTb3VyY2U6OlByaXZhdGVDbGlja01lYXN1cmVtZW50LCBN ZXNzYWdlTGV2ZWw6Oldhcm5pbmcsICJbUHJpdmF0ZSBDbGljayBNZWFzdXJlbWVudF0gQXR0cmli dXRpb24gd2FzIG5vdCBhY2NlcHRlZCBiZWNhdXNlIHRoZSBIVFRQIHJlZGlyZWN0IHdhcyBub3Qg c2FtZS1zaXRlLiJfcyk7CisgICAgICAgIG1fbmV0d29ya1Byb2Nlc3MtPmJyb2FkY2FzdENvbnNv bGVNZXNzYWdlKG1fc2Vzc2lvbklELCBNZXNzYWdlU291cmNlOjpQcml2YXRlQ2xpY2tNZWFzdXJl bWVudCwgTWVzc2FnZUxldmVsOjpXYXJuaW5nLCAiW1ByaXZhdGUgQ2xpY2sgTWVhc3VyZW1lbnRd IFRyaWdnZXJpbmcgZXZlbnQgd2FzIG5vdCBhY2NlcHRlZCBiZWNhdXNlIHRoZSBIVFRQIHJlZGly ZWN0IHdhcyBub3Qgc2FtZS1zaXRlLiJfcyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAg ICBpZiAocmVkaXJlY3REb21haW4ubWF0Y2hlcyhmaXJzdFBhcnR5VVJMKSkgewotICAgICAgICBt X25ldHdvcmtQcm9jZXNzLT5icm9hZGNhc3RDb25zb2xlTWVzc2FnZShtX3Nlc3Npb25JRCwgTWVz c2FnZVNvdXJjZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQsIE1lc3NhZ2VMZXZlbDo6V2Fybmlu ZywgIltQcml2YXRlIENsaWNrIE1lYXN1cmVtZW50XSBBdHRyaWJ1dGlvbiB3YXMgbm90IGFjY2Vw dGVkIGJlY2F1c2UgaXQgd2FzIHJlcXVlc3RlZCBpbiBhbiBIVFRQIHJlZGlyZWN0IHRoYXQgaXMg c2FtZS1zaXRlIGFzIHRoZSBmaXJzdC1wYXJ0eS4iX3MpOworICAgICAgICBtX25ldHdvcmtQcm9j ZXNzLT5icm9hZGNhc3RDb25zb2xlTWVzc2FnZShtX3Nlc3Npb25JRCwgTWVzc2FnZVNvdXJjZTo6 UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQsIE1lc3NhZ2VMZXZlbDo6V2FybmluZywgIltQcml2YXRl IENsaWNrIE1lYXN1cmVtZW50XSBUcmlnZ2VyaW5nIGV2ZW50IHdhcyBub3QgYWNjZXB0ZWQgYmVj YXVzZSBpdCB3YXMgcmVxdWVzdGVkIGluIGFuIEhUVFAgcmVkaXJlY3QgdGhhdCBpcyBzYW1lLXNp dGUgYXMgdGhlIGZpcnN0LXBhcnR5LiJfcyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAg ICBtX25ldHdvcmtQcm9jZXNzLT5icm9hZGNhc3RDb25zb2xlTWVzc2FnZShtX3Nlc3Npb25JRCwg TWVzc2FnZVNvdXJjZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQsIE1lc3NhZ2VMZXZlbDo6TG9n LCAiW1ByaXZhdGUgQ2xpY2sgTWVhc3VyZW1lbnRdIFRyaWdnZXJpbmcgZXZlbnQgYWNjZXB0ZWQu Il9zKTsKKwogICAgIGF0dHJpYnV0ZShTb3VyY2VTaXRlIHsgV1RGTW92ZShyZWRpcmVjdERvbWFp bikgfSwgQXR0cmlidXRpb25EZXN0aW5hdGlvblNpdGUgeyBmaXJzdFBhcnR5VVJMIH0sIFdURk1v dmUoYXR0cmlidXRpb25UcmlnZ2VyRGF0YSkpOwogfQogCg==