231248 2021-10-05 13:31:28 -0700 Add an entitlement check to only allow AdAttributionDaemon to be connected to by the network process 2021-10-05 16:48:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen webkit-bug-importer oldest_to_newest 1800728 0 achristensen 2021-10-05 13:31:28 -0700 Add an entitlement check to only allow AdAttributionDaemon to be connected to by the network process 1800730 1 440257 achristensen 2021-10-05 13:35:16 -0700 Created attachment 440257 Patch 1800734 2 440257 ap 2021-10-05 13:42:25 -0700 Comment on attachment 440257 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440257&action=review > Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonEntryPoint.mm:84 > + NSLog(@"connection attempted connection without required entitlement"); Does this look right in the log starting with lower case? > Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:513 > + xpc_connection_set_event_handler(connection.get(), ^(xpc_object_t event) { > + if (event == XPC_ERROR_CONNECTION_INTERRUPTED) { > + done = true; > + }); Not sure if this tests enough. Isn't the purpose to verify that the connection is never established? This just verifies that it's dropped, perhaps only eventually. Also, failing as timeout isn't always understood to be a legitimate failure in practice. 1800796 3 440257 achristensen 2021-10-05 15:19:52 -0700 Comment on attachment 440257 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440257&action=review >> Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonEntryPoint.mm:84 >> + NSLog(@"connection attempted connection without required entitlement"); > > Does this look right in the log starting with lower case? I'll capitalize. > Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:483 > + system([NSString stringWithFormat:@"launchctl unload %@ 2> /dev/null", plistLocation.path].fileSystemRepresentation); I committed this separately in http://trac.webkit.org/r283574 >> Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:513 >> + }); > > Not sure if this tests enough. Isn't the purpose to verify that the connection is never established? This just verifies that it's dropped, perhaps only eventually. > > Also, failing as timeout isn't always understood to be a legitimate failure in practice. This is what it looks like at this API level when a connection is never established. I'll change this to make sure event is always equal to XPC_ERROR_CONNECTION_INTERRUPTED to make sure that nothing else happens. I agree that it's not great to have the failure mode be a timeout, but I think that's how this test needs to be. 1800821 4 440285 achristensen 2021-10-05 15:50:29 -0700 Created attachment 440285 Patch 1800849 5 ews-feeder 2021-10-05 16:47:55 -0700 Committed r283586 (242544@main): <https://commits.webkit.org/242544@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440285. 1800850 6 webkit-bug-importer 2021-10-05 16:48:18 -0700 <rdar://problem/83910831> 440257 2021-10-05 13:35:16 -0700 2021-10-05 15:50:27 -0700 Patch bug-231248-20211005133515.patch text/plain 6749 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE5NjA2NGZhOWQyNGU5ZjM2 NzdjZDQ5MDNjOWI5NjUzZWQwODZiMDIuLjAwYzI2ZDk3OGE3YmJhODEzZjY4ZDM4ZDNlNzdkNTUy YjY0ZDcyYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMTAtMDUgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgYW4gZW50 aXRsZW1lbnQgY2hlY2sgdG8gb25seSBhbGxvdyBBZEF0dHJpYnV0aW9uRGFlbW9uIHRvIGJlIGNv bm5lY3RlZCB0byBieSB0aGUgbmV0d29yayBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzEyNDgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRpbmcgYSByZXN0cmljdGVkIGVudGl0bGVtZW50 IG9uIG1hY09TIHdoZW4gdXNpbmcgYSBub24taW50ZXJuYWwgU0RLIGNhdXNlcyB0aGUgbmV0d29y ayBwcm9jZXNzIHRvIG5vdCBzdGFydCwKKyAgICAgICAgc28gaW4gb3BlbiBzb3VyY2UgYnVpbGRz IChpbiB3aGljaCB0aGUgZGFlbW9uIGlzIG9ubHkgdXNlZCBmb3IgdW5pdCB0ZXN0cykganVzdCBz a2lwIHRoZSBlbnRpdGxlbWVudCBjaGVjay4KKworICAgICAgICAqIFNjcmlwdHMvcHJvY2Vzcy1l bnRpdGxlbWVudHMuc2g6CisgICAgICAgICogU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29j b2EvRGFlbW9uL1BDTURhZW1vbkVudHJ5UG9pbnQubW06CisgICAgICAgIChXZWJLaXQ6OnN0YXJ0 TGlzdGVuaW5nRm9yTWFjaFNlcnZpY2VDb25uZWN0aW9ucyk6CisKIDIwMjEtMTAtMDUgIFRpbSBI b3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGFuIGFsdGVy bmF0ZSBzdHlsZSBmb3IgZm9ybSBjb250cm9scywgYW5kIGltcGxlbWVudCBpdCBmb3IgY2hlY2ti b3hlcyBhbmQgcmFkaW8gYnV0dG9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TY3JpcHRz L3Byb2Nlc3MtZW50aXRsZW1lbnRzLnNoIGIvU291cmNlL1dlYktpdC9TY3JpcHRzL3Byb2Nlc3Mt ZW50aXRsZW1lbnRzLnNoCmluZGV4IGMzMzAyMjg1OWM3OTAxOWQ3OTc1ODlkMTdhNmJhODQzZGZi ZmJkYzIuLjk0NTU0YzQ1OTJmODQzZWZmZTA2OThkZmZhODBlMGIwOGMyZmExY2EgMTAwNzU1Ci0t LSBhL1NvdXJjZS9XZWJLaXQvU2NyaXB0cy9wcm9jZXNzLWVudGl0bGVtZW50cy5zaAorKysgYi9T b3VyY2UvV2ViS2l0L1NjcmlwdHMvcHJvY2Vzcy1lbnRpdGxlbWVudHMuc2gKQEAgLTExOCw2ICsx MTgsNyBAQCBmdW5jdGlvbiBtYWNfcHJvY2Vzc19uZXR3b3JrX2VudGl0bGVtZW50cygpCiAgICAg ICAgIHBsaXN0YnVkZHkgQWRkIDpjb20uYXBwbGUucHJpdmF0ZS53ZWJraXQudXNlLXhwYy1lbmRw b2ludCBib29sIFlFUwogICAgICAgICBwbGlzdGJ1ZGR5IEFkZCA6Y29tLmFwcGxlLnJvb3RsZXNz LnN0b3JhZ2UuV2ViS2l0TmV0d29ya2luZ1NhbmRib3ggYm9vbCBZRVMKICAgICAgICAgcGxpc3Ri dWRkeSBBZGQgOmNvbS5hcHBsZS5zeW1wdG9tX2FuYWx5dGljcy5jb25maWd1cmUgYm9vbCBZRVMK KyAgICAgICAgcGxpc3RidWRkeSBBZGQgOmNvbS5hcHBsZS5wcml2YXRlLndlYmtpdC5hZGF0dHJp YnV0aW9uZGFlbW9uIGJvb2wgWUVTCiAgICAgZmkKIH0KIApAQCAtMzY5LDYgKzM3MCw3IEBAIGZ1 bmN0aW9uIGlvc19mYW1pbHlfcHJvY2Vzc193ZWJhdXRobl9lbnRpdGxlbWVudHMoKQogCiBmdW5j dGlvbiBpb3NfZmFtaWx5X3Byb2Nlc3NfbmV0d29ya19lbnRpdGxlbWVudHMoKQogeworICAgIHBs aXN0YnVkZHkgQWRkIDpjb20uYXBwbGUucHJpdmF0ZS53ZWJraXQuYWRhdHRyaWJ1dGlvbmRhZW1v biBib29sIFlFUwogICAgIHBsaXN0YnVkZHkgQWRkIDpjb20uYXBwbGUubXVsdGl0YXNraW5nLnN5 c3RlbWFwcGFzc2VydGlvbnMgYm9vbCBZRVMKICAgICBwbGlzdGJ1ZGR5IEFkZCA6Y29tLmFwcGxl LnBheW1lbnQuYWxsLWFjY2VzcyBib29sIFlFUwogICAgIHBsaXN0YnVkZHkgQWRkIDpjb20uYXBw bGUucHJpdmF0ZS5hY2NvdW50cy5idW5kbGVpZHNwb29maW5nIGJvb2wgWUVTCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL0RhZW1vbi9Q Q01EYWVtb25FbnRyeVBvaW50Lm1tIGIvU291cmNlL1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0 aWxpdGllcy9Db2NvYS9EYWVtb24vUENNRGFlbW9uRW50cnlQb2ludC5tbQppbmRleCA5NDYxNjFm NTQ2Y2IwYmU4MDE0NjlmNDUxYmYwZmFkZTIwZWEwMDQ3Li5lYjU3NjAxZTZhMzJmY2M1M2RhNzA4 NDU4OWI3Y2VhMzJlNmIzZDRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRy eVBvaW50VXRpbGl0aWVzL0NvY29hL0RhZW1vbi9QQ01EYWVtb25FbnRyeVBvaW50Lm1tCisrKyBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvRGFlbW9uL1BD TURhZW1vbkVudHJ5UG9pbnQubW0KQEAgLTc5LDcgKzc5LDEzIEBAIHN0YXRpYyB2b2lkIHN0YXJ0 TGlzdGVuaW5nRm9yTWFjaFNlcnZpY2VDb25uZWN0aW9ucyhjb25zdCBjaGFyKiBzZXJ2aWNlTmFt ZSkKICAgICAgICAgaWYgKHhwY19nZXRfdHlwZShwZWVyKSAhPSBYUENfVFlQRV9DT05ORUNUSU9O KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIC8vIEZJWE1FOiBBZGQgYW4gZW50aXRs ZW1lbnQgY2hlY2sgaGVyZSBzbyB0aGF0IG9ubHkgdGhlIG5ldHdvcmsgcHJvY2VzcyBjYW4gc3Vj Y2Vzc2Z1bGx5IGNvbm5lY3QuCisjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKKyAgICAgICAg aWYgKCFXVEY6Omhhc0VudGl0bGVtZW50KHBlZXIsICJjb20uYXBwbGUucHJpdmF0ZS53ZWJraXQu YWRhdHRyaWJ1dGlvbmRhZW1vbiIpKSB7CisgICAgICAgICAgICBOU0xvZyhAImNvbm5lY3Rpb24g YXR0ZW1wdGVkIGNvbm5lY3Rpb24gd2l0aG91dCByZXF1aXJlZCBlbnRpdGxlbWVudCIpOworICAg ICAgICAgICAgeHBjX2Nvbm5lY3Rpb25fY2FuY2VsKHBlZXIpOworICAgICAgICAgICAgcmV0dXJu OworICAgICAgICB9CisjZW5kaWYKIAogICAgICAgICB4cGNfY29ubmVjdGlvbl9zZXRfZXZlbnRf aGFuZGxlcihwZWVyLCBeKHhwY19vYmplY3RfdCBldmVudCkgewogICAgICAgICAgICAgaWYgKGV2 ZW50ID09IFhQQ19FUlJPUl9DT05ORUNUSU9OX0lOVkFMSUQpCmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGVlOGU3MWQ2MzUwZDU1Yzg3MmRkNmJj ODI4NGEwMTA4OTY3ZDg5Ny4uNTdkYjZhOTAzNWI5MTRkN2YzODIwN2E3NmFlN2YwNGUyYjM2NjM2 MCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE5IEBACisyMDIxLTEwLTA1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2Vu QHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIGFuIGVudGl0bGVtZW50IGNoZWNrIHRvIG9ubHkg YWxsb3cgQWRBdHRyaWJ1dGlvbkRhZW1vbiB0byBiZSBjb25uZWN0ZWQgdG8gYnkgdGhlIG5ldHdv cmsgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjMxMjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWxzbyBhZGQgYSBzeXN0ZW0gY2FsbCB0byAibGF1bmNoY3RsIHVubG9hZCIgdG8gY2xlYXIg YW55IHJlc2lkdWFsIHN0YXRlIGluIGxhdW5jaGQgYmVmb3JlIHN0YXJ0aW5nIHRoZSB1bml0IHRl c3QuCisgICAgICAgIE90aGVyd2lzZSB3ZSBjb3VsZCBnZXQgaW50byBhIHN0YXRlIHdoZXJlIHRo ZSBwbGlzdCBpcyByZWdpc3RlcmVkIHdpdGggbGF1bmNoZCBmcm9tIGFuIG9sZCB0ZXN0IHRoYXQg cmVnaXN0ZXJlZCBpdAorICAgICAgICBidXQgZGlkbid0IHN0YXJ0IHRoZSBkYWVtb24sIGNhdXNp bmcgdGhlIHRlc3QgdG8gdGltZSBvdXQgdW50aWwgeW91IHJlYm9vdCB0aGUgbWFjaGluZS4gIFRo aXMgbWFrZXMgaXQgcmVjb3ZlciBuaWNlbHkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL0V2ZW50QXR0cmlidXRpb24ubW06CisgICAgICAgIChUZXN0V2ViS2l0 QVBJOjphdHRlbXB0Q29ubmVjdGlvbkluUHJvY2Vzc1dpdGhvdXRFbnRpdGxlbWVudCk6CisgICAg ICAgIChUZXN0V2ViS2l0QVBJOjpzZXRJbmplY3RlZEJ1bmRsZUNsaWVudCk6IERlbGV0ZWQuCisg ICAgICAgIChUZXN0V2ViS2l0QVBJOjp3ZWJWaWV3V2l0aE9wZW5JbnNwZWN0b3IpOiBEZWxldGVk LgorCiAyMDIxLTEwLTA1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CiAKICAgICAgICAgSW1wbGVtZW50IG1pc3NpbmcgZnVuY3Rpb25zIGluIFByaXZhdGVDbGlj a01lYXN1cmVtZW50RGFlbW9uQ2xpZW50CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL0V2ZW50QXR0cmlidXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL0V2ZW50QXR0cmlidXRpb24ubW0KaW5kZXggZDI5ZTM4NzEy OWE1NjE0MmI3NmE2YTg4Yzg1MGFkNDdiMmI1ZWIyNC4uYzE3YTAzNDg1MTcwMTAxMjU3M2QzOTA3 ZmY1NDE3MWRkY2JiMTdiOCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9FdmVudEF0dHJpYnV0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvRXZlbnRBdHRyaWJ1dGlvbi5tbQpAQCAtNDgwLDYgKzQ4MCw3IEBA IHN0YXRpYyBzdGQ6OnBhaXI8TlNVUkwgKiwgV0tXZWJWaWV3Q29uZmlndXJhdGlvbiAqPiBzZXRV cERhZW1vbihXS1dlYlZpZXdDb25maWd1CiAgICAgRVhQRUNUX05VTEwoZXJyb3IpOwogICAgIHN1 Y2Nlc3MgPSBbcGxpc3Qgd3JpdGVUb1VSTDpwbGlzdExvY2F0aW9uIGVycm9yOiZlcnJvcl07CiAg ICAgRVhQRUNUX1RSVUUoc3VjY2Vzcyk7CisgICAgc3lzdGVtKFtOU1N0cmluZyBzdHJpbmdXaXRo Rm9ybWF0OkAibGF1bmNoY3RsIHVubG9hZCAlQCAyPiAvZGV2L251bGwiLCBwbGlzdExvY2F0aW9u LnBhdGhdLmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbik7CiAgICAgc3lzdGVtKFtOU1N0cmluZyBz dHJpbmdXaXRoRm9ybWF0OkAibGF1bmNoY3RsIGxvYWQgJUAiLCBwbGlzdExvY2F0aW9uLnBhdGhd LmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbik7CiAjZW5kaWYKICAgICBFWFBFQ1RfTlVMTChlcnJv cik7CkBAIC01MDEsOSArNTAyLDI2IEBAIHN0YXRpYyB2b2lkIGNsZWFuVXBEYWVtb24oTlNVUkwg KnRlbXBEaXIpCiAgICAgRVhQRUNUX05VTEwoZXJyb3IpOwogfQogCitzdGF0aWMgdm9pZCBhdHRl bXB0Q29ubmVjdGlvbkluUHJvY2Vzc1dpdGhvdXRFbnRpdGxlbWVudCgpCit7CisjaWYgVVNFKEFQ UExFX0lOVEVSTkFMX1NESykKKyAgICBfX2Jsb2NrIGJvb2wgZG9uZSA9IGZhbHNlOworICAgIGF1 dG8gY29ubmVjdGlvbiA9IGFkb3B0TlMoeHBjX2Nvbm5lY3Rpb25fY3JlYXRlX21hY2hfc2Vydmlj ZSgib3JnLndlYmtpdC5wY210ZXN0ZGFlbW9uLnNlcnZpY2UiLCBkaXNwYXRjaF9nZXRfbWFpbl9x dWV1ZSgpLCAwKSk7CisgICAgeHBjX2Nvbm5lY3Rpb25fc2V0X2V2ZW50X2hhbmRsZXIoY29ubmVj dGlvbi5nZXQoKSwgXih4cGNfb2JqZWN0X3QgZXZlbnQpIHsKKyAgICAgICAgaWYgKGV2ZW50ID09 IFhQQ19FUlJPUl9DT05ORUNUSU9OX0lOVEVSUlVQVEVEKSB7CisgICAgICAgICAgICBkb25lID0g dHJ1ZTsKKyAgICB9KTsKKyAgICB4cGNfY29ubmVjdGlvbl9hY3RpdmF0ZShjb25uZWN0aW9uLmdl dCgpKTsKKyAgICBhdXRvIGRpY3Rpb25hcnkgPSBhZG9wdE5TKHhwY19kaWN0aW9uYXJ5X2NyZWF0 ZShudWxscHRyLCBudWxscHRyLCAwKSk7CisgICAgeHBjX2Nvbm5lY3Rpb25fc2VuZF9tZXNzYWdl KGNvbm5lY3Rpb24uZ2V0KCksIGRpY3Rpb25hcnkuZ2V0KCkpOworICAgIFRlc3RXZWJLaXRBUEk6 OlV0aWw6OnJ1bigmZG9uZSk7CisjZW5kaWYKK30KKwogVEVTVChQcml2YXRlQ2xpY2tNZWFzdXJl bWVudCwgRGFlbW9uQmFzaWNGdW5jdGlvbmFsaXR5KQogewogICAgIGF1dG8gW3RlbXBEaXIsIGNv bmZpZ3VyYXRpb25dID0gc2V0VXBEYWVtb24oYWRvcHROUyhbV0tXZWJWaWV3Q29uZmlndXJhdGlv biBuZXddKS5hdXRvcmVsZWFzZSgpKTsKKyAgICBhdHRlbXB0Q29ubmVjdGlvbkluUHJvY2Vzc1dp dGhvdXRFbnRpdGxlbWVudCgpOwogICAgIHJ1bkJhc2ljUENNVGVzdChjb25maWd1cmF0aW9uLCBb XShXS1dlYlZpZXcgKndlYlZpZXcsIGNvbnN0IEhUVFBTZXJ2ZXImIHNlcnZlcikgewogICAgICAg ICBbd2ViVmlldyBfYWRkRXZlbnRBdHRyaWJ1dGlvbldpdGhTb3VyY2VJRDo0MiBkZXN0aW5hdGlv blVSTDpleGFtcGxlVVJMKCkgc291cmNlRGVzY3JpcHRpb246QCJ0ZXN0IHNvdXJjZSBkZXNjcmlw dGlvbiIgcHVyY2hhc2VyOkAidGVzdCBwdXJjaGFzZXIiIHJlcG9ydEVuZHBvaW50OnNlcnZlci5y ZXF1ZXN0KCkuVVJMIG9wdGlvbmFsTm9uY2U6bmlsIGFwcGxpY2F0aW9uQnVuZGxlSUQ6QCJ0ZXN0 LmJ1bmRsZS5pZCJdOwogICAgIH0pOwo= 440285 2021-10-05 15:50:29 -0700 2021-10-05 16:47:55 -0700 Patch bug-231248-20211005155028.patch text/plain 7502 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU5OTVlY2VlNWM2YjJhZjUw NmFiZTlhZTcyMjY4ZDVjZmQzNWJkM2QuLjM5MGMxYmI1NDBhYmZhNWNmNTY2OGQ3MjA2OGRmN2Q1 MGU0MDViNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMTAtMDUgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgYW4gZW50 aXRsZW1lbnQgY2hlY2sgdG8gb25seSBhbGxvdyBBZEF0dHJpYnV0aW9uRGFlbW9uIHRvIGJlIGNv bm5lY3RlZCB0byBieSB0aGUgbmV0d29yayBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzEyNDgKKworICAgICAgICBSZXZpZXdlZCBieSBB bGV4ZXkgUHJvc2t1cnlha292LgorCisgICAgICAgIEFkZGluZyBhIHJlc3RyaWN0ZWQgZW50aXRs ZW1lbnQgb24gbWFjT1Mgd2hlbiB1c2luZyBhIG5vbi1pbnRlcm5hbCBTREsgY2F1c2VzIHRoZSBu ZXR3b3JrIHByb2Nlc3MgdG8gbm90IHN0YXJ0LAorICAgICAgICBzbyBpbiBvcGVuIHNvdXJjZSBi dWlsZHMgKGluIHdoaWNoIHRoZSBkYWVtb24gaXMgb25seSB1c2VkIGZvciB1bml0IHRlc3RzKSBq dXN0IHNraXAgdGhlIGVudGl0bGVtZW50IGNoZWNrLgorCisgICAgICAgICogU2NyaXB0cy9wcm9j ZXNzLWVudGl0bGVtZW50cy5zaDoKKyAgICAgICAgKiBTaGFyZWQvRW50cnlQb2ludFV0aWxpdGll cy9Db2NvYS9EYWVtb24vUENNRGFlbW9uRW50cnlQb2ludC5tbToKKyAgICAgICAgKFdlYktpdDo6 c3RhcnRMaXN0ZW5pbmdGb3JNYWNoU2VydmljZUNvbm5lY3Rpb25zKToKKwogMjAyMS0xMC0wNSAg Q2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEF1dGhvcml6YXRpb24g aGVhZGVyIGxvc3Qgb24gMzB4IHJlZGlyZWN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9T Y3JpcHRzL3Byb2Nlc3MtZW50aXRsZW1lbnRzLnNoIGIvU291cmNlL1dlYktpdC9TY3JpcHRzL3By b2Nlc3MtZW50aXRsZW1lbnRzLnNoCmluZGV4IGMzMzAyMjg1OWM3OTAxOWQ3OTc1ODlkMTdhNmJh ODQzZGZiZmJkYzIuLjk0NTU0YzQ1OTJmODQzZWZmZTA2OThkZmZhODBlMGIwOGMyZmExY2EgMTAw NzU1Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2NyaXB0cy9wcm9jZXNzLWVudGl0bGVtZW50cy5zaAor KysgYi9Tb3VyY2UvV2ViS2l0L1NjcmlwdHMvcHJvY2Vzcy1lbnRpdGxlbWVudHMuc2gKQEAgLTEx OCw2ICsxMTgsNyBAQCBmdW5jdGlvbiBtYWNfcHJvY2Vzc19uZXR3b3JrX2VudGl0bGVtZW50cygp CiAgICAgICAgIHBsaXN0YnVkZHkgQWRkIDpjb20uYXBwbGUucHJpdmF0ZS53ZWJraXQudXNlLXhw Yy1lbmRwb2ludCBib29sIFlFUwogICAgICAgICBwbGlzdGJ1ZGR5IEFkZCA6Y29tLmFwcGxlLnJv b3RsZXNzLnN0b3JhZ2UuV2ViS2l0TmV0d29ya2luZ1NhbmRib3ggYm9vbCBZRVMKICAgICAgICAg cGxpc3RidWRkeSBBZGQgOmNvbS5hcHBsZS5zeW1wdG9tX2FuYWx5dGljcy5jb25maWd1cmUgYm9v bCBZRVMKKyAgICAgICAgcGxpc3RidWRkeSBBZGQgOmNvbS5hcHBsZS5wcml2YXRlLndlYmtpdC5h ZGF0dHJpYnV0aW9uZGFlbW9uIGJvb2wgWUVTCiAgICAgZmkKIH0KIApAQCAtMzY5LDYgKzM3MCw3 IEBAIGZ1bmN0aW9uIGlvc19mYW1pbHlfcHJvY2Vzc193ZWJhdXRobl9lbnRpdGxlbWVudHMoKQog CiBmdW5jdGlvbiBpb3NfZmFtaWx5X3Byb2Nlc3NfbmV0d29ya19lbnRpdGxlbWVudHMoKQogewor ICAgIHBsaXN0YnVkZHkgQWRkIDpjb20uYXBwbGUucHJpdmF0ZS53ZWJraXQuYWRhdHRyaWJ1dGlv bmRhZW1vbiBib29sIFlFUwogICAgIHBsaXN0YnVkZHkgQWRkIDpjb20uYXBwbGUubXVsdGl0YXNr aW5nLnN5c3RlbWFwcGFzc2VydGlvbnMgYm9vbCBZRVMKICAgICBwbGlzdGJ1ZGR5IEFkZCA6Y29t LmFwcGxlLnBheW1lbnQuYWxsLWFjY2VzcyBib29sIFlFUwogICAgIHBsaXN0YnVkZHkgQWRkIDpj b20uYXBwbGUucHJpdmF0ZS5hY2NvdW50cy5idW5kbGVpZHNwb29maW5nIGJvb2wgWUVTCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL0Rh ZW1vbi9QQ01EYWVtb25FbnRyeVBvaW50Lm1tIGIvU291cmNlL1dlYktpdC9TaGFyZWQvRW50cnlQ b2ludFV0aWxpdGllcy9Db2NvYS9EYWVtb24vUENNRGFlbW9uRW50cnlQb2ludC5tbQppbmRleCA5 NDYxNjFmNTQ2Y2IwYmU4MDE0NjlmNDUxYmYwZmFkZTIwZWEwMDQ3Li45ZWI3ZDFjNjM2ZDMzODRm YjFiMjM0NWYxNjFjYzMzZjQzY2M2YzYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL0RhZW1vbi9QQ01EYWVtb25FbnRyeVBvaW50Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvRGFl bW9uL1BDTURhZW1vbkVudHJ5UG9pbnQubW0KQEAgLTYxLDcgKzYxLDcgQEAgc3RhdGljIHZvaWQg Y29ubmVjdGlvbkV2ZW50SGFuZGxlcih4cGNfb2JqZWN0X3QgcmVxdWVzdCkKICAgICBpZiAoeHBj X2dldF90eXBlKHJlcXVlc3QpICE9IFhQQ19UWVBFX0RJQ1RJT05BUlkpCiAgICAgICAgIHJldHVy bjsKICAgICBpZiAoeHBjX2RpY3Rpb25hcnlfZ2V0X3VpbnQ2NChyZXF1ZXN0LCBQQ006OnByb3Rv Y29sVmVyc2lvbktleSkgIT0gUENNOjpwcm90b2NvbFZlcnNpb25WYWx1ZSkgewotICAgICAgICBO U0xvZyhAInJlY2VpdmVkIHJlcXVlc3QgdGhhdCB3YXMgbm90IHRoZSBjdXJyZW50IHByb3RvY29s IHZlcnNpb24iKTsKKyAgICAgICAgTlNMb2coQCJSZWNlaXZlZCByZXF1ZXN0IHRoYXQgd2FzIG5v dCB0aGUgY3VycmVudCBwcm90b2NvbCB2ZXJzaW9uIik7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKQEAgLTc5LDEzICs3OSwxOSBAQCBzdGF0aWMgdm9pZCBzdGFydExpc3RlbmluZ0Zvck1hY2hT ZXJ2aWNlQ29ubmVjdGlvbnMoY29uc3QgY2hhciogc2VydmljZU5hbWUpCiAgICAgICAgIGlmICh4 cGNfZ2V0X3R5cGUocGVlcikgIT0gWFBDX1RZUEVfQ09OTkVDVElPTikKICAgICAgICAgICAgIHJl dHVybjsKIAotICAgICAgICAvLyBGSVhNRTogQWRkIGFuIGVudGl0bGVtZW50IGNoZWNrIGhlcmUg c28gdGhhdCBvbmx5IHRoZSBuZXR3b3JrIHByb2Nlc3MgY2FuIHN1Y2Nlc3NmdWxseSBjb25uZWN0 LgorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisgICAgICAgIGlmICghV1RGOjpoYXNFbnRp dGxlbWVudChwZWVyLCAiY29tLmFwcGxlLnByaXZhdGUud2Via2l0LmFkYXR0cmlidXRpb25kYWVt b24iKSkgeworICAgICAgICAgICAgTlNMb2coQCJDb25uZWN0aW9uIGF0dGVtcHRlZCB3aXRob3V0 IHJlcXVpcmVkIGVudGl0bGVtZW50Iik7CisgICAgICAgICAgICB4cGNfY29ubmVjdGlvbl9jYW5j ZWwocGVlcik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyNlbmRpZgogCiAgICAg ICAgIHhwY19jb25uZWN0aW9uX3NldF9ldmVudF9oYW5kbGVyKHBlZXIsIF4oeHBjX29iamVjdF90 IGV2ZW50KSB7CiAgICAgICAgICAgICBpZiAoZXZlbnQgPT0gWFBDX0VSUk9SX0NPTk5FQ1RJT05f SU5WQUxJRCkKICAgICAgICAgICAgICAgICBOU0xvZyhAIkZhaWxlZCB0byBzdGFydCBsaXN0ZW5p bmcgZm9yIGNvbm5lY3Rpb25zIHRvIG1hY2ggc2VydmljZSAlcywgbGlrZWx5IGJlY2F1c2UgaXQg aXMgbm90IHJlZ2lzdGVyZWQgd2l0aCBsYXVuY2hkIiwgc2VydmljZU5hbWUpOwogICAgICAgICAg ICAgaWYgKGV2ZW50ID09IFhQQ19FUlJPUl9DT05ORUNUSU9OX0lOVEVSUlVQVEVEKSB7Ci0gICAg ICAgICAgICAgICAgTlNMb2coQCJyZW1vdmluZyBwZWVyIGNvbm5lY3Rpb24gJXAiLCBwZWVyKTsK KyAgICAgICAgICAgICAgICBOU0xvZyhAIlJlbW92aW5nIHBlZXIgY29ubmVjdGlvbiAlcCIsIHBl ZXIpOwogICAgICAgICAgICAgICAgIFBDTTo6RGFlbW9uQ29ubmVjdGlvblNldDo6c2luZ2xldG9u KCkucmVtb3ZlKHBlZXIpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0K QEAgLTk0LDcgKzEwMCw3IEBAIHN0YXRpYyB2b2lkIHN0YXJ0TGlzdGVuaW5nRm9yTWFjaFNlcnZp Y2VDb25uZWN0aW9ucyhjb25zdCBjaGFyKiBzZXJ2aWNlTmFtZSkKICAgICAgICAgeHBjX2Nvbm5l Y3Rpb25fc2V0X3RhcmdldF9xdWV1ZShwZWVyLCBkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpKTsK ICAgICAgICAgeHBjX2Nvbm5lY3Rpb25fYWN0aXZhdGUocGVlcik7CiAKLSAgICAgICAgTlNMb2co QCJhZGRpbmcgcGVlciBjb25uZWN0aW9uICVwIiwgcGVlcik7CisgICAgICAgIE5TTG9nKEAiQWRk aW5nIHBlZXIgY29ubmVjdGlvbiAlcCIsIHBlZXIpOwogICAgICAgICBQQ006OkRhZW1vbkNvbm5l Y3Rpb25TZXQ6OnNpbmdsZXRvbigpLmFkZChwZWVyKTsKICAgICB9KTsKICAgICB4cGNfY29ubmVj dGlvbl9hY3RpdmF0ZShsaXN0ZW5lci5nZXQoKS5nZXQoKSk7CmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWI5N2RkMDlkMzFhMzY0M2JjYjFjNjI1 MzE5YjExODc0ZWZhODc3ZC4uMmRmMjJiYzUwYTEyZjE1N2I2MDJmMWM0MThkMzMwNGEwYTlkOWY2 NyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE5IEBACisyMDIxLTEwLTA1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2Vu QHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIGFuIGVudGl0bGVtZW50IGNoZWNrIHRvIG9ubHkg YWxsb3cgQWRBdHRyaWJ1dGlvbkRhZW1vbiB0byBiZSBjb25uZWN0ZWQgdG8gYnkgdGhlIG5ldHdv cmsgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjMxMjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KKwor ICAgICAgICBBbHNvIGFkZCBhIHN5c3RlbSBjYWxsIHRvICJsYXVuY2hjdGwgdW5sb2FkIiB0byBj bGVhciBhbnkgcmVzaWR1YWwgc3RhdGUgaW4gbGF1bmNoZCBiZWZvcmUgc3RhcnRpbmcgdGhlIHVu aXQgdGVzdC4KKyAgICAgICAgT3RoZXJ3aXNlIHdlIGNvdWxkIGdldCBpbnRvIGEgc3RhdGUgd2hl cmUgdGhlIHBsaXN0IGlzIHJlZ2lzdGVyZWQgd2l0aCBsYXVuY2hkIGZyb20gYW4gb2xkIHRlc3Qg dGhhdCByZWdpc3RlcmVkIGl0CisgICAgICAgIGJ1dCBkaWRuJ3Qgc3RhcnQgdGhlIGRhZW1vbiwg Y2F1c2luZyB0aGUgdGVzdCB0byB0aW1lIG91dCB1bnRpbCB5b3UgcmVib290IHRoZSBtYWNoaW5l LiAgVGhpcyBtYWtlcyBpdCByZWNvdmVyIG5pY2VseS4KKworICAgICAgICAqIFRlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvRXZlbnRBdHRyaWJ1dGlvbi5tbToKKyAgICAgICAgKFRlc3RX ZWJLaXRBUEk6OmF0dGVtcHRDb25uZWN0aW9uSW5Qcm9jZXNzV2l0aG91dEVudGl0bGVtZW50KToK KyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OnNldEluamVjdGVkQnVuZGxlQ2xpZW50KTogRGVsZXRl ZC4KKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OndlYlZpZXdXaXRoT3Blbkluc3BlY3Rvcik6IERl bGV0ZWQuCisKIDIwMjEtMTAtMDUgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5j b20+CiAKICAgICAgICAgPG1vZGVsPiBzaG91bGQgYmUgZHJhZ2dhYmxlLCBzaW1pbGFyIHRvIDxp bWc+CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0V2 ZW50QXR0cmlidXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L0V2ZW50QXR0cmlidXRpb24ubW0KaW5kZXggZDI5ZTM4NzEyOWE1NjE0MmI3NmE2YTg4Yzg1MGFk NDdiMmI1ZWIyNC4uOWU1ZWFlMmMzNDBlZDc5Yjc3NjE3NGQxMTg2ZDk5YmQ4YmY4NDNhNSAxMDA2 NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9FdmVudEF0dHJp YnV0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRXZl bnRBdHRyaWJ1dGlvbi5tbQpAQCAtNTAxLDkgKzUwMSwyNiBAQCBzdGF0aWMgdm9pZCBjbGVhblVw RGFlbW9uKE5TVVJMICp0ZW1wRGlyKQogICAgIEVYUEVDVF9OVUxMKGVycm9yKTsKIH0KIAorc3Rh dGljIHZvaWQgYXR0ZW1wdENvbm5lY3Rpb25JblByb2Nlc3NXaXRob3V0RW50aXRsZW1lbnQoKQor eworI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisgICAgX19ibG9jayBib29sIGRvbmUgPSBm YWxzZTsKKyAgICBhdXRvIGNvbm5lY3Rpb24gPSBhZG9wdE5TKHhwY19jb25uZWN0aW9uX2NyZWF0 ZV9tYWNoX3NlcnZpY2UoIm9yZy53ZWJraXQucGNtdGVzdGRhZW1vbi5zZXJ2aWNlIiwgZGlzcGF0 Y2hfZ2V0X21haW5fcXVldWUoKSwgMCkpOworICAgIHhwY19jb25uZWN0aW9uX3NldF9ldmVudF9o YW5kbGVyKGNvbm5lY3Rpb24uZ2V0KCksIF4oeHBjX29iamVjdF90IGV2ZW50KSB7CisgICAgICAg IEVYUEVDVF9FUShldmVudCwgWFBDX0VSUk9SX0NPTk5FQ1RJT05fSU5URVJSVVBURUQpOworICAg ICAgICBkb25lID0gdHJ1ZTsKKyAgICB9KTsKKyAgICB4cGNfY29ubmVjdGlvbl9hY3RpdmF0ZShj b25uZWN0aW9uLmdldCgpKTsKKyAgICBhdXRvIGRpY3Rpb25hcnkgPSBhZG9wdE5TKHhwY19kaWN0 aW9uYXJ5X2NyZWF0ZShudWxscHRyLCBudWxscHRyLCAwKSk7CisgICAgeHBjX2Nvbm5lY3Rpb25f c2VuZF9tZXNzYWdlKGNvbm5lY3Rpb24uZ2V0KCksIGRpY3Rpb25hcnkuZ2V0KCkpOworICAgIFRl c3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisjZW5kaWYKK30KKwogVEVTVChQcml2YXRl Q2xpY2tNZWFzdXJlbWVudCwgRGFlbW9uQmFzaWNGdW5jdGlvbmFsaXR5KQogewogICAgIGF1dG8g W3RlbXBEaXIsIGNvbmZpZ3VyYXRpb25dID0gc2V0VXBEYWVtb24oYWRvcHROUyhbV0tXZWJWaWV3 Q29uZmlndXJhdGlvbiBuZXddKS5hdXRvcmVsZWFzZSgpKTsKKyAgICBhdHRlbXB0Q29ubmVjdGlv bkluUHJvY2Vzc1dpdGhvdXRFbnRpdGxlbWVudCgpOwogICAgIHJ1bkJhc2ljUENNVGVzdChjb25m aWd1cmF0aW9uLCBbXShXS1dlYlZpZXcgKndlYlZpZXcsIGNvbnN0IEhUVFBTZXJ2ZXImIHNlcnZl cikgewogICAgICAgICBbd2ViVmlldyBfYWRkRXZlbnRBdHRyaWJ1dGlvbldpdGhTb3VyY2VJRDo0 MiBkZXN0aW5hdGlvblVSTDpleGFtcGxlVVJMKCkgc291cmNlRGVzY3JpcHRpb246QCJ0ZXN0IHNv dXJjZSBkZXNjcmlwdGlvbiIgcHVyY2hhc2VyOkAidGVzdCBwdXJjaGFzZXIiIHJlcG9ydEVuZHBv aW50OnNlcnZlci5yZXF1ZXN0KCkuVVJMIG9wdGlvbmFsTm9uY2U6bmlsIGFwcGxpY2F0aW9uQnVu ZGxlSUQ6QCJ0ZXN0LmJ1bmRsZS5pZCJdOwogICAgIH0pOwo=