201574 2019-09-06 20:46:34 -0700 Rewrite http/tests/workers/service/serviceworker-private-browsing.https.html as an API test 2019-09-07 22:27:17 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 201546 1 cdumez cdumez achristensen beidson commit-queue ggaren webkit-bug-importer youennf oldest_to_newest 1568822 0 cdumez 2019-09-06 20:46:34 -0700 Rewrite http/tests/workers/service/serviceworker-private-browsing.https.html as an API test so that we truly test private browsing. testRunner.setPrivateBrowsingEnabled_DEPRECATED() is a hack which does not work well for WK2. 1568823 1 378271 cdumez 2019-09-06 20:51:17 -0700 Created attachment 378271 Patch 1568894 2 378271 achristensen 2019-09-07 09:22:31 -0700 Comment on attachment 378271 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=378271&action=review > Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:1419 > + auto ephemeralConfiguration = adoptNS([[WKWebViewConfiguration alloc] init]); In order for this to be an equivalent test, don't you need to set the processPool to be the same as the defaultWebView? 1568900 3 cdumez 2019-09-07 10:58:12 -0700 (In reply to Alex Christensen from comment #2) > Comment on attachment 378271 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=378271&action=review > > > Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:1419 > > + auto ephemeralConfiguration = adoptNS([[WKWebViewConfiguration alloc] init]); > > In order for this to be an equivalent test, don't you need to set the > processPool to be the same as the defaultWebView? Well, that is a good point. For some reason, I assumed this was the default behavior :/ will fix. 1568904 4 378297 cdumez 2019-09-07 11:26:42 -0700 Created attachment 378297 Patch 1568905 5 cdumez 2019-09-07 11:26:57 -0700 (In reply to Chris Dumez from comment #3) > (In reply to Alex Christensen from comment #2) > > Comment on attachment 378271 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=378271&action=review > > > > > Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:1419 > > > + auto ephemeralConfiguration = adoptNS([[WKWebViewConfiguration alloc] init]); > > > > In order for this to be an equivalent test, don't you need to set the > > processPool to be the same as the defaultWebView? > > Well, that is a good point. For some reason, I assumed this was the default > behavior :/ will fix. Done. 1568982 6 378297 commit-queue 2019-09-07 22:26:57 -0700 Comment on attachment 378297 Patch Clearing flags on attachment: 378297 Committed r249626: <https://trac.webkit.org/changeset/249626> 1568983 7 commit-queue 2019-09-07 22:26:59 -0700 All reviewed patches have been landed. Closing bug. 1568984 8 webkit-bug-importer 2019-09-07 22:27:16 -0700 <rdar://problem/55155561> 1568985 9 webkit-bug-importer 2019-09-07 22:27:17 -0700 <rdar://problem/55155563> 378271 2019-09-06 20:51:17 -0700 2019-09-07 11:26:41 -0700 Patch bug-201574-20190906205103.patch text/plain 13992 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5NjAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA5MmE1MTczMzY4Mjg4MWU5 OTY5MjEwMzEwM2Q0ZmE4YzQzZDQzNmQuLmUxZTkzYjFhZTNiYmZiYWYwNTFmN2Q0MmI0MDcwYmM5 YTFlYjA4NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDktMDYgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZXdyaXRlIGh0dHAvdGVzdHMvd29y a2Vycy9zZXJ2aWNlL3NlcnZpY2V3b3JrZXItcHJpdmF0ZS1icm93c2luZy5odHRwcy5odG1sIGFz IGFuIEFQSSB0ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDE1NzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVcGRhdGUgU2VydmljZSBXb3JrZXJzIHNvIHRoYXQgdGhleSBvYmV5IHRoZSAic2VjdXJl Q29udGV4dENoZWNrc0VuYWJsZWQiIHByZWZlcmVuY2UuCisgICAgICAgIFRoaXMgd2FzIG5lZWRl ZCB0byBhbGxvdyBteSBzZXJ2aWNlIHdvcmtlciB0byBhY2Nlc3Mgc2VsZi5jYWNoZXMgaW4gbXkg QVBJIHRlc3QuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0TWFu YWdlckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJTV0NvbnRleHRNYW5hZ2Vy Q29ubmVjdGlvbjo6dXBkYXRlUHJlZmVyZW5jZXNTdG9yZSk6CisKIDIwMTktMDktMDYgIENocmlz IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIHRoZSBSZXNvdXJjZUxv YWRPYnNlcnZlciBsb2dpYyB0byBXZWJLaXQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlv bi5jcHAKaW5kZXggYzkyNTdhYjc1Y2NhMDBlZjA5MjQwZmRlNzhjNTEyODZkODBjNzFjZS4uMDI4 ZGEzMGJlNGEzNjNmNTg3YzYyMWQ0NzA3YmE1NzgyNzRkZmNiNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1h bmFnZXJDb25uZWN0aW9uLmNwcApAQCAtMTEzLDYgKzExMyw3IEBAIHZvaWQgV2ViU1dDb250ZXh0 TWFuYWdlckNvbm5lY3Rpb246OnVwZGF0ZVByZWZlcmVuY2VzU3RvcmUoY29uc3QgV2ViUHJlZmVy ZW5jZXNTCiAgICAgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5zZXRS ZXN0cmljdGVkSFRUUFJlc3BvbnNlQWNjZXNzKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQ cmVmZXJlbmNlc0tleTo6cmVzdHJpY3RlZEhUVFBSZXNwb25zZUFjY2Vzc0tleSgpKSk7CiAgICAg UnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5zZXRTZXJ2ZXJUaW1pbmdF bmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6c2VydmVy VGltaW5nRW5hYmxlZEtleSgpKSk7CiAgICAgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVk RmVhdHVyZXMoKS5zZXRJc1NlY3VyZUNvbnRleHRBdHRyaWJ1dGVFbmFibGVkKHN0b3JlLmdldEJv b2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6aXNTZWN1cmVDb250ZXh0QXR0cmlidXRl RW5hYmxlZEtleSgpKSk7CisgICAgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVy ZXMoKS5zZXRTZWN1cmVDb250ZXh0Q2hlY2tzRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JL ZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnNlY3VyZUNvbnRleHRDaGVja3NFbmFibGVkS2V5KCkpKTsK IAogICAgIG1fc3RvcmFnZUJsb2NraW5nUG9saWN5ID0gc3RhdGljX2Nhc3Q8U2VjdXJpdHlPcmln aW46OlN0b3JhZ2VCbG9ja2luZ1BvbGljeT4oc3RvcmUuZ2V0VUludDMyVmFsdWVGb3JLZXkoV2Vi UHJlZmVyZW5jZXNLZXk6OnN0b3JhZ2VCbG9ja2luZ1BvbGljeUtleSgpKSk7CiB9CmRpZmYgLS1n aXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDk4ODM0ODFjNGRi ZTM0MzMwMjU0N2JhNzQxZTU0Yzc0ODczYjhhYi4uOTg0NDJjZTQxNGE4YTg5NDQ1NGQ5ZjBlYjI1 YjBmNjQ2ZDU3MGQ3NCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTA5LTA2ICBDaHJpcyBEdW1leiAgPGNkdW1l ekBhcHBsZS5jb20+CisKKyAgICAgICAgUmV3cml0ZSBodHRwL3Rlc3RzL3dvcmtlcnMvc2Vydmlj ZS9zZXJ2aWNld29ya2VyLXByaXZhdGUtYnJvd3NpbmcuaHR0cHMuaHRtbCBhcyBhbiBBUEkgdGVz dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxNTc0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV3cml0 ZSBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9zZXJ2aWNld29ya2VyLXByaXZhdGUtYnJvd3Np bmcuaHR0cHMuaHRtbCBhcyBhbiBBUEkgdGVzdCBzbyB0aGF0CisgICAgICAgIHdlIHRydWx5IHRl c3QgcHJpdmF0ZSBicm93c2luZy4gdGVzdFJ1bm5lci5zZXRQcml2YXRlQnJvd3NpbmdFbmFibGVk X0RFUFJFQ0FURUQoKSBpcyBhIGhhY2sgd2hpY2gKKyAgICAgICAgZG9lcyBub3Qgd29yayB3ZWxs IGZvciBXSzIuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Nl cnZpY2VXb3JrZXJCYXNpYy5tbToKKwogMjAxOS0wOS0wNiAgTWF0dCBMZXdpcyAgPGpsZXdpczNA YXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyNDk1ODIuCmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NlcnZpY2VX b3JrZXJCYXNpYy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2Vy dmljZVdvcmtlckJhc2ljLm1tCmluZGV4IDI5Y2EzZmJjOGExNGE5YTIyMzI0MGFkYmRlNDlmZGNl NmRlZGE3MjEuLjAwMzcwMTlkODhjYzcyZTYzZDdhM2NhMjY1ZWFkZjQ1ZTM5Nzc4MzggMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2VydmljZVdvcmtl ckJhc2ljLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2Vy dmljZVdvcmtlckJhc2ljLm1tCkBAIC0xMzUxLDYgKzEzNTEsOTMgQEAgVEVTVChTZXJ2aWNlV29y a2VycywgQ2FjaGVTdG9yYWdlSW5Qcml2YXRlQnJvd3NpbmdNb2RlKQogICAgIGRvbmUgPSBmYWxz ZTsKIH0KIAorc3RhdGljIGNvbnN0IGNoYXIqIHNlcnZpY2VXb3JrZXJDYWNoZUFjY2Vzc0VwaGVt ZXJhbFNlc3Npb25NYWluQnl0ZXMgPSBSIlNXUkVTT1VSQ0UoCis8c2NyaXB0PgordHJ5IHsKKyAg ICBuYXZpZ2F0b3Iuc2VydmljZVdvcmtlci5hZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIiwgKGV2 ZW50KSA9PiB7CisgICAgICAgIHdlYmtpdC5tZXNzYWdlSGFuZGxlcnMuc3cucG9zdE1lc3NhZ2Uo ZXZlbnQuZGF0YSk7CisgICAgfSk7CisKKyAgICBuYXZpZ2F0b3Iuc2VydmljZVdvcmtlci5yZWdp c3Rlcigic2VydmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5nLXdvcmtlci5qcyIsIHsgc2NvcGUg OiAibXkgcHJpdmF0ZSBiYWNreWFyZCIgfSkudGhlbigocmVnaXN0cmF0aW9uKSA9PiB7CisgICAg ICAgIGFjdGl2ZVdvcmtlciA9IHJlZ2lzdHJhdGlvbi5pbnN0YWxsaW5nOworICAgICAgICBhY3Rp dmVXb3JrZXIuYWRkRXZlbnRMaXN0ZW5lcignc3RhdGVjaGFuZ2UnLCAoKSA9PiB7CisgICAgICAg ICAgICBpZiAoYWN0aXZlV29ya2VyLnN0YXRlID09PSAiYWN0aXZhdGVkIikgeworICAgICAgICAg ICAgICAgIGFjdGl2ZVdvcmtlci5wb3N0TWVzc2FnZSgiVEVTVENBQ0hFIik7CisgICAgICAgICAg ICB9CisgICAgICAgIH0pOworICAgIH0pOworfSBjYXRjaCAoZSkgeworICAgIHdlYmtpdC5tZXNz YWdlSGFuZGxlcnMuc3cucG9zdE1lc3NhZ2UoIiIgKyBlKTsKK30KKzwvc2NyaXB0PgorKVNXUkVT T1VSQ0UiOworCitzdGF0aWMgY29uc3QgY2hhciogc2VydmljZVdvcmtlckNhY2hlQWNjZXNzRXBo ZW1lcmFsU2Vzc2lvblNXQnl0ZXMgPSBSIlNXUkVTT1VSQ0UoCitzZWxmLmFkZEV2ZW50TGlzdGVu ZXIoIm1lc3NhZ2UiLCAoZXZlbnQpID0+IHsKKyAgICB0cnkgeworICAgICAgICBzZWxmLmNhY2hl cy5rZXlzKCkudGhlbigoa2V5cykgPT4geworICAgICAgICAgICAgZXZlbnQuc291cmNlLnBvc3RN ZXNzYWdlKGtleXMubGVuZ3RoID09PSAwID8gIlBBU1MiIDogIkZBSUw6IGNhY2hlcyBpcyBub3Qg ZW1wdHksIGdvdDogIiArIEpTT04uc3RyaW5naWZ5KGtleXMpKTsKKyAgICAgICAgfSk7CisgICAg fSBjYXRjaCAoZSkgeworICAgICAgICAgZXZlbnQuc291cmNlLnBvc3RNZXNzYWdlKCIiICsgZSk7 CisgICAgfQorfSk7CispU1dSRVNPVVJDRSI7CisKKy8vIE9wZW5zIGEgY2FjaGUgaW4gdGhlIGRl ZmF1bHQgc2Vzc2lvbiBhbmQgY2hlY2tzIHRoYXQgYW4gZXBoZW1lcmFsIHNlcnZpY2Ugd29ya2Vy CisvLyBkb2VzIG5vdCBoYXZlIGFjY2VzcyB0byBpdC4KK1RFU1QoU2VydmljZVdvcmtlcnMsIFNl cnZpY2VXb3JrZXJDYWNoZUFjY2Vzc0VwaGVtZXJhbFNlc3Npb24pCit7CisgICAgW1dLV2Vic2l0 ZURhdGFTdG9yZSBfYWxsb3dXZWJzaXRlRGF0YVJlY29yZHNGb3JBbGxPcmlnaW5zXTsKKworICAg IC8vIFN0YXJ0IHdpdGggYSBjbGVhbiBzbGF0ZSBkYXRhIHN0b3JlCisgICAgW1tXS1dlYnNpdGVE YXRhU3RvcmUgZGVmYXVsdERhdGFTdG9yZV0gcmVtb3ZlRGF0YU9mVHlwZXM6W1dLV2Vic2l0ZURh dGFTdG9yZSBhbGxXZWJzaXRlRGF0YVR5cGVzXSBtb2RpZmllZFNpbmNlOltOU0RhdGUgZGlzdGFu dFBhc3RdIGNvbXBsZXRpb25IYW5kbGVyOl4oKSB7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAg IH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZh bHNlOworICAgIAorICAgIGF1dG8gZGVmYXVsdENvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tX ZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIHNldENvbmZpZ3VyYXRpb25J bmplY3RlZEJ1bmRsZVBhdGgoZGVmYXVsdENvbmZpZ3VyYXRpb24uZ2V0KCkpOworICAgIAorICAg IGF1dG8gZGVmYXVsdFByZWZlcmVuY2VzID0gW2RlZmF1bHRDb25maWd1cmF0aW9uIHByZWZlcmVu Y2VzXTsKKyAgICBbZGVmYXVsdFByZWZlcmVuY2VzIF9zZXRTZWN1cmVDb250ZXh0Q2hlY2tzRW5h YmxlZDpOT107CisgICAgCisgICAgYXV0byBoYW5kbGVyID0gYWRvcHROUyhbW1NXU2NoZW1lcyBh bGxvY10gaW5pdF0pOworICAgIGhhbmRsZXItPnJlc291cmNlcy5zZXQoInN3Oi8vaG9zdC9vcGVu Q2FjaGUuaHRtbCIsIFJlc291cmNlSW5mbyB7IEAidGV4dC9odG1sIiwgImZvbyIgfSk7CisgICAg W2RlZmF1bHRDb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBm b3JVUkxTY2hlbWU6QCJTVyJdOworICAgIGF1dG8gZGVmYXVsdFdlYlZpZXcgPSBhZG9wdE5TKFtb VGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwg NjAwKSBjb25maWd1cmF0aW9uOmRlZmF1bHRDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgTlNV UkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwg VVJMV2l0aFN0cmluZzpAInN3Oi8vaG9zdC9vcGVuQ2FjaGUuaHRtbCJdXTsKKyAgICBbZGVmYXVs dFdlYlZpZXcgc3luY2hyb25vdXNseUxvYWRSZXF1ZXN0OnJlcXVlc3RdOworICAgIAorICAgIGJv b2wgb3BlbmVkQ2FjaGUgPSBmYWxzZTsKKyAgICBbZGVmYXVsdFdlYlZpZXcgZXZhbHVhdGVKYXZh U2NyaXB0OkAic2VsZi5jYWNoZXMub3BlbigndGVzdCcpOyIgY29tcGxldGlvbkhhbmRsZXI6IFsm XSAoaWQgaW5uZXJUZXh0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBvcGVuZWRDYWNoZSA9 IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZvcGVuZWRDYWNo ZSk7CisKKyAgICBhdXRvIGVwaGVtZXJhbENvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJW aWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIHNldENvbmZpZ3VyYXRpb25Jbmpl Y3RlZEJ1bmRsZVBhdGgoZXBoZW1lcmFsQ29uZmlndXJhdGlvbi5nZXQoKSk7CisgICAgZXBoZW1l cmFsQ29uZmlndXJhdGlvbi5nZXQoKS53ZWJzaXRlRGF0YVN0b3JlID0gW1dLV2Vic2l0ZURhdGFT dG9yZSBub25QZXJzaXN0ZW50RGF0YVN0b3JlXTsKKworICAgIGF1dG8gZXBoZW1lcmFsUHJlZmVy ZW5jZXMgPSBbZXBoZW1lcmFsQ29uZmlndXJhdGlvbiBwcmVmZXJlbmNlc107CisgICAgW2VwaGVt ZXJhbFByZWZlcmVuY2VzIF9zZXRTZWN1cmVDb250ZXh0Q2hlY2tzRW5hYmxlZDpOT107CisKKyAg ICBhdXRvIG1lc3NhZ2VIYW5kbGVyID0gYWRvcHROUyhbW1NXTWVzc2FnZUhhbmRsZXJGb3JDYWNo ZVN0b3JhZ2UgYWxsb2NdIGluaXRdKTsKKyAgICBbW2VwaGVtZXJhbENvbmZpZ3VyYXRpb24gdXNl ckNvbnRlbnRDb250cm9sbGVyXSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjptZXNzYWdlSGFuZGxl ci5nZXQoKSBuYW1lOkAic3ciXTsKKyAgICBoYW5kbGVyLT5yZXNvdXJjZXMuc2V0KCJzdzovL2hv c3QvbWFpbi5odG1sIiwgUmVzb3VyY2VJbmZvIHsgQCJ0ZXh0L2h0bWwiLCBzZXJ2aWNlV29ya2Vy Q2FjaGVBY2Nlc3NFcGhlbWVyYWxTZXNzaW9uTWFpbkJ5dGVzIH0pOworICAgIGhhbmRsZXItPnJl c291cmNlcy5zZXQoInN3Oi8vaG9zdC9zZXJ2aWNld29ya2VyLXByaXZhdGUtYnJvd3Npbmctd29y a2VyLmpzIiwgUmVzb3VyY2VJbmZvIHsgQCJhcHBsaWNhdGlvbi9qYXZhc2NyaXB0Iiwgc2Vydmlj ZVdvcmtlckNhY2hlQWNjZXNzRXBoZW1lcmFsU2Vzc2lvblNXQnl0ZXMgfSk7CisgICAgCisgICAg W2VwaGVtZXJhbENvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgp IGZvclVSTFNjaGVtZTpAIlNXIl07CisKKyAgICBhdXRvIGVwaGVtZXJhbFdlYlZpZXcgPSBhZG9w dE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAw LCA2MDApIGNvbmZpZ3VyYXRpb246ZXBoZW1lcmFsQ29uZmlndXJhdGlvbi5nZXQoKV0pOworICAg IHJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3Ry aW5nOkAic3c6Ly9ob3N0L21haW4uaHRtbCJdXTsKKworICAgIFtlcGhlbWVyYWxXZWJWaWV3IGxv YWRSZXF1ZXN0OnJlcXVlc3RdOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7 CisgICAgZG9uZSA9IGZhbHNlOworfQorCiBzdGF0aWMgY29uc3QgY2hhciogcmVndWxhclBhZ2VH cmFiYmluZ0NhY2hlU3RvcmFnZURpcmVjdG9yeSA9IFIiU1dSRVNPVVJDRSgKIDxzY3JpcHQ+CiBh c3luYyBmdW5jdGlvbiBnZXRSZXN1bHQoKQpAQCAtMTM4MCw5ICsxNDY3LDcgQEAgVEVTVChTZXJ2 aWNlV29ya2VycywgU2VydmljZVdvcmtlckFuZENhY2hlU3RvcmFnZURlZmF1bHREaXJlY3Rvcmll cykKIAogICAgIFtXS1dlYnNpdGVEYXRhU3RvcmUgX2FsbG93V2Vic2l0ZURhdGFSZWNvcmRzRm9y QWxsT3JpZ2luc107CiAKLSAgICBSZXRhaW5QdHI8V0tXZWJWaWV3Q29uZmlndXJhdGlvbj4gY29u ZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0 XSk7Ci0KLSAgICBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRp b24gYWxsb2NdIGluaXRdKTsKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tX ZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOwogICAgIHNldENvbmZpZ3VyYXRpb25J bmplY3RlZEJ1bmRsZVBhdGgoY29uZmlndXJhdGlvbi5nZXQoKSk7CiAKICAgICBSZXRhaW5QdHI8 RGlyZWN0b3J5UGFnZU1lc3NhZ2VIYW5kbGVyPiBkaXJlY3RvcnlQYWdlTWVzc2FnZUhhbmRsZXIg PSBhZG9wdE5TKFtbRGlyZWN0b3J5UGFnZU1lc3NhZ2VIYW5kbGVyIGFsbG9jXSBpbml0XSk7CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggMmYyNTgwNGY5NmFlOWZkN2I2ZTUwYzgzOWQxMjk0ZTUzZGNjNTJkZC4uYjkyYWJhYWFm Yjk3ZGFhYzNiOWNmY2M5MjQ5MTRjOTlkMzIyYjU4YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisy MDE5LTA5LTA2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmV3 cml0ZSBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9zZXJ2aWNld29ya2VyLXByaXZhdGUtYnJv d3NpbmcuaHR0cHMuaHRtbCBhcyBhbiBBUEkgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxNTc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRHJvcCBsZWdhY3kgdGVzdCB3aGljaCB3YXMgcmVwbGFj ZWQgYnkgYW4gQVBJIHRlc3QuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3dvcmtlcnMvc2Vydmlj ZS9zZXJ2aWNld29ya2VyLXByaXZhdGUtYnJvd3Npbmctd29ya2VyLmpzOiBSZW1vdmVkLgorICAg ICAgICAqIGh0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3NlcnZpY2V3b3JrZXItcHJpdmF0ZS1i cm93c2luZy5odHRwcy1leHBlY3RlZC50eHQ6IFJlbW92ZWQuCisgICAgICAgICogaHR0cC90ZXN0 cy93b3JrZXJzL3NlcnZpY2Uvc2VydmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5nLmh0dHBzLmh0 bWw6IFJlbW92ZWQuCisKIDIwMTktMDktMDYgIEp1c3RpbiBGYW4gIDxqdXN0aW5fZmFuQGFwcGxl LmNvbT4KIAogICAgICAgICBbV2ViR1BVXSBVcGRhdGUgc2V2ZXJhbCBpbnRlcmZhY2UgYW5kIGVu dW0gbmFtZXMgdG8gbWF0Y2ggc3BlYwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy93b3JrZXJzL3NlcnZpY2Uvc2VydmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5nLXdvcmtlci5q cyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3NlcnZpY2V3b3JrZXIt cHJpdmF0ZS1icm93c2luZy13b3JrZXIuanMKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IGU5NGM2MDY4M2NhY2E5OGNjM2M5NWMwMzFjOTg3OWRiYmYyZGU5OTIuLjAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93 b3JrZXJzL3NlcnZpY2Uvc2VydmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5nLXdvcmtlci5qcwor KysgL2Rldi9udWxsCkBAIC0xLDEyICswLDAgQEAKLXNlbGYuYWRkRXZlbnRMaXN0ZW5lcigibWVz c2FnZSIsIGFzeW5jIChldmVudCkgPT4gewotICAgIHRyeSB7IAotICAgICAgICBpZiAoZXZlbnQu ZGF0YSAhPT0gIlRFU1RDQUNIRSIpIHsKLSAgICAgICAgICAgICBldmVudC5zb3VyY2UucG9zdE1l c3NhZ2UoIkZBSUw6IFVua25vd24gbWVzc2FnZSIpOwotICAgICAgICB9Ci0gICAgICAgIHZhciBr ZXlzID0gYXdhaXQgc2VsZi5jYWNoZXMua2V5cygpOwotICAgICAgICBldmVudC5zb3VyY2UucG9z dE1lc3NhZ2Uoa2V5cy5sZW5ndGggPT09IDAgPyAiUEFTUyIgOiAiRkFJTDogY2FjaGVzIGlzIG5v dCBlbXB0eSwgZ290OiAiICsgSlNPTi5zdHJpbmdpZnkoa2V5cykpOwotICAgIH0gY2F0Y2ggKGUp IHsKLSAgICAgICAgZXZlbnQuc291cmNlLnBvc3RNZXNzYWdlKCJGQUlMOiByZWNlaXZlZCBleGNl cHRpb24gIiArIGUpOwotICAgIH0KLX0pOwotCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL3dvcmtlcnMvc2VydmljZS9zZXJ2aWNld29ya2VyLXByaXZhdGUtYnJvd3NpbmcuaHR0 cHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2Uv c2VydmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5nLmh0dHBzLWV4cGVjdGVkLnR4dApkZWxldGVk IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggOGJkZWE4YzhjYWZmNTk0ZGViMjQzMTk2YmJkOTcwZDk4 OWRmNTBkYS4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9zZXJ2aWNld29ya2VyLXByaXZh dGUtYnJvd3NpbmcuaHR0cHMtZXhwZWN0ZWQudHh0CisrKyAvZGV2L251bGwKQEAgLTEsNCArMCww IEBACi0KLVBBU1MgU2V0dXAgY2FjaGUgaW4gcmVndWxhciBzZXNzaW9uIGFuZCBzZXJ2aWNlIHdv cmtlciBpbiBwcml2YXRlIGJyb3dzaW5nIHNlc3Npb24gCi1QQVNTIFRlc3QgcHJpdmF0ZSBicm93 c2luZyBzZXJ2aWNlIHdvcmtlciBoYXMgbm90IGFjY2VzcyB0byByZWd1bGFyIGNhY2hlIHN0b3Jh Z2UgCi0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNl L3NlcnZpY2V3b3JrZXItcHJpdmF0ZS1icm93c2luZy5odHRwcy5odG1sIGIvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2Uvc2VydmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5n Lmh0dHBzLmh0bWwKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDYyZDNmNjI0OWMzNGRh N2E1ZjNjNThhNDQ0ZDQ1OGYwZjg5MTBlN2MuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2Uv c2VydmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5nLmh0dHBzLmh0bWwKKysrIC9kZXYvbnVsbApA QCAtMSw1MyArMCwwIEBACi08aHRtbD4KLTxoZWFkPgotPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMv dGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgotPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhh cm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PgotPC9oZWFkPgotPGJvZHk+Ci08c2NyaXB0PgotdmFy IHNjb3BlID0gIm15IHByaXZhdGUgYmFja3lhcmQiOwotdmFyIGFjdGl2ZVdvcmtlcjsKLQotcHJv bWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7Ci0gICAgLy8gT3BlbmluZyBhIGNhY2hlIGFuZCBj aGVjayB0aGF0IHByaXZhdGUgYnJvd3Npbmcgc2VydmljZSB3b3JrZXIgZG9lcyBub3QgaGF2ZSBh Y2Nlc3MgdG8gaXQuCi0gICAgc2VsZi5jYWNoZXMub3BlbigidGVzdCIpOwotCi0gICAgaWYgKCF3 aW5kb3cudGVzdFJ1bm5lcikKLSAgICAgICByZXR1cm4gUHJvbWlzZS5yZWplY3QoInRlc3QgcmVx dWlyZXMgaW50ZXJuYWxzIEFQSSIpOwotICAgIHRlc3RSdW5uZXIuc2V0UHJpdmF0ZUJyb3dzaW5n RW5hYmxlZF9ERVBSRUNBVEVEKHRydWUpOwotCi0gICAgdmFyIHJlZ2lzdHJhdGlvbiA9IGF3YWl0 IG5hdmlnYXRvci5zZXJ2aWNlV29ya2VyLmdldFJlZ2lzdHJhdGlvbihzY29wZSk7Ci0gICAgaWYg KHJlZ2lzdHJhdGlvbiAmJiByZWdpc3RyYXRpb24uc2NvcGUgPT09IHNjb3BlKQotICAgICAgICBh d2FpdCByZWdpc3RyYXRpb24udW5yZWdpc3RlcigpOwotCi0gICAgdmFyIHJlZ2lzdHJhdGlvbiA9 IGF3YWl0IG5hdmlnYXRvci5zZXJ2aWNlV29ya2VyLnJlZ2lzdGVyKCJzZXJ2aWNld29ya2VyLXBy aXZhdGUtYnJvd3Npbmctd29ya2VyLmpzIiwgeyBzY29wZSA6IHNjb3BlIH0pOwotICAgIGFjdGl2 ZVdvcmtlciA9IHJlZ2lzdHJhdGlvbi5hY3RpdmU7Ci0gICAgaWYgKGFjdGl2ZVdvcmtlcikKLSAg ICAgICAgcmV0dXJuOwotICAgIGFjdGl2ZVdvcmtlciA9IHJlZ2lzdHJhdGlvbi5pbnN0YWxsaW5n OwotICAgIHJldHVybiBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHsKLSAgICAgICAgYWN0aXZlV29y a2VyLmFkZEV2ZW50TGlzdGVuZXIoJ3N0YXRlY2hhbmdlJywgKCkgPT4gewotICAgICAgICAgICAg aWYgKGFjdGl2ZVdvcmtlci5zdGF0ZSA9PT0gImFjdGl2YXRlZCIpCi0gICAgICAgICAgICAgICAg cmVzb2x2ZSgpOwotICAgICAgICB9KTsKLSAgICB9KTsKLX0sICJTZXR1cCBjYWNoZSBpbiByZWd1 bGFyIHNlc3Npb24gYW5kIHNlcnZpY2Ugd29ya2VyIGluIHByaXZhdGUgYnJvd3Npbmcgc2Vzc2lv biIpOwotCi1wcm9taXNlX3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsKLSAgICB2YXIgcHJvbWlzZSA9 IG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHsKLSAgICAgICAgbmF2aWdhdG9yLnNl cnZpY2VXb3JrZXIuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsIHRlc3Quc3RlcF9mdW5jKChl dmVudCkgPT4gewotICAgICAgICAgICAgaWYgKGV2ZW50LmRhdGEgPT09ICJQQVNTIikgewotICAg ICAgICAgICAgICAgIHJlc29sdmUoKTsKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAg ICAgICB9Ci0gICAgICAgICAgICByZWplY3QoZXZlbnQuZGF0YSk7Ci0gICAgICAgIH0pKTsKLSAg ICB9KTsKLQotICAgIGFjdGl2ZVdvcmtlci5wb3N0TWVzc2FnZSgiVEVTVENBQ0hFIik7Ci0gICAg YXdhaXQgcHJvbWlzZTsKLQotfSwgIlRlc3QgcHJpdmF0ZSBicm93c2luZyBzZXJ2aWNlIHdvcmtl ciBoYXMgbm90IGFjY2VzcyB0byByZWd1bGFyIGNhY2hlIHN0b3JhZ2UiKTsKLTwvc2NyaXB0Pgot PC9ib2R5PgotPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rl c3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9u cwppbmRleCA5MThiYWE0NWQyMWZhMmNjNmM4YTMxYTU1NmVkZmY2NGIxZDljYjQ1Li4yYTQ5OTBk MWE5OWE2Y2I2YzUyOWI1MDc3MjVhMDE5ZWU4NjU4ZDk5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9ndGsvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTA0NCw3ICsxMDQ0LDYgQEAgZmFzdC9mb3Jtcy9y YW5nZS9pbnB1dC1hcHBlYXJhbmNlLXJhbmdlLXJ0bC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiAjIFNlcnZpY2Utd29ya2VycyB0ZXN0cyB0aGF0IGZhaWwsIHRpbWUgb3V0IG9yIGNyYXNoLgog d2Via2l0Lm9yZy9iLzE3NTQxOSBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9jb250cm9sbGVy LWNoYW5nZS5odG1sIFsgU2tpcCBdCiB3ZWJraXQub3JnL2IvMTc1NDE5IGh0dHAvdGVzdHMvd29y a2Vycy9zZXJ2aWNlL25vLXBhZ2UtY2FjaGUtd2hlbi1jb250cm9sbGVkLmh0bWwgWyBTa2lwIF0K LXdlYmtpdC5vcmcvYi8xNzU0MTkgaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2Uvc2VydmljZXdv cmtlci1wcml2YXRlLWJyb3dzaW5nLmh0dHBzLmh0bWwgWyBTa2lwIF0KIHdlYmtpdC5vcmcvYi8x NzU0MTkgaHR0cC93cHQvc2VydmljZS13b3JrZXJzL3BlcnNpc3RlbnQtaW1wb3J0U2NyaXB0cy5o dG1sIFsgRmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTc1NDE5IGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvc2VydmljZS13b3JrZXJzL3NlcnZpY2Utd29ya2VyL2FjdGl2YXRpb24uaHR0 cHMuaHRtbCBbIFNraXAgXQogd2Via2l0Lm9yZy9iLzE3NTQxOSBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL3NlcnZpY2Utd29ya2Vycy9zZXJ2aWNlLXdvcmtlci9jbGFpbS13aXRoLXJl ZGlyZWN0Lmh0dHBzLmh0bWwgWyBTa2lwIF0K 378297 2019-09-07 11:26:42 -0700 2019-09-07 22:26:57 -0700 Patch bug-201574-20190907112627.patch text/plain 13552 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5NjAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA5MmE1MTczMzY4Mjg4MWU5 OTY5MjEwMzEwM2Q0ZmE4YzQzZDQzNmQuLmUxZTkzYjFhZTNiYmZiYWYwNTFmN2Q0MmI0MDcwYmM5 YTFlYjA4NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDktMDYgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZXdyaXRlIGh0dHAvdGVzdHMvd29y a2Vycy9zZXJ2aWNlL3NlcnZpY2V3b3JrZXItcHJpdmF0ZS1icm93c2luZy5odHRwcy5odG1sIGFz IGFuIEFQSSB0ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDE1NzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVcGRhdGUgU2VydmljZSBXb3JrZXJzIHNvIHRoYXQgdGhleSBvYmV5IHRoZSAic2VjdXJl Q29udGV4dENoZWNrc0VuYWJsZWQiIHByZWZlcmVuY2UuCisgICAgICAgIFRoaXMgd2FzIG5lZWRl ZCB0byBhbGxvdyBteSBzZXJ2aWNlIHdvcmtlciB0byBhY2Nlc3Mgc2VsZi5jYWNoZXMgaW4gbXkg QVBJIHRlc3QuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0TWFu YWdlckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJTV0NvbnRleHRNYW5hZ2Vy Q29ubmVjdGlvbjo6dXBkYXRlUHJlZmVyZW5jZXNTdG9yZSk6CisKIDIwMTktMDktMDYgIENocmlz IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIHRoZSBSZXNvdXJjZUxv YWRPYnNlcnZlciBsb2dpYyB0byBXZWJLaXQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlv bi5jcHAKaW5kZXggYzkyNTdhYjc1Y2NhMDBlZjA5MjQwZmRlNzhjNTEyODZkODBjNzFjZS4uMDI4 ZGEzMGJlNGEzNjNmNTg3YzYyMWQ0NzA3YmE1NzgyNzRkZmNiNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1h bmFnZXJDb25uZWN0aW9uLmNwcApAQCAtMTEzLDYgKzExMyw3IEBAIHZvaWQgV2ViU1dDb250ZXh0 TWFuYWdlckNvbm5lY3Rpb246OnVwZGF0ZVByZWZlcmVuY2VzU3RvcmUoY29uc3QgV2ViUHJlZmVy ZW5jZXNTCiAgICAgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5zZXRS ZXN0cmljdGVkSFRUUFJlc3BvbnNlQWNjZXNzKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQ cmVmZXJlbmNlc0tleTo6cmVzdHJpY3RlZEhUVFBSZXNwb25zZUFjY2Vzc0tleSgpKSk7CiAgICAg UnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5zZXRTZXJ2ZXJUaW1pbmdF bmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6c2VydmVy VGltaW5nRW5hYmxlZEtleSgpKSk7CiAgICAgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVk RmVhdHVyZXMoKS5zZXRJc1NlY3VyZUNvbnRleHRBdHRyaWJ1dGVFbmFibGVkKHN0b3JlLmdldEJv b2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6aXNTZWN1cmVDb250ZXh0QXR0cmlidXRl RW5hYmxlZEtleSgpKSk7CisgICAgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVy ZXMoKS5zZXRTZWN1cmVDb250ZXh0Q2hlY2tzRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JL ZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnNlY3VyZUNvbnRleHRDaGVja3NFbmFibGVkS2V5KCkpKTsK IAogICAgIG1fc3RvcmFnZUJsb2NraW5nUG9saWN5ID0gc3RhdGljX2Nhc3Q8U2VjdXJpdHlPcmln aW46OlN0b3JhZ2VCbG9ja2luZ1BvbGljeT4oc3RvcmUuZ2V0VUludDMyVmFsdWVGb3JLZXkoV2Vi UHJlZmVyZW5jZXNLZXk6OnN0b3JhZ2VCbG9ja2luZ1BvbGljeUtleSgpKSk7CiB9CmRpZmYgLS1n aXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDk4ODM0ODFjNGRi ZTM0MzMwMjU0N2JhNzQxZTU0Yzc0ODczYjhhYi4uOTg0NDJjZTQxNGE4YTg5NDQ1NGQ5ZjBlYjI1 YjBmNjQ2ZDU3MGQ3NCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTA5LTA2ICBDaHJpcyBEdW1leiAgPGNkdW1l ekBhcHBsZS5jb20+CisKKyAgICAgICAgUmV3cml0ZSBodHRwL3Rlc3RzL3dvcmtlcnMvc2Vydmlj ZS9zZXJ2aWNld29ya2VyLXByaXZhdGUtYnJvd3NpbmcuaHR0cHMuaHRtbCBhcyBhbiBBUEkgdGVz dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxNTc0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV3cml0 ZSBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9zZXJ2aWNld29ya2VyLXByaXZhdGUtYnJvd3Np bmcuaHR0cHMuaHRtbCBhcyBhbiBBUEkgdGVzdCBzbyB0aGF0CisgICAgICAgIHdlIHRydWx5IHRl c3QgcHJpdmF0ZSBicm93c2luZy4gdGVzdFJ1bm5lci5zZXRQcml2YXRlQnJvd3NpbmdFbmFibGVk X0RFUFJFQ0FURUQoKSBpcyBhIGhhY2sgd2hpY2gKKyAgICAgICAgZG9lcyBub3Qgd29yayB3ZWxs IGZvciBXSzIuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Nl cnZpY2VXb3JrZXJCYXNpYy5tbToKKwogMjAxOS0wOS0wNiAgTWF0dCBMZXdpcyAgPGpsZXdpczNA YXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyNDk1ODIuCmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NlcnZpY2VX b3JrZXJCYXNpYy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2Vy dmljZVdvcmtlckJhc2ljLm1tCmluZGV4IDI5Y2EzZmJjOGExNGE5YTIyMzI0MGFkYmRlNDlmZGNl NmRlZGE3MjEuLjk0M2EyMGYzNjBhOTNjNWU0ZTQ0MjA0MWI2NTVlOWZiZDI4NjFjY2UgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2VydmljZVdvcmtl ckJhc2ljLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2Vy dmljZVdvcmtlckJhc2ljLm1tCkBAIC0xMzUxLDYgKzEzNTEsODcgQEAgVEVTVChTZXJ2aWNlV29y a2VycywgQ2FjaGVTdG9yYWdlSW5Qcml2YXRlQnJvd3NpbmdNb2RlKQogICAgIGRvbmUgPSBmYWxz ZTsKIH0KIAorc3RhdGljIGNvbnN0IGNoYXIqIHNlcnZpY2VXb3JrZXJDYWNoZUFjY2Vzc0VwaGVt ZXJhbFNlc3Npb25NYWluQnl0ZXMgPSBSIlNXUkVTT1VSQ0UoCis8c2NyaXB0PgordHJ5IHsKKyAg ICBuYXZpZ2F0b3Iuc2VydmljZVdvcmtlci5hZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIiwgKGV2 ZW50KSA9PiB7CisgICAgICAgIHdlYmtpdC5tZXNzYWdlSGFuZGxlcnMuc3cucG9zdE1lc3NhZ2Uo ZXZlbnQuZGF0YSk7CisgICAgfSk7CisKKyAgICBuYXZpZ2F0b3Iuc2VydmljZVdvcmtlci5yZWdp c3Rlcigic2VydmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5nLXdvcmtlci5qcyIsIHsgc2NvcGUg OiAibXkgcHJpdmF0ZSBiYWNreWFyZCIgfSkudGhlbigocmVnaXN0cmF0aW9uKSA9PiB7CisgICAg ICAgIGFjdGl2ZVdvcmtlciA9IHJlZ2lzdHJhdGlvbi5pbnN0YWxsaW5nOworICAgICAgICBhY3Rp dmVXb3JrZXIuYWRkRXZlbnRMaXN0ZW5lcignc3RhdGVjaGFuZ2UnLCAoKSA9PiB7CisgICAgICAg ICAgICBpZiAoYWN0aXZlV29ya2VyLnN0YXRlID09PSAiYWN0aXZhdGVkIikgeworICAgICAgICAg ICAgICAgIGFjdGl2ZVdvcmtlci5wb3N0TWVzc2FnZSgiVEVTVENBQ0hFIik7CisgICAgICAgICAg ICB9CisgICAgICAgIH0pOworICAgIH0pOworfSBjYXRjaCAoZSkgeworICAgIHdlYmtpdC5tZXNz YWdlSGFuZGxlcnMuc3cucG9zdE1lc3NhZ2UoIiIgKyBlKTsKK30KKzwvc2NyaXB0PgorKVNXUkVT T1VSQ0UiOworCitzdGF0aWMgY29uc3QgY2hhciogc2VydmljZVdvcmtlckNhY2hlQWNjZXNzRXBo ZW1lcmFsU2Vzc2lvblNXQnl0ZXMgPSBSIlNXUkVTT1VSQ0UoCitzZWxmLmFkZEV2ZW50TGlzdGVu ZXIoIm1lc3NhZ2UiLCAoZXZlbnQpID0+IHsKKyAgICB0cnkgeworICAgICAgICBzZWxmLmNhY2hl cy5rZXlzKCkudGhlbigoa2V5cykgPT4geworICAgICAgICAgICAgZXZlbnQuc291cmNlLnBvc3RN ZXNzYWdlKGtleXMubGVuZ3RoID09PSAwID8gIlBBU1MiIDogIkZBSUw6IGNhY2hlcyBpcyBub3Qg ZW1wdHksIGdvdDogIiArIEpTT04uc3RyaW5naWZ5KGtleXMpKTsKKyAgICAgICAgfSk7CisgICAg fSBjYXRjaCAoZSkgeworICAgICAgICAgZXZlbnQuc291cmNlLnBvc3RNZXNzYWdlKCIiICsgZSk7 CisgICAgfQorfSk7CispU1dSRVNPVVJDRSI7CisKKy8vIE9wZW5zIGEgY2FjaGUgaW4gdGhlIGRl ZmF1bHQgc2Vzc2lvbiBhbmQgY2hlY2tzIHRoYXQgYW4gZXBoZW1lcmFsIHNlcnZpY2Ugd29ya2Vy CisvLyBkb2VzIG5vdCBoYXZlIGFjY2VzcyB0byBpdC4KK1RFU1QoU2VydmljZVdvcmtlcnMsIFNl cnZpY2VXb3JrZXJDYWNoZUFjY2Vzc0VwaGVtZXJhbFNlc3Npb24pCit7CisgICAgW1dLV2Vic2l0 ZURhdGFTdG9yZSBfYWxsb3dXZWJzaXRlRGF0YVJlY29yZHNGb3JBbGxPcmlnaW5zXTsKKworICAg IC8vIFN0YXJ0IHdpdGggYSBjbGVhbiBzbGF0ZSBkYXRhIHN0b3JlCisgICAgW1tXS1dlYnNpdGVE YXRhU3RvcmUgZGVmYXVsdERhdGFTdG9yZV0gcmVtb3ZlRGF0YU9mVHlwZXM6W1dLV2Vic2l0ZURh dGFTdG9yZSBhbGxXZWJzaXRlRGF0YVR5cGVzXSBtb2RpZmllZFNpbmNlOltOU0RhdGUgZGlzdGFu dFBhc3RdIGNvbXBsZXRpb25IYW5kbGVyOl4oKSB7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAg IH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZh bHNlOworICAgIAorICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdD b25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgc2V0Q29uZmlndXJhdGlvbkluamVjdGVk QnVuZGxlUGF0aChjb25maWd1cmF0aW9uLmdldCgpKTsKKyAgICAKKyAgICBhdXRvIGRlZmF1bHRQ cmVmZXJlbmNlcyA9IFtjb25maWd1cmF0aW9uIHByZWZlcmVuY2VzXTsKKyAgICBbZGVmYXVsdFBy ZWZlcmVuY2VzIF9zZXRTZWN1cmVDb250ZXh0Q2hlY2tzRW5hYmxlZDpOT107CisgICAgCisgICAg YXV0byBoYW5kbGVyID0gYWRvcHROUyhbW1NXU2NoZW1lcyBhbGxvY10gaW5pdF0pOworICAgIGhh bmRsZXItPnJlc291cmNlcy5zZXQoInN3Oi8vaG9zdC9vcGVuQ2FjaGUuaHRtbCIsIFJlc291cmNl SW5mbyB7IEAidGV4dC9odG1sIiwgImZvbyIgfSk7CisgICAgaGFuZGxlci0+cmVzb3VyY2VzLnNl dCgic3c6Ly9ob3N0L21haW4uaHRtbCIsIFJlc291cmNlSW5mbyB7IEAidGV4dC9odG1sIiwgc2Vy dmljZVdvcmtlckNhY2hlQWNjZXNzRXBoZW1lcmFsU2Vzc2lvbk1haW5CeXRlcyB9KTsKKyAgICBo YW5kbGVyLT5yZXNvdXJjZXMuc2V0KCJzdzovL2hvc3Qvc2VydmljZXdvcmtlci1wcml2YXRlLWJy b3dzaW5nLXdvcmtlci5qcyIsIFJlc291cmNlSW5mbyB7IEAiYXBwbGljYXRpb24vamF2YXNjcmlw dCIsIHNlcnZpY2VXb3JrZXJDYWNoZUFjY2Vzc0VwaGVtZXJhbFNlc3Npb25TV0J5dGVzIH0pOwor ICAgIFtjb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JV UkxTY2hlbWU6QCJTVyJdOworCisgICAgYXV0byBkZWZhdWx0V2ViVmlldyA9IGFkb3B0TlMoW1tU ZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2 MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIE5TVVJMUmVxdWVz dCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhT dHJpbmc6QCJzdzovL2hvc3Qvb3BlbkNhY2hlLmh0bWwiXV07CisgICAgW2RlZmF1bHRXZWJWaWV3 IHN5bmNocm9ub3VzbHlMb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKyAgICAKKyAgICBib29sIG9wZW5l ZENhY2hlID0gZmFsc2U7CisgICAgW2RlZmF1bHRXZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpA InNlbGYuY2FjaGVzLm9wZW4oJ3Rlc3QnKTsiIGNvbXBsZXRpb25IYW5kbGVyOiBbJl0gKGlkIGlu bmVyVGV4dCwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAgb3BlbmVkQ2FjaGUgPSB0cnVlOwor ICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmb3BlbmVkQ2FjaGUpOworCisg ICAgY29uZmlndXJhdGlvbi5nZXQoKS53ZWJzaXRlRGF0YVN0b3JlID0gW1dLV2Vic2l0ZURhdGFT dG9yZSBub25QZXJzaXN0ZW50RGF0YVN0b3JlXTsKKworICAgIGF1dG8gbWVzc2FnZUhhbmRsZXIg PSBhZG9wdE5TKFtbU1dNZXNzYWdlSGFuZGxlckZvckNhY2hlU3RvcmFnZSBhbGxvY10gaW5pdF0p OworICAgIFtbY29uZmlndXJhdGlvbiB1c2VyQ29udGVudENvbnRyb2xsZXJdIGFkZFNjcmlwdE1l c3NhZ2VIYW5kbGVyOm1lc3NhZ2VIYW5kbGVyLmdldCgpIG5hbWU6QCJzdyJdOworCisgICAgYXV0 byBlcGhlbWVyYWxXZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhG cmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRp b24uZ2V0KCldKTsKKyAgICByZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpb TlNVUkwgVVJMV2l0aFN0cmluZzpAInN3Oi8vaG9zdC9tYWluLmh0bWwiXV07CisKKyAgICBbZXBo ZW1lcmFsV2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpV dGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKK30KKwogc3RhdGljIGNvbnN0IGNo YXIqIHJlZ3VsYXJQYWdlR3JhYmJpbmdDYWNoZVN0b3JhZ2VEaXJlY3RvcnkgPSBSIlNXUkVTT1VS Q0UoCiA8c2NyaXB0PgogYXN5bmMgZnVuY3Rpb24gZ2V0UmVzdWx0KCkKQEAgLTEzODAsOSArMTQ2 MSw3IEBAIFRFU1QoU2VydmljZVdvcmtlcnMsIFNlcnZpY2VXb3JrZXJBbmRDYWNoZVN0b3JhZ2VE ZWZhdWx0RGlyZWN0b3JpZXMpCiAKICAgICBbV0tXZWJzaXRlRGF0YVN0b3JlIF9hbGxvd1dlYnNp dGVEYXRhUmVjb3Jkc0ZvckFsbE9yaWdpbnNdOwogCi0gICAgUmV0YWluUHRyPFdLV2ViVmlld0Nv bmZpZ3VyYXRpb24+IGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJh dGlvbiBhbGxvY10gaW5pdF0pOwotCi0gICAgY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dl YlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgYXV0byBjb25maWd1cmF0aW9u ID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKICAgICBz ZXRDb25maWd1cmF0aW9uSW5qZWN0ZWRCdW5kbGVQYXRoKGNvbmZpZ3VyYXRpb24uZ2V0KCkpOwog CiAgICAgUmV0YWluUHRyPERpcmVjdG9yeVBhZ2VNZXNzYWdlSGFuZGxlcj4gZGlyZWN0b3J5UGFn ZU1lc3NhZ2VIYW5kbGVyID0gYWRvcHROUyhbW0RpcmVjdG9yeVBhZ2VNZXNzYWdlSGFuZGxlciBh bGxvY10gaW5pdF0pOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDJmMjU4MDRmOTZhZTlmZDdiNmU1MGM4MzlkMTI5NGU1M2Rj YzUyZGQuLmI5MmFiYWFhZmI5N2RhYWMzYjljZmNjOTI0OTE0Yzk5ZDMyMmI1OGEgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNiBAQAorMjAxOS0wOS0wNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgorCisgICAgICAgIFJld3JpdGUgaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2Uvc2VydmljZXdv cmtlci1wcml2YXRlLWJyb3dzaW5nLmh0dHBzLmh0bWwgYXMgYW4gQVBJIHRlc3QKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTU3NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERyb3AgbGVnYWN5IHRlc3Qg d2hpY2ggd2FzIHJlcGxhY2VkIGJ5IGFuIEFQSSB0ZXN0LgorCisgICAgICAgICogaHR0cC90ZXN0 cy93b3JrZXJzL3NlcnZpY2Uvc2VydmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5nLXdvcmtlci5q czogUmVtb3ZlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9zZXJ2aWNl d29ya2VyLXByaXZhdGUtYnJvd3NpbmcuaHR0cHMtZXhwZWN0ZWQudHh0OiBSZW1vdmVkLgorICAg ICAgICAqIGh0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3NlcnZpY2V3b3JrZXItcHJpdmF0ZS1i cm93c2luZy5odHRwcy5odG1sOiBSZW1vdmVkLgorCiAyMDE5LTA5LTA2ICBKdXN0aW4gRmFuICA8 anVzdGluX2ZhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkdQVV0gVXBkYXRlIHNldmVyYWwg aW50ZXJmYWNlIGFuZCBlbnVtIG5hbWVzIHRvIG1hdGNoIHNwZWMKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3NlcnZpY2V3b3JrZXItcHJpdmF0ZS1i cm93c2luZy13b3JrZXIuanMgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2Vydmlj ZS9zZXJ2aWNld29ya2VyLXByaXZhdGUtYnJvd3Npbmctd29ya2VyLmpzCmRlbGV0ZWQgZmlsZSBt b2RlIDEwMDY0NAppbmRleCBlOTRjNjA2ODNjYWNhOThjYzNjOTVjMDMxYzk4NzlkYmJmMmRlOTky Li4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3NlcnZpY2V3b3JrZXItcHJpdmF0ZS1icm93 c2luZy13b3JrZXIuanMKKysrIC9kZXYvbnVsbApAQCAtMSwxMiArMCwwIEBACi1zZWxmLmFkZEV2 ZW50TGlzdGVuZXIoIm1lc3NhZ2UiLCBhc3luYyAoZXZlbnQpID0+IHsKLSAgICB0cnkgeyAKLSAg ICAgICAgaWYgKGV2ZW50LmRhdGEgIT09ICJURVNUQ0FDSEUiKSB7Ci0gICAgICAgICAgICAgZXZl bnQuc291cmNlLnBvc3RNZXNzYWdlKCJGQUlMOiBVbmtub3duIG1lc3NhZ2UiKTsKLSAgICAgICAg fQotICAgICAgICB2YXIga2V5cyA9IGF3YWl0IHNlbGYuY2FjaGVzLmtleXMoKTsKLSAgICAgICAg ZXZlbnQuc291cmNlLnBvc3RNZXNzYWdlKGtleXMubGVuZ3RoID09PSAwID8gIlBBU1MiIDogIkZB SUw6IGNhY2hlcyBpcyBub3QgZW1wdHksIGdvdDogIiArIEpTT04uc3RyaW5naWZ5KGtleXMpKTsK LSAgICB9IGNhdGNoIChlKSB7Ci0gICAgICAgIGV2ZW50LnNvdXJjZS5wb3N0TWVzc2FnZSgiRkFJ TDogcmVjZWl2ZWQgZXhjZXB0aW9uICIgKyBlKTsKLSAgICB9Ci19KTsKLQpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2Uvc2VydmljZXdvcmtlci1wcml2 YXRlLWJyb3dzaW5nLmh0dHBzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv d29ya2Vycy9zZXJ2aWNlL3NlcnZpY2V3b3JrZXItcHJpdmF0ZS1icm93c2luZy5odHRwcy1leHBl Y3RlZC50eHQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDhiZGVhOGM4Y2FmZjU5NGRl YjI0MzE5NmJiZDk3MGQ5ODlkZjUwZGEuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2Uvc2Vy dmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5nLmh0dHBzLWV4cGVjdGVkLnR4dAorKysgL2Rldi9u dWxsCkBAIC0xLDQgKzAsMCBAQAotCi1QQVNTIFNldHVwIGNhY2hlIGluIHJlZ3VsYXIgc2Vzc2lv biBhbmQgc2VydmljZSB3b3JrZXIgaW4gcHJpdmF0ZSBicm93c2luZyBzZXNzaW9uIAotUEFTUyBU ZXN0IHByaXZhdGUgYnJvd3Npbmcgc2VydmljZSB3b3JrZXIgaGFzIG5vdCBhY2Nlc3MgdG8gcmVn dWxhciBjYWNoZSBzdG9yYWdlIAotCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L3dvcmtlcnMvc2VydmljZS9zZXJ2aWNld29ya2VyLXByaXZhdGUtYnJvd3NpbmcuaHR0cHMuaHRt bCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3NlcnZpY2V3b3JrZXIt cHJpdmF0ZS1icm93c2luZy5odHRwcy5odG1sCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCA2MmQzZjYyNDljMzRkYTdhNWYzYzU4YTQ0NGQ0NThmMGY4OTEwZTdjLi4wMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv d29ya2Vycy9zZXJ2aWNlL3NlcnZpY2V3b3JrZXItcHJpdmF0ZS1icm93c2luZy5odHRwcy5odG1s CisrKyAvZGV2L251bGwKQEAgLTEsNTMgKzAsMCBAQAotPGh0bWw+Ci08aGVhZD4KLTxzY3JpcHQg c3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KLTxzY3JpcHQgc3JjPSIv cmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KLTwvaGVhZD4KLTxib2R5 PgotPHNjcmlwdD4KLXZhciBzY29wZSA9ICJteSBwcml2YXRlIGJhY2t5YXJkIjsKLXZhciBhY3Rp dmVXb3JrZXI7Ci0KLXByb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4gewotICAgIC8vIE9wZW5p bmcgYSBjYWNoZSBhbmQgY2hlY2sgdGhhdCBwcml2YXRlIGJyb3dzaW5nIHNlcnZpY2Ugd29ya2Vy IGRvZXMgbm90IGhhdmUgYWNjZXNzIHRvIGl0LgotICAgIHNlbGYuY2FjaGVzLm9wZW4oInRlc3Qi KTsKLQotICAgIGlmICghd2luZG93LnRlc3RSdW5uZXIpCi0gICAgICAgcmV0dXJuIFByb21pc2Uu cmVqZWN0KCJ0ZXN0IHJlcXVpcmVzIGludGVybmFscyBBUEkiKTsKLSAgICB0ZXN0UnVubmVyLnNl dFByaXZhdGVCcm93c2luZ0VuYWJsZWRfREVQUkVDQVRFRCh0cnVlKTsKLQotICAgIHZhciByZWdp c3RyYXRpb24gPSBhd2FpdCBuYXZpZ2F0b3Iuc2VydmljZVdvcmtlci5nZXRSZWdpc3RyYXRpb24o c2NvcGUpOwotICAgIGlmIChyZWdpc3RyYXRpb24gJiYgcmVnaXN0cmF0aW9uLnNjb3BlID09PSBz Y29wZSkKLSAgICAgICAgYXdhaXQgcmVnaXN0cmF0aW9uLnVucmVnaXN0ZXIoKTsKLQotICAgIHZh ciByZWdpc3RyYXRpb24gPSBhd2FpdCBuYXZpZ2F0b3Iuc2VydmljZVdvcmtlci5yZWdpc3Rlcigi c2VydmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5nLXdvcmtlci5qcyIsIHsgc2NvcGUgOiBzY29w ZSB9KTsKLSAgICBhY3RpdmVXb3JrZXIgPSByZWdpc3RyYXRpb24uYWN0aXZlOwotICAgIGlmIChh Y3RpdmVXb3JrZXIpCi0gICAgICAgIHJldHVybjsKLSAgICBhY3RpdmVXb3JrZXIgPSByZWdpc3Ry YXRpb24uaW5zdGFsbGluZzsKLSAgICByZXR1cm4gbmV3IFByb21pc2UocmVzb2x2ZSA9PiB7Ci0g ICAgICAgIGFjdGl2ZVdvcmtlci5hZGRFdmVudExpc3RlbmVyKCdzdGF0ZWNoYW5nZScsICgpID0+ IHsKLSAgICAgICAgICAgIGlmIChhY3RpdmVXb3JrZXIuc3RhdGUgPT09ICJhY3RpdmF0ZWQiKQot ICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKLSAgICAgICAgfSk7Ci0gICAgfSk7Ci19LCAiU2V0 dXAgY2FjaGUgaW4gcmVndWxhciBzZXNzaW9uIGFuZCBzZXJ2aWNlIHdvcmtlciBpbiBwcml2YXRl IGJyb3dzaW5nIHNlc3Npb24iKTsKLQotcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7Ci0g ICAgdmFyIHByb21pc2UgPSBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7Ci0gICAg ICAgIG5hdmlnYXRvci5zZXJ2aWNlV29ya2VyLmFkZEV2ZW50TGlzdGVuZXIoIm1lc3NhZ2UiLCB0 ZXN0LnN0ZXBfZnVuYygoZXZlbnQpID0+IHsKLSAgICAgICAgICAgIGlmIChldmVudC5kYXRhID09 PSAiUEFTUyIpIHsKLSAgICAgICAgICAgICAgICByZXNvbHZlKCk7Ci0gICAgICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgcmVqZWN0KGV2ZW50LmRhdGEpOwot ICAgICAgICB9KSk7Ci0gICAgfSk7Ci0KLSAgICBhY3RpdmVXb3JrZXIucG9zdE1lc3NhZ2UoIlRF U1RDQUNIRSIpOwotICAgIGF3YWl0IHByb21pc2U7Ci0KLX0sICJUZXN0IHByaXZhdGUgYnJvd3Np bmcgc2VydmljZSB3b3JrZXIgaGFzIG5vdCBhY2Nlc3MgdG8gcmVndWxhciBjYWNoZSBzdG9yYWdl Iik7Ci08L3NjcmlwdD4KLTwvYm9keT4KLTwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3Rr L1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOTE4YmFhNDVkMjFmYTJjYzZjOGEzMWE1NTZlZGZmNjRi MWQ5Y2I0NS4uMmE0OTkwZDFhOTlhNmNiNmM1MjliNTA3NzI1YTAxOWVlODY1OGQ5OSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTEwNDQsNyArMTA0NCw2 IEBAIGZhc3QvZm9ybXMvcmFuZ2UvaW5wdXQtYXBwZWFyYW5jZS1yYW5nZS1ydGwuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogIyBTZXJ2aWNlLXdvcmtlcnMgdGVzdHMgdGhhdCBmYWlsLCB0aW1l IG91dCBvciBjcmFzaC4KIHdlYmtpdC5vcmcvYi8xNzU0MTkgaHR0cC90ZXN0cy93b3JrZXJzL3Nl cnZpY2UvY29udHJvbGxlci1jaGFuZ2UuaHRtbCBbIFNraXAgXQogd2Via2l0Lm9yZy9iLzE3NTQx OSBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9uby1wYWdlLWNhY2hlLXdoZW4tY29udHJvbGxl ZC5odG1sIFsgU2tpcCBdCi13ZWJraXQub3JnL2IvMTc1NDE5IGh0dHAvdGVzdHMvd29ya2Vycy9z ZXJ2aWNlL3NlcnZpY2V3b3JrZXItcHJpdmF0ZS1icm93c2luZy5odHRwcy5odG1sIFsgU2tpcCBd CiB3ZWJraXQub3JnL2IvMTc1NDE5IGh0dHAvd3B0L3NlcnZpY2Utd29ya2Vycy9wZXJzaXN0ZW50 LWltcG9ydFNjcmlwdHMuaHRtbCBbIEZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzE3NTQxOSBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3NlcnZpY2Utd29ya2Vycy9zZXJ2aWNlLXdvcmtl ci9hY3RpdmF0aW9uLmh0dHBzLmh0bWwgWyBTa2lwIF0KIHdlYmtpdC5vcmcvYi8xNzU0MTkgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9zZXJ2aWNlLXdvcmtlcnMvc2VydmljZS13b3Jr ZXIvY2xhaW0td2l0aC1yZWRpcmVjdC5odHRwcy5odG1sIFsgU2tpcCBdCg==