231829 2021-10-15 13:49:11 -0700 Start using adattributiond on iOS 2021-10-19 11:54:30 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen beidson webkit-bug-importer oldest_to_newest 1804992 0 achristensen 2021-10-15 13:49:11 -0700 Start using adattributiond on iOS 1804993 1 441422 achristensen 2021-10-15 13:50:19 -0700 Created attachment 441422 Patch 1805199 2 achristensen 2021-10-15 21:21:53 -0700 I verified manually that this works on an iOS device by doing these steps: 1. Allow the network process sandbox to access com.apple.webkit.adattributiond.service 2. Move the adattributiond binary into place 3. Move com.apple.webkit.adattributiond.plist into place 4. reboot 5. Run through John's PCM demo and observe that it works 6. Verify that it was indeed using the daemon The daemon's peak memory use was 2705k which is well within our limit. http://trac.webkit.org/r284304 1805200 3 webkit-bug-importer 2021-10-15 21:22:15 -0700 <rdar://problem/84326862> 1806204 4 achristensen 2021-10-19 11:54:30 -0700 r284474 441422 2021-10-15 13:50:19 -0700 2021-10-15 17:00:21 -0700 Patch bug-231829-20211015135019.patch text/plain 11579 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MjUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDIwNWQ5MGU3YWNkNmE3YTFm ZDM4ZDY3ZjRkZTYwMmY3MGZjM2NiZmMuLjliOWZmMjk3MmY4ZDAzMGEwMGQ0M2M0NWVkMDNmYTZm YTZhMzQyMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMTAtMTUgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBTdGFydCB1c2lu ZyBhZGF0dHJpYnV0aW9uZCBvbiBpT1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzMTgyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgbWFrZXMgb25lIHNtYWxsIGNoYW5nZSB0byB1c2UgYWRhdHRy aWJ1dGlvbmQgb24gaU9TIGJ5IGRlZmF1bHQgaW5zdGVhZCBvZiB0aGUgbmV0d29yayBwcm9jZXNz LgorICAgICAgICBUaGUgcmVzdCBvZiB0aGlzIHBhdGNoIGlzIHRvIGtlZXAgdGhlIHRlc3RzIGRv aW5nIHdoYXQgdGhleSB1c2VkIHRvLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLV2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYuY3BwOgorICAgICAgICAoV0tXZWJzaXRlRGF0 YVN0b3JlQ29uZmlndXJhdGlvbkNvcHlQQ01NYWNoU2VydmljZU5hbWUpOgorICAgICAgICAoV0tX ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvblNldFBDTU1hY2hTZXJ2aWNlTmFtZSk6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZUNvbmZp Z3VyYXRpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJh dGlvbjo6V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24pOgorCiAyMDIxLTEwLTE1ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQgbWFjY2F0YWx5c3QgYnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvblJlZi5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9u UmVmLmNwcAppbmRleCAyMzM3YjYzMDM1YjY0N2Q0MDk5MjMwNTQyMWJmMWRjNmY2OGFhYWQ0Li44 MDcyMjljN2Y3Yjk1MGZjZTEzYjMxMTkyNzZmYmYzZWZiYWRhZjE0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9u UmVmLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1dlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uUmVmLmNwcApAQCAtMTc5LDMgKzE3OSwxMyBAQCB2b2lkIFdLV2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25TZXRTdGFsZVdoaWxlUmV2YWxpZGF0ZUVuYWJsZWQo V0tXZWJzaXRlRGF0YQogewogICAgIFdlYktpdDo6dG9JbXBsKGNvbmZpZ3VyYXRpb24pLT5zZXRT dGFsZVdoaWxlUmV2YWxpZGF0ZUVuYWJsZWQoZW5hYmxlZCk7CiB9CisKK1dLU3RyaW5nUmVmIFdL V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25Db3B5UENNTWFjaFNlcnZpY2VOYW1lKFdLV2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbikKK3sKKyAgICByZXR1 cm4gV2ViS2l0Ojp0b0NvcGllZEFQSShXZWJLaXQ6OnRvSW1wbChjb25maWd1cmF0aW9uKS0+cGNt TWFjaFNlcnZpY2VOYW1lKCkpOworfQorCit2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3Vy YXRpb25TZXRQQ01NYWNoU2VydmljZU5hbWUoV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlv blJlZiBjb25maWd1cmF0aW9uLCBXS1N0cmluZ1JlZiBuYW1lKQoreworICAgIFdlYktpdDo6dG9J bXBsKGNvbmZpZ3VyYXRpb24pLT5zZXRQQ01NYWNoU2VydmljZU5hbWUobmFtZSA/IFdlYktpdDo6 dG9JbXBsKG5hbWUpLT5zdHJpbmcoKSA6IFN0cmluZygpKTsKK30KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25S ZWYuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZUNv bmZpZ3VyYXRpb25SZWYuaAppbmRleCA0ZWE4ZjEzZjVjNDNlYzA4ZTc1NGIwZTQ0Y2E2NTk5OTM2 YThlOGYyLi41ODBkYTE1ODIxZmRmYzlkZjFiOTU4NDgyZGQ3MDBkNmZhN2EwYjYxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVDb25m aWd1cmF0aW9uUmVmLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tXZWJz aXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvblJlZi5oCkBAIC03OCw2ICs3OCw5IEBAIFdLX0VYUE9S VCB2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25TZXRUZXN0aW5nU2Vzc2lvbkVu YWJsZWQoV0tXZWJzaXRlCiBXS19FWFBPUlQgYm9vbCBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1 cmF0aW9uR2V0U3RhbGVXaGlsZVJldmFsaWRhdGVFbmFibGVkKFdLV2Vic2l0ZURhdGFTdG9yZUNv bmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbik7CiBXS19FWFBPUlQgdm9pZCBXS1dlYnNpdGVE YXRhU3RvcmVDb25maWd1cmF0aW9uU2V0U3RhbGVXaGlsZVJldmFsaWRhdGVFbmFibGVkKFdLV2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbiwgYm9vbCBlbmFibGVk KTsKIAorV0tfRVhQT1JUIFdLU3RyaW5nUmVmIFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRp b25Db3B5UENNTWFjaFNlcnZpY2VOYW1lKFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25S ZWYgY29uZmlndXJhdGlvbik7CitXS19FWFBPUlQgdm9pZCBXS1dlYnNpdGVEYXRhU3RvcmVDb25m aWd1cmF0aW9uU2V0UENNTWFjaFNlcnZpY2VOYW1lKFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3Vy YXRpb25SZWYgY29uZmlndXJhdGlvbiwgV0tTdHJpbmdSZWYgbmFtZSk7CisKICNpZmRlZiBfX2Nw bHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5j cHAKaW5kZXggY2MwODQ3ODU0NGQzYmJkOWRmZGQ4Nzg2ZjliMDE1Y2JiZDg4OWM4MS4uNTBjMDZj YWU2OTZlOTIxMzVhZjE2YjljY2I0NTRhN2YzZWY1MDE1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uLmNwcApAQCAtNTEsNyArNTEsOSBAQCBXZWJzaXRlRGF0YVN0b3Jl Q29uZmlndXJhdGlvbjo6V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24oSXNQZXJzaXN0ZW50 IGlzUGVycwogI2lmIEVOQUJMRShBUktJVF9JTkxJTkVfUFJFVklFVykKICAgICAgICAgc2V0TW9k ZWxFbGVtZW50Q2FjaGVEaXJlY3RvcnkoV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdE1vZGVsRWxl bWVudENhY2hlRGlyZWN0b3J5KCkpOwogI2VuZGlmCi0gICAgICAgIC8vIEZJWE1FOiBHaXZlIG1f cGNtTWFjaFNlcnZpY2VOYW1lIGEgZGVmYXVsdCB2YWx1ZSBhbmQgcmVtb3ZlIFBDTTo6TWFuYWdl ckludGVyZmFjZSBvbmNlIHJkYXI6Ly84MDcwMTA5OCBpcyBjbG9zZWQuCisjaWYgUExBVEZPUk0o SU9TKQorICAgICAgICBzZXRQQ01NYWNoU2VydmljZU5hbWUoImNvbS5hcHBsZS53ZWJraXQuYWRh dHRyaWJ1dGlvbmQuc2VydmljZSIpOworI2VuZGlmCiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODFmYTIzMTVjMjc5NjBlZmJi YWUyYWFkYTQ1MWZhNDNmNzBhYWE4OS4uNjI0YTg4NmFkYjFjYzBiYzExNzAxNTMzZTg0NTEyNWZj YmIxNmI0NyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTEwLTE1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3RhcnQgdXNpbmcgYWRhdHRyaWJ1dGlvbmQg b24gaU9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzE4MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRXZlbnRBdHRyaWJ1dGlvbi5tbToKKyAg ICAgICAgKFRlc3RXZWJLaXRBUEk6OmNvbmZpZ3VyYXRpb25XaXRob3V0VXNpbmdEYWVtb24pOgor ICAgICAgICAoVGVzdFdlYktpdEFQSTo6d2ViVmlld1dpdGhvdXRVc2luZ0RhZW1vbik6CisgICAg ICAgIChUZXN0V2ViS2l0QVBJOjpydW5CYXNpY1BDTVRlc3QpOgorICAgICAgICAoVGVzdFdlYktp dEFQSTo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Q cml2YXRlQ2xpY2tNZWFzdXJlbWVudC5tbToKKyAgICAgICAgKHdlYlZpZXdXaXRoUmVzb3VyY2VM b2FkU3RhdGlzdGljc0VuYWJsZWRJbk5ldHdvcmtQcm9jZXNzKToKKyAgICAgICAgKiBXZWJLaXRU ZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xs ZXI6OmNvbmZpZ3VyZVdlYnNpdGVEYXRhU3RvcmVUZW1wb3JhcnlEaXJlY3Rvcmllcyk6CisKIDIw MjEtMTAtMTQgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CiAKICAgICAgICAg VGVzdFdlYktpdEFQSS5Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC5GcmF1ZFByZXZlbnRpb24gaXMg YSBjb25zdGFudCB0aW1lb3V0CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL0V2ZW50QXR0cmlidXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL0V2ZW50QXR0cmlidXRpb24ubW0KaW5kZXggNDRhYjVmODkyNzgwNmE2 NjJhMTM4MGU2ZjI1ZGZiZTY4YWRhMTI1Yi4uOWY3OTEwNmEzMDZkYTkyZjg3MmMxMWUyODEwYWZl ZjU5MDAzZjJiMSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9FdmVudEF0dHJpYnV0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvRXZlbnRBdHRyaWJ1dGlvbi5tbQpAQCAtMTIwLDYgKzEyMCwyMCBAQCBzdGF0 aWMgdm9pZCBjbGVhclN0YXRlKCkKICAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJd IHJlbW92ZUl0ZW1BdFVSTDphZG9wdE5TKFtbX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRp b24gYWxsb2NdIGluaXRdKS5nZXQoKS5fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSBl cnJvcjpuaWxdOwogfQogCitzdGF0aWMgUmV0YWluUHRyPFdLV2ViVmlld0NvbmZpZ3VyYXRpb24+ IGNvbmZpZ3VyYXRpb25XaXRob3V0VXNpbmdEYWVtb24oKQoreworICAgIGF1dG8gZGF0YVN0b3Jl Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9u IG5ld10pOworICAgIGRhdGFTdG9yZUNvbmZpZ3VyYXRpb24uZ2V0KCkucGNtTWFjaFNlcnZpY2VO YW1lID0gbmlsOworICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1dLV2ViVmlld0Nv bmZpZ3VyYXRpb24gbmV3XSk7CisgICAgY29uZmlndXJhdGlvbi5nZXQoKS53ZWJzaXRlRGF0YVN0 b3JlID0gYWRvcHROUyhbW1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxvY10gX2luaXRXaXRoQ29uZmln dXJhdGlvbjpkYXRhU3RvcmVDb25maWd1cmF0aW9uLmdldCgpXSkuZ2V0KCk7CisgICAgcmV0dXJu IGNvbmZpZ3VyYXRpb247Cit9CisKK3N0YXRpYyBSZXRhaW5QdHI8V0tXZWJWaWV3PiB3ZWJWaWV3 V2l0aG91dFVzaW5nRGFlbW9uKCkKK3sKKyAgICByZXR1cm4gYWRvcHROUyhbW1dLV2ViVmlldyBh bGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlv bldpdGhvdXRVc2luZ0RhZW1vbigpLmdldCgpXSk7Cit9CisKIHZvaWQgcnVuQmFzaWNQQ01UZXN0 KFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gKmNvbmZpZ3VyYXRpb24sIEZ1bmN0aW9uPHZvaWQoV0tX ZWJWaWV3ICosIGNvbnN0IEhUVFBTZXJ2ZXImKT4mJiBhZGRBdHRyaWJ1dGlvblRvV2ViVmlldykK IHsKICAgICBjbGVhclN0YXRlKCk7CkBAIC0xNTYsNyArMTcwLDcgQEAgdm9pZCBydW5CYXNpY1BD TVRlc3QoV0tXZWJWaWV3Q29uZmlndXJhdGlvbiAqY29uZmlndXJhdGlvbiwgRnVuY3Rpb248dm9p ZChXS1dlYlYKICAgICB9LCBIVFRQU2VydmVyOjpQcm90b2NvbDo6SHR0cHMpOwogICAgIE5TVVJM ICpzZXJ2ZXJVUkwgPSBzZXJ2ZXIucmVxdWVzdCgpLlVSTDsKIAotICAgIGF1dG8gd2ViVmlldyA9 IGNvbmZpZ3VyYXRpb24gPyBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1l OkNHUmVjdFplcm8gY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uXSkgOiBhZG9wdE5TKFtXS1dl YlZpZXcgbmV3XSk7CisgICAgYXV0byB3ZWJWaWV3ID0gY29uZmlndXJhdGlvbiA/IGFkb3B0TlMo W1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0WmVybyBjb25maWd1cmF0aW9u OmNvbmZpZ3VyYXRpb25dKSA6IHdlYlZpZXdXaXRob3V0VXNpbmdEYWVtb24oKTsKICAgICB3ZWJW aWV3LmdldCgpLm5hdmlnYXRpb25EZWxlZ2F0ZSA9IGRlbGVnYXRlQWxsb3dpbmdBbGxUTFMoKTsK ICAgICBhZGRBdHRyaWJ1dGlvblRvV2ViVmlldyh3ZWJWaWV3LmdldCgpLCBzZXJ2ZXIpOwogICAg IFtbd2ViVmlldyBjb25maWd1cmF0aW9uXS53ZWJzaXRlRGF0YVN0b3JlIF9zZXRSZXNvdXJjZUxv YWRTdGF0aXN0aWNzRW5hYmxlZDpZRVNdOwpAQCAtMzA3LDcgKzMyMSw3IEBAIFRFU1QoUHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnQsIEZyYXVkUHJldmVudGlvbikKICAgICB9LCBIVFRQU2VydmVyOjpQ cm90b2NvbDo6SHR0cHMpOwogICAgIE5TVVJMICpzZXJ2ZXJVUkwgPSBzZXJ2ZXIucmVxdWVzdCgp LlVSTDsKIAotICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1dLV2ViVmlldyBuZXddKTsKKyAg ICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3V2l0aG91dFVzaW5nRGFlbW9uKCk7CiAgICAgd2ViVmll dy5nZXQoKS5uYXZpZ2F0aW9uRGVsZWdhdGUgPSBkZWxlZ2F0ZUFsbG93aW5nQWxsVExTKCk7CiAg ICAgW3dlYlZpZXcgX2FkZEV2ZW50QXR0cmlidXRpb25XaXRoU291cmNlSUQ6NDIgZGVzdGluYXRp b25VUkw6ZXhhbXBsZVVSTCgpIHNvdXJjZURlc2NyaXB0aW9uOkAidGVzdCBzb3VyY2UgZGVzY3Jp cHRpb24iIHB1cmNoYXNlcjpAInRlc3QgcHVyY2hhc2VyIiByZXBvcnRFbmRwb2ludDpzZXJ2ZXJV Ukwgb3B0aW9uYWxOb25jZTpAIkFCQ0RFRmFiY2RlZjAxMjM0NTY3ODkiIGFwcGxpY2F0aW9uQnVu ZGxlSUQ6QCJ0ZXN0LmJ1bmRsZS5pZCJdOwogICAgIFtbd2ViVmlldyBjb25maWd1cmF0aW9uXS53 ZWJzaXRlRGF0YVN0b3JlIF9zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZDpZRVNdOwpA QCAtMzUwLDcgKzM2NCw4IEBAIFRFU1QoUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQsIERhdGFiYXNl TG9jYXRpb24pCiAgICAgQGF1dG9yZWxlYXNlcG9vbCB7CiAgICAgICAgIGF1dG8gZGF0YVN0b3Jl Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9u IG5ld10pOwogICAgICAgICBkYXRhU3RvcmVDb25maWd1cmF0aW9uLmdldCgpLnByaXZhdGVDbGlj a01lYXN1cmVtZW50U3RvcmFnZURpcmVjdG9yeSA9IHRlbXBEaXI7Ci0gICAgICAgIGF1dG8gdmll d0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtXS1dlYlZpZXdDb25maWd1cmF0aW9uIG5ld10pOwor ICAgICAgICBkYXRhU3RvcmVDb25maWd1cmF0aW9uLmdldCgpLnBjbU1hY2hTZXJ2aWNlTmFtZSA9 IG5pbDsKKyAgICAgICAgYXV0byB2aWV3Q29uZmlndXJhdGlvbiA9IGNvbmZpZ3VyYXRpb25XaXRo b3V0VXNpbmdEYWVtb24oKTsKICAgICAgICAgYXV0byBkYXRhU3RvcmUgPSBhZG9wdE5TKFtbV0tX ZWJzaXRlRGF0YVN0b3JlIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOmRhdGFTdG9yZUNv bmZpZ3VyYXRpb24uZ2V0KCldKTsKICAgICAgICAgdmlld0NvbmZpZ3VyYXRpb24uZ2V0KCkud2Vi c2l0ZURhdGFTdG9yZSA9IGRhdGFTdG9yZS5nZXQoKTsKICAgICAgICAgcnVuQmFzaWNQQ01UZXN0 KHZpZXdDb25maWd1cmF0aW9uLmdldCgpLCBbXShXS1dlYlZpZXcgKndlYlZpZXcsIGNvbnN0IEhU VFBTZXJ2ZXImIHNlcnZlcikgewpAQCAtNDk0LDcgKzUwOSw3IEBAIHN0YXRpYyB2b2lkIGF0dGVt cHRDb25uZWN0aW9uSW5Qcm9jZXNzV2l0aG91dEVudGl0bGVtZW50KCkKIAogVEVTVChQcml2YXRl Q2xpY2tNZWFzdXJlbWVudCwgRGFlbW9uQmFzaWNGdW5jdGlvbmFsaXR5KQogewotICAgIGF1dG8g W3RlbXBEaXIsIGNvbmZpZ3VyYXRpb25dID0gc2V0VXBEYWVtb24oYWRvcHROUyhbV0tXZWJWaWV3 Q29uZmlndXJhdGlvbiBuZXddKS5hdXRvcmVsZWFzZSgpKTsKKyAgICBhdXRvIFt0ZW1wRGlyLCBj b25maWd1cmF0aW9uXSA9IHNldFVwRGFlbW9uKGNvbmZpZ3VyYXRpb25XaXRob3V0VXNpbmdEYWVt b24oKS5hdXRvcmVsZWFzZSgpKTsKICAgICBhdHRlbXB0Q29ubmVjdGlvbkluUHJvY2Vzc1dpdGhv dXRFbnRpdGxlbWVudCgpOwogICAgIHJ1bkJhc2ljUENNVGVzdChjb25maWd1cmF0aW9uLCBbXShX S1dlYlZpZXcgKndlYlZpZXcsIGNvbnN0IEhUVFBTZXJ2ZXImIHNlcnZlcikgewogICAgICAgICBb d2ViVmlldyBfYWRkRXZlbnRBdHRyaWJ1dGlvbldpdGhTb3VyY2VJRDo0MiBkZXN0aW5hdGlvblVS TDpleGFtcGxlVVJMKCkgc291cmNlRGVzY3JpcHRpb246QCJ0ZXN0IHNvdXJjZSBkZXNjcmlwdGlv biIgcHVyY2hhc2VyOkAidGVzdCBwdXJjaGFzZXIiIHJlcG9ydEVuZHBvaW50OnNlcnZlci5yZXF1 ZXN0KCkuVVJMIG9wdGlvbmFsTm9uY2U6bmlsIGFwcGxpY2F0aW9uQnVuZGxlSUQ6QCJ0ZXN0LmJ1 bmRsZS5pZCJdOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQubW0KaW5kZXggNmE5OGNhMmM1 MDFmMDA5ODlmODEzZmI0YWRhY2FlNDBiMzE5YTI5My4uYzFkNGUxMGVlOGJhYTcxOTM3MTAxNzQ2 NGRkYjdjYjRjYTgxNjFkNSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC5tbQorKysgYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1ByaXZhdGVDbGlja01lYXN1cmVtZW50Lm1tCkBAIC0z OSwxMCArMzksMTIgQEAKIHN0YXRpYyBSZXRhaW5QdHI8V0tXZWJWaWV3PiB3ZWJWaWV3V2l0aFJl c291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkSW5OZXR3b3JrUHJvY2VzcygpCiB7CiAgICAgYXV0 byAqc2hhcmVkUHJvY2Vzc1Bvb2wgPSBbV0tQcm9jZXNzUG9vbCBfc2hhcmVkUHJvY2Vzc1Bvb2xd OwotICAgIGF1dG8gKmRhdGFTdG9yZSA9IFtXS1dlYnNpdGVEYXRhU3RvcmUgZGVmYXVsdERhdGFT dG9yZV07Ci0gICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZp Z3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBhdXRvIGRhdGFTdG9yZUNvbmZpZ3VyYXRpb24g PSBhZG9wdE5TKFtfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBuZXddKTsKKyAgICBk YXRhU3RvcmVDb25maWd1cmF0aW9uLmdldCgpLnBjbU1hY2hTZXJ2aWNlTmFtZSA9IG5pbDsKKyAg ICBhdXRvIGRhdGFTdG9yZSA9IGFkb3B0TlMoW1tXS1dlYnNpdGVEYXRhU3RvcmUgYWxsb2NdIF9p bml0V2l0aENvbmZpZ3VyYXRpb246ZGF0YVN0b3JlQ29uZmlndXJhdGlvbi5nZXQoKV0pOworICAg IGF1dG8gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gbmV3 XSk7CiAgICAgW2NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6IHNoYXJlZFByb2Nlc3NQb29s XTsKLSAgICBjb25maWd1cmF0aW9uLmdldCgpLndlYnNpdGVEYXRhU3RvcmUgPSBkYXRhU3RvcmU7 CisgICAgY29uZmlndXJhdGlvbi5nZXQoKS53ZWJzaXRlRGF0YVN0b3JlID0gZGF0YVN0b3JlLmdl dCgpOwogCiAgICAgLy8gV2UgbmVlZCBhbiBhY3RpdmUgTmV0d29ya1Byb2Nlc3MgdG8gcGVyZm9y bSBQQ00gb3BlcmF0aW9ucy4KICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3 IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3Vy YXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RD b250cm9sbGVyLmNwcAppbmRleCBmZWIyYTM5N2U0MmEzNjhjNDE3OWVjYjMxZDZkMTkyMDYzZjE5 YTA3Li41ZTM2ZWE3YmI1NjllM2NjOGEzNWE2ZjQ4Nzk0MjQ4ZGNhZmZjZjliIDEwMDY0NAotLS0g YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAorKysgYi9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcApAQCAtNjA0LDYgKzYwNCw3IEBAIHZv aWQgVGVzdENvbnRyb2xsZXI6OmNvbmZpZ3VyZVdlYnNpdGVEYXRhU3RvcmVUZW1wb3JhcnlEaXJl Y3RvcmllcyhXS1dlYnNpdGVEYXRhCiAgICAgICAgIFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3Vy YXRpb25TZXROZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZVZhbGlkYXRpb25FbmFibGVkKGNvbmZpZ3Vy YXRpb24sIHRydWUpOwogICAgICAgICBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uU2V0 U3RhbGVXaGlsZVJldmFsaWRhdGVFbmFibGVkKGNvbmZpZ3VyYXRpb24sIHRydWUpOwogICAgICAg ICBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uU2V0VGVzdGluZ1Nlc3Npb25FbmFibGVk KGNvbmZpZ3VyYXRpb24sIHRydWUpOworICAgICAgICBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1 cmF0aW9uU2V0UENNTWFjaFNlcnZpY2VOYW1lKGNvbmZpZ3VyYXRpb24sIG51bGxwdHIpOwogICAg IH0KIH0KIAo=