216896 2020-09-23 14:06:50 -0700 InAppBrowserPrivacy HTTPCookie tests incorrectly use the IsInAppBrowserPrivacyEnabled NSUserDefaults value 2020-09-24 16:59:15 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney beidson bfulgham webkit-bug-importer wilander oldest_to_newest 1691252 0 katherine_cheney 2020-09-23 14:06:50 -0700 The IsInAppBrowserPrivacyEnabled NSUserDefaults value used to enable/disable App-Bound Domains. Now App-Bound domains is opt-in based on a value in the app's Info.plist, so we can remove this code from the tests. 1691253 1 webkit-bug-importer 2020-09-23 14:07:58 -0700 <rdar://problem/69456713> 1691311 2 409515 katherine_cheney 2020-09-23 16:25:25 -0700 Created attachment 409515 Patch 1691718 3 ews-feeder 2020-09-24 16:59:15 -0700 Committed r267553: <https://trac.webkit.org/changeset/267553> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409515. 409515 2020-09-23 16:25:25 -0700 2020-09-24 16:59:15 -0700 Patch bug-216896-20200923162524.patch text/plain 10035 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NDMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTlmNDMxZjBkYTdlMDZkMmU0NWQ5YTZlMWQ3YmJlNTJj MzVjYTYzMy4uZTFhYTYzNmJlMmZhMDY1OWExMzFjZmUyNjE0MGQ0YWFhNTdhMThiNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDIwLTA5LTIzICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29t PgorCisgICAgICAgIEluQXBwQnJvd3NlclByaXZhY3kgSFRUUENvb2tpZSB0ZXN0cyBpbmNvcnJl Y3RseSB1c2UgdGhlIElzSW5BcHBCcm93c2VyUHJpdmFjeUVuYWJsZWQgTlNVc2VyRGVmYXVsdHMg dmFsdWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx Njg5NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjk0NTY3MTM+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIElzSW5BcHBCcm93c2VyUHJpdmFj eUVuYWJsZWQgVXNlckRlZmF1bHRzIHZhbHVlIG5vIGxvbmdlciBlbmFibGVzCisgICAgICAgIEFw cC1Cb3VuZCBEb21haW5zLCBzbyB0aGUgdGVzdHMgc2hvdWxkIG5vdCB1c2UgaXQgaW4gdGhpcyB3 YXkuCisgICAgICAgIENoYW5naW5nIHRoZSBidW5kbGUgaWRlbnRpZmllciB1c2luZworICAgICAg ICBjbGVhblVwSW5BcHBCcm93c2VyUHJpdmFjeVRlc3RTZXR0aW5ncygpIGFuZAorICAgICAgICBp bml0aWFsaXplSW5BcHBCcm93c2VyUHJpdmFjeVRlc3RTZXR0aW5ncygpIGlzIGVub3VnaCB0bwor ICAgICAgICBlbmFibGUvZGlzYWJsZSBBcHAtQm91bmQgRG9tYWlucy4KKworICAgICAgICBUaGlz IHBhdGNoIGFsc28gYWRkcyBhIFdLSFRUUENvb2tpZVN0b3JlT2JzZXJ2ZXIgdG8gdGVzdCBzZXR0 aW5nCisgICAgICAgIGFwcC1ib3VuZCBjb29raWVzLiBUaGlzIGVuc3VyZXMgd2UgZG9uJ3QgZ2V0 IGEgZmFsc2UgcG9zaXRpdmUgZnJvbQorICAgICAgICB0aGUgdGVzdCBieSBiZWluZyBhbGxvd2Vk IHRvIHNldCBidXQgbm90IHJldHJpZXZlIGFwcC1ib3VuZCBjb29raWVzLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9JbkFwcEJyb3dzZXJQcml2YWN5Lm1tOgor ICAgICAgICAoLVtJbkFwcEJyb3dzZXJQcml2YWN5Q29va2llT2JzZXJ2ZXIgY29va2llc0RpZENo YW5nZUluQ29va2llU3RvcmU6XSk6CisgICAgICAgIChzZXRVcENvb2tpZVRlc3RXaXRoV2Vic2l0 ZURhdGFTdG9yZSk6CisgICAgICAgIChURVNUKToKKyAgICAgICAgKHNldFVwQ29va2llVGVzdCk6 IERlbGV0ZWQuCisgICAgICAgIENoYW5nZWQgbmFtZSBhbmQgc2ltcGxpZmllZC4KKwogMjAyMC0w OS0yMiAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmYWN0 b3IgYnVpbGQgcnVsZXMgaW4gTWFrZWZpbGVzIGFuZCBNYWtlZmlsZS5zaGFyZWQKZGlmZiAtLWdp dCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW5BcHBCcm93c2VyUHJp dmFjeS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW5BcHBCcm93 c2VyUHJpdmFjeS5tbQppbmRleCAyZTUyOGU4MDQwYTg2NmQ5ODQyODI0YzBhMGEzNzQ1Y2Y4NmFm ZDc5Li41MzI0MzZhNzA3MWMyZjM2ZTQ3ZjAzMTA4OTk5N2Y3OGEzYjVjNmRjIDEwMDY0NAotLS0g YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0luQXBwQnJvd3NlclByaXZh Y3kubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9JbkFwcEJy b3dzZXJQcml2YWN5Lm1tCkBAIC01MTAsMjcgKzUxMCwzNSBAQCBURVNUKEluQXBwQnJvd3NlclBy aXZhY3ksIEFwcEJvdW5kRG9tYWluQ2FuQWNjZXNzTWVzc2FnZUhhbmRsZXJzKQogCiBzdGF0aWMg UmV0YWluUHRyPFdLSFRUUENvb2tpZVN0b3JlPiBnbG9iYWxDb29raWVTdG9yZTsKIHN0YXRpYyBi b29sIGdvdEZsYWcgPSBmYWxzZTsKK3N0YXRpYyB1aW50NjRfdCBvYnNlcnZlckNhbGxiYWNrczsK IAotc3RhdGljIHZvaWQgc2V0VXBDb29raWVUZXN0KCkKK0BpbnRlcmZhY2UgSW5BcHBCcm93c2Vy UHJpdmFjeUNvb2tpZU9ic2VydmVyIDogTlNPYmplY3Q8V0tIVFRQQ29va2llU3RvcmVPYnNlcnZl cj4KKy0gKHZvaWQpY29va2llc0RpZENoYW5nZUluQ29va2llU3RvcmU6KFdLSFRUUENvb2tpZVN0 b3JlICopY29va2llU3RvcmU7CitAZW5kCisKK0BpbXBsZW1lbnRhdGlvbiBJbkFwcEJyb3dzZXJQ cml2YWN5Q29va2llT2JzZXJ2ZXIKKworLSAodm9pZCljb29raWVzRGlkQ2hhbmdlSW5Db29raWVT dG9yZTooV0tIVFRQQ29va2llU3RvcmUgKiljb29raWVTdG9yZQogewotICAgIGdsb2JhbENvb2tp ZVN0b3JlID0gW1tXS1dlYnNpdGVEYXRhU3RvcmUgZGVmYXVsdERhdGFTdG9yZV0gaHR0cENvb2tp ZVN0b3JlXTsKLSAgICBOU0FycmF5PE5TSFRUUENvb2tpZSAqPiAqY29va2llcyA9IG5pbDsKLSAg ICBbZ2xvYmFsQ29va2llU3RvcmUgZ2V0QWxsQ29va2llczpbY29va2llc1B0ciA9ICZjb29raWVz XShOU0FycmF5PE5TSFRUUENvb2tpZSAqPiAqbnNDb29raWVzKSB7Ci0gICAgICAgICpjb29raWVz UHRyID0gW25zQ29va2llcyByZXRhaW5dOworICAgIEFTU0VSVF9FUShjb29raWVTdG9yZSwgZ2xv YmFsQ29va2llU3RvcmUuZ2V0KCkpOworICAgICsrb2JzZXJ2ZXJDYWxsYmFja3M7Cit9CisKK0Bl bmQKKworc3RhdGljIHZvaWQgc2V0VXBDb29raWVUZXN0V2l0aFdlYnNpdGVEYXRhU3RvcmUoV0tX ZWJzaXRlRGF0YVN0b3JlKiBkYXRhU3RvcmUpCit7CisgICAgZ290RmxhZyA9IGZhbHNlOworICAg IC8vIENsZWFyIG91dCBhbnkgd2Vic2l0ZSBkYXRhLgorICAgIFtkYXRhU3RvcmUgcmVtb3ZlRGF0 YU9mVHlwZXM6W1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxXZWJzaXRlRGF0YVR5cGVzXSBtb2RpZmll ZFNpbmNlOltOU0RhdGUgZGlzdGFudFBhc3RdIGNvbXBsZXRpb25IYW5kbGVyOltdIHsKICAgICAg ICAgZ290RmxhZyA9IHRydWU7CiAgICAgfV07Ci0KICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpy dW4oJmdvdEZsYWcpOwogCi0gICAgZm9yIChpZCBjb29raWUgaW4gY29va2llcykgewotICAgICAg ICBnb3RGbGFnID0gZmFsc2U7Ci0gICAgICAgIFtnbG9iYWxDb29raWVTdG9yZSBkZWxldGVDb29r aWU6Y29va2llIGNvbXBsZXRpb25IYW5kbGVyOltdKCkgewotICAgICAgICAgICAgZ290RmxhZyA9 IHRydWU7Ci0gICAgICAgIH1dOwotICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmdv dEZsYWcpOwotICAgIH0KKyAgICBvYnNlcnZlckNhbGxiYWNrcyA9IDA7CisgICAgZ2xvYmFsQ29v a2llU3RvcmUgPSBkYXRhU3RvcmUuaHR0cENvb2tpZVN0b3JlOwogCi0gICAgY29va2llcyA9IG5p bDsKKyAgICBOU0FycmF5PE5TSFRUUENvb2tpZSAqPiAqY29va2llcyA9IG5pbDsKICAgICBnb3RG bGFnID0gZmFsc2U7CiAgICAgW2dsb2JhbENvb2tpZVN0b3JlIGdldEFsbENvb2tpZXM6W2Nvb2tp ZXNQdHIgPSAmY29va2llc10oTlNBcnJheTxOU0hUVFBDb29raWUgKj4gKm5zQ29va2llcykgewog ICAgICAgICAqY29va2llc1B0ciA9IFtuc0Nvb2tpZXMgcmV0YWluXTsKQEAgLTU0OSwxNyArNTU3 LDE1IEBAIHN0YXRpYyB2b2lkIHNldFVwQ29va2llVGVzdCgpCiBURVNUKEluQXBwQnJvd3NlclBy aXZhY3ksIFNldENvb2tpZUZvck5vbkFwcEJvdW5kRG9tYWluRmFpbHMpCiB7CiAgICAgaW5pdGlh bGl6ZUluQXBwQnJvd3NlclByaXZhY3lUZXN0U2V0dGluZ3MoKTsKLSAgICBbW05TVXNlckRlZmF1 bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRCb29sOllFUyBmb3JLZXk6QCJXZWJLaXREZWJ1 Z0lzSW5BcHBCcm93c2VyUHJpdmFjeUVuYWJsZWQiXTsKIAogICAgIGF1dG8gZGF0YVN0b3JlID0g W1dLV2Vic2l0ZURhdGFTdG9yZSBkZWZhdWx0RGF0YVN0b3JlXTsKICAgICBhdXRvIHdlYlZpZXcg PSBhZG9wdE5TKFtUZXN0V0tXZWJWaWV3IG5ld10pOwogICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3Ry aW5nOkAiT2ggaGVsbG8iIGJhc2VVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJodHRwOi8vd2Vi a2l0Lm9yZyJdXTsKICAgICBbd2ViVmlldyBfdGVzdF93YWl0Rm9yRGlkRmluaXNoTmF2aWdhdGlv bl07CiAKLSAgICBzZXRVcENvb2tpZVRlc3QoKTsKLSAgICBnbG9iYWxDb29raWVTdG9yZSA9IFtk YXRhU3RvcmUgaHR0cENvb2tpZVN0b3JlXTsKLQotICAgIE5TQXJyYXk8TlNIVFRQQ29va2llICo+ ICpjb29raWVzID0gbmlsOworICAgIHNldFVwQ29va2llVGVzdFdpdGhXZWJzaXRlRGF0YVN0b3Jl KGRhdGFTdG9yZSk7CisgICAgUmV0YWluUHRyPEluQXBwQnJvd3NlclByaXZhY3lDb29raWVPYnNl cnZlcj4gb2JzZXJ2ZXIgPSBhZG9wdE5TKFtbSW5BcHBCcm93c2VyUHJpdmFjeUNvb2tpZU9ic2Vy dmVyIGFsbG9jXSBpbml0XSk7CisgICAgW2dsb2JhbENvb2tpZVN0b3JlIGFkZE9ic2VydmVyOm9i c2VydmVyLmdldCgpXTsKIAogICAgIC8vIE5vbiBhcHAtYm91bmQgY29va2llLgogICAgIFJldGFp blB0cjxOU0hUVFBDb29raWU+IG5vbkFwcEJvdW5kQ29va2llID0gW05TSFRUUENvb2tpZSBjb29r aWVXaXRoUHJvcGVydGllczpAewpAQCAtNTk0LDEwICs2MDAsMTAgQEAgVEVTVChJbkFwcEJyb3dz ZXJQcml2YWN5LCBTZXRDb29raWVGb3JOb25BcHBCb3VuZERvbWFpbkZhaWxzKQogICAgIFRlc3RX ZWJLaXRBUEk6OlV0aWw6OnJ1bigmZ290RmxhZyk7CiAKICAgICBjbGVhblVwSW5BcHBCcm93c2Vy UHJpdmFjeVRlc3RTZXR0aW5ncygpOwotICAgIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2Vy RGVmYXVsdHNdIHNldEJvb2w6Tk8gZm9yS2V5OkAiV2ViS2l0RGVidWdJc0luQXBwQnJvd3NlclBy aXZhY3lFbmFibGVkIl07CiAgICAgZ290RmxhZyA9IGZhbHNlOwogCiAgICAgLy8gQ2hlY2sgdGhl IGNvb2tpZSBzdG9yZSB0byBtYWtlIHN1cmUgb25seSBvbmUgY29va2llIHdhcyBzZXQuCisgICAg TlNBcnJheTxOU0hUVFBDb29raWUgKj4gKmNvb2tpZXMgPSBuaWw7CiAgICAgW2dsb2JhbENvb2tp ZVN0b3JlIGdldEFsbENvb2tpZXM6W2Nvb2tpZXNQdHIgPSAmY29va2llc10oTlNBcnJheTxOU0hU VFBDb29raWUgKj4gKm5zQ29va2llcykgewogICAgICAgICAqY29va2llc1B0ciA9IFtuc0Nvb2tp ZXMgcmV0YWluXTsKICAgICAgICAgZ290RmxhZyA9IHRydWU7CkBAIC02MDYsNiArNjEyLDkgQEAg VEVTVChJbkFwcEJyb3dzZXJQcml2YWN5LCBTZXRDb29raWVGb3JOb25BcHBCb3VuZERvbWFpbkZh aWxzKQogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZ290RmxhZyk7CiAKICAgICBBU1NF UlRfRVEoY29va2llcy5jb3VudCwgMXUpOworICAgIEVYUEVDVF9XS19TVFJFUShjb29raWVzWzBd LmRvbWFpbiwgQCJ3d3cud2Via2l0Lm9yZyIpOworICAgIHdoaWxlIChvYnNlcnZlckNhbGxiYWNr cyAhPSAxdSkKKyAgICAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6c3BpblJ1bkxvb3AoKTsKIAog ICAgIFtjb29raWVzIHJlbGVhc2VdOwogICAgIGdvdEZsYWcgPSBmYWxzZTsKQEAgLTYxNCwxNyAr NjIzLDE2IEBAIFRFU1QoSW5BcHBCcm93c2VyUHJpdmFjeSwgU2V0Q29va2llRm9yTm9uQXBwQm91 bmREb21haW5GYWlscykKICAgICB9XTsKIAogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigm Z290RmxhZyk7CisgICAgW2dsb2JhbENvb2tpZVN0b3JlIHJlbW92ZU9ic2VydmVyOm9ic2VydmVy LmdldCgpXTsKIH0KIAogVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5LCBHZXRDb29raWVGb3JOb25B cHBCb3VuZERvbWFpbkZhaWxzKQogewogICAgIC8vIFNpbmNlIHdlIGNhbid0IHNldCBub24tYXBw LWJvdW5kIGNvb2tpZXMgd2l0aCBJbi1BcHAgQnJvd3NlciBwcml2YWN5IHByb3RlY3Rpb25zIG9u LAogICAgIC8vIHdlIGNhbiB0dXJuIHRoZSBwcm90ZWN0aW9ucyBvZmYgdG8gc2V0IGEgY29va2ll IHdlIHdpbGwgdGhlbiB0cnkgdG8gZ2V0IHdpdGggcHJvdGVjdGlvbnMgZW5hYmxlZC4KLSAgICBb W05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRCb29sOk5PIGZvcktleTpA IldlYktpdERlYnVnSXNJbkFwcEJyb3dzZXJQcml2YWN5RW5hYmxlZCJdOworICAgIGNsZWFuVXBJ bkFwcEJyb3dzZXJQcml2YWN5VGVzdFNldHRpbmdzKCk7CiAKLSAgICBzZXRVcENvb2tpZVRlc3Qo KTsKLSAgICBnbG9iYWxDb29raWVTdG9yZSA9IFtbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHRE YXRhU3RvcmVdIGh0dHBDb29raWVTdG9yZV07Ci0gICAgTlNBcnJheTxOU0hUVFBDb29raWUgKj4g KmNvb2tpZXMgPSBuaWw7CisgICAgc2V0VXBDb29raWVUZXN0V2l0aFdlYnNpdGVEYXRhU3RvcmUo W1dLV2Vic2l0ZURhdGFTdG9yZSBkZWZhdWx0RGF0YVN0b3JlXSk7CiAKICAgICAvLyBOb24gYXBw LWJvdW5kIGNvb2tpZS4KICAgICBSZXRhaW5QdHI8TlNIVFRQQ29va2llPiBub25BcHBCb3VuZENv b2tpZSA9IFtOU0hUVFBDb29raWUgY29va2llV2l0aFByb3BlcnRpZXM6QHsKQEAgLTY0Miw2ICs2 NTAsNyBAQCBURVNUKEluQXBwQnJvd3NlclByaXZhY3ksIEdldENvb2tpZUZvck5vbkFwcEJvdW5k RG9tYWluRmFpbHMpCiAgICAgICAgIE5TSFRUUENvb2tpZURvbWFpbjogQCJ3d3cud2Via2l0Lm9y ZyIsCiAgICAgfV07CiAKKyAgICBnb3RGbGFnID0gZmFsc2U7CiAgICAgYXV0byB3ZWJWaWV3ID0g YWRvcHROUyhbVGVzdFdLV2ViVmlldyBuZXddKTsKICAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5 TG9hZEhUTUxTdHJpbmc6QCJzdGFydCBuZXR3b3JrIHByb2Nlc3MiXTsKIApAQCAtNjYwLDYgKzY2 OSw3IEBAIFRFU1QoSW5BcHBCcm93c2VyUHJpdmFjeSwgR2V0Q29va2llRm9yTm9uQXBwQm91bmRE b21haW5GYWlscykKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmdvdEZsYWcpOwogCiAg ICAgZ290RmxhZyA9IGZhbHNlOworICAgIE5TQXJyYXk8TlNIVFRQQ29va2llICo+ICpjb29raWVz ID0gbmlsOwogICAgIFtnbG9iYWxDb29raWVTdG9yZSBnZXRBbGxDb29raWVzOltjb29raWVzUHRy ID0gJmNvb2tpZXNdKE5TQXJyYXk8TlNIVFRQQ29va2llICo+ICpuc0Nvb2tpZXMpIHsKICAgICAg ICAgKmNvb2tpZXNQdHIgPSBbbnNDb29raWVzIHJldGFpbl07CiAgICAgICAgIGdvdEZsYWcgPSB0 cnVlOwpAQCAtNjcxLDkgKzY4MSw5IEBAIFRFU1QoSW5BcHBCcm93c2VyUHJpdmFjeSwgR2V0Q29v a2llRm9yTm9uQXBwQm91bmREb21haW5GYWlscykKICAgICBBU1NFUlRfRVEoY29va2llcy5jb3Vu dCwgMnUpOwogCiAgICAgLy8gTm93IGVuYWJsZSBwcm90ZWN0aW9ucyBhbmQgZW5zdXJlIHdlIGNh biBvbmx5IHJldHJpZXZlIHRoZSBhcHAtYm91bmQgY29va2llcy4KLSAgICBbW05TVXNlckRlZmF1 bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRCb29sOllFUyBmb3JLZXk6QCJXZWJLaXREZWJ1 Z0lzSW5BcHBCcm93c2VyUHJpdmFjeUVuYWJsZWQiXTsKICAgICBpbml0aWFsaXplSW5BcHBCcm93 c2VyUHJpdmFjeVRlc3RTZXR0aW5ncygpOwogCisgICAgY29va2llcyA9IG5pbDsKICAgICBnb3RG bGFnID0gZmFsc2U7CiAgICAgW2dsb2JhbENvb2tpZVN0b3JlIGdldEFsbENvb2tpZXM6W2Nvb2tp ZXNQdHIgPSAmY29va2llc10oTlNBcnJheTxOU0hUVFBDb29raWUgKj4gKm5zQ29va2llcykgewog ICAgICAgICAqY29va2llc1B0ciA9IFtuc0Nvb2tpZXMgcmV0YWluXTsKQEAgLTY5NSw4ICs3MDUs NiBAQCBURVNUKEluQXBwQnJvd3NlclByaXZhY3ksIEdldENvb2tpZUZvck5vbkFwcEJvdW5kRG9t YWluRmFpbHMpCiAKICAgICBnb3RGbGFnID0gZmFsc2U7CiAgICAgW2dsb2JhbENvb2tpZVN0b3Jl IGRlbGV0ZUNvb2tpZTphcHBCb3VuZENvb2tpZS5nZXQoKSBjb21wbGV0aW9uSGFuZGxlcjpbXSgp IHsKLSAgICAgICAgLy8gUmVzZXQgZmxhZy4KLSAgICAgICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFu ZGFyZFVzZXJEZWZhdWx0c10gc2V0Qm9vbDpOTyBmb3JLZXk6QCJXZWJLaXREZWJ1Z0lzSW5BcHBC cm93c2VyUHJpdmFjeUVuYWJsZWQiXTsKICAgICAgICAgY2xlYW5VcEluQXBwQnJvd3NlclByaXZh Y3lUZXN0U2V0dGluZ3MoKTsKICAgICAgICAgZ290RmxhZyA9IHRydWU7CiAgICAgfV07CkBAIC03 MDgsOCArNzE2LDggQEAgVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5LCBHZXRDb29raWVGb3JVUkxG YWlscykKIHsKICAgICAvLyBTaW5jZSB3ZSBjYW4ndCBzZXQgbm9uLWFwcC1ib3VuZCBjb29raWVz IHdpdGggSW4tQXBwIEJyb3dzZXIgcHJpdmFjeSBwcm90ZWN0aW9ucyBvbiwKICAgICAvLyB3ZSBj YW4gdHVybiB0aGUgcHJvdGVjdGlvbnMgb2ZmIHRvIHNldCBhIGNvb2tpZSB3ZSB3aWxsIHRoZW4g dHJ5IHRvIGdldCB3aXRoIHByb3RlY3Rpb25zIGVuYWJsZWQuCi0gICAgW1tOU1VzZXJEZWZhdWx0 cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gc2V0Qm9vbDpOTyBmb3JLZXk6QCJXZWJLaXREZWJ1Z0lz SW5BcHBCcm93c2VyUHJpdmFjeUVuYWJsZWQiXTsKLSAgICBzZXRVcENvb2tpZVRlc3QoKTsKKyAg ICBjbGVhblVwSW5BcHBCcm93c2VyUHJpdmFjeVRlc3RTZXR0aW5ncygpOworICAgIHNldFVwQ29v a2llVGVzdFdpdGhXZWJzaXRlRGF0YVN0b3JlKFtXS1dlYnNpdGVEYXRhU3RvcmUgZGVmYXVsdERh dGFTdG9yZV0pOwogCiAgICAgZ2xvYmFsQ29va2llU3RvcmUgPSBbW1dLV2Vic2l0ZURhdGFTdG9y ZSBkZWZhdWx0RGF0YVN0b3JlXSBodHRwQ29va2llU3RvcmVdOwogICAgIE5TSFRUUENvb2tpZSAq bm9uQXBwQm91bmRDb29raWUgPSBbTlNIVFRQQ29va2llIGNvb2tpZVdpdGhQcm9wZXJ0aWVzOkB7 CkBAIC03MzMsNyArNzQxLDYgQEAgVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5LCBHZXRDb29raWVG b3JVUkxGYWlscykKICAgICAgICAgW2dsb2JhbENvb2tpZVN0b3JlIHNldENvb2tpZTphcHBCb3Vu ZENvb2tpZSBjb21wbGV0aW9uSGFuZGxlcjpeewogCiAgICAgICAgICAgICAvLyBOb3cgZW5hYmxl IHByb3RlY3Rpb25zIGFuZCBlbnN1cmUgd2UgY2FuIG9ubHkgcmV0cmlldmUgdGhlIGFwcC1ib3Vu ZCBjb29raWVzLgotICAgICAgICAgICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZh dWx0c10gc2V0Qm9vbDpZRVMgZm9yS2V5OkAiV2ViS2l0RGVidWdJc0luQXBwQnJvd3NlclByaXZh Y3lFbmFibGVkIl07CiAgICAgICAgICAgICBpbml0aWFsaXplSW5BcHBCcm93c2VyUHJpdmFjeVRl c3RTZXR0aW5ncygpOwogCiAgICAgICAgICAgICBbZ2xvYmFsQ29va2llU3RvcmUgX2dldENvb2tp ZXNGb3JVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJodHRwczovL3dlYmtpdC5vcmcvIl0gY29t cGxldGlvbkhhbmRsZXI6XihOU0FycmF5PE5TSFRUUENvb2tpZSAqPiAqY29va2llcykgewpAQCAt NzQzLDcgKzc1MCw2IEBAIFRFU1QoSW5BcHBCcm93c2VyUHJpdmFjeSwgR2V0Q29va2llRm9yVVJM RmFpbHMpCiAgICAgICAgICAgICAgICAgICAgIEVYUEVDVF9FUShjb29raWVzLmNvdW50LCAwdSk7 CiAgICAgICAgICAgICAgICAgICAgIFtnbG9iYWxDb29raWVTdG9yZSBkZWxldGVDb29raWU6bm9u QXBwQm91bmRDb29raWUgY29tcGxldGlvbkhhbmRsZXI6XnsKICAgICAgICAgICAgICAgICAgICAg ICAgIFtnbG9iYWxDb29raWVTdG9yZSBkZWxldGVDb29raWU6YXBwQm91bmRDb29raWUgY29tcGxl dGlvbkhhbmRsZXI6XnsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBbW05TVXNlckRlZmF1 bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRCb29sOk5PIGZvcktleTpAIldlYktpdERlYnVn SXNJbkFwcEJyb3dzZXJQcml2YWN5RW5hYmxlZCJdOwogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNsZWFuVXBJbkFwcEJyb3dzZXJQcml2YWN5VGVzdFNldHRpbmdzKCk7CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZG9uZSA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICB9 XTsK