183913 2018-03-22 13:04:21 -0700 Include security origin in the service worker process name 2018-03-22 18:38:21 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez beidson bfulgham commit-queue joepeck mitz rniwa webkit-bug-importer youennf oldest_to_newest 1408452 0 cdumez 2018-03-22 13:04:21 -0700 Include security origin in the service worker process name to facilitate debugging. This way, we can differentiate which service worker process is used for which origin in activity monitor. 1408454 1 336298 cdumez 2018-03-22 13:06:25 -0700 Created attachment 336298 Patch 1408465 2 336298 youennf 2018-03-22 13:36:10 -0700 Comment on attachment 336298 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=336298&action=review > Source/WebKit/ChangeLog:9 > + can differentiate which service worker process is used for which origin in activity monitor. Is there a privacy concern here, like some application running in the device that could easily detect at any time whether the user is browsing to a given origin or not? > Source/WebCore/English.lproj/Localizable.strings:-120 > - Do we need all these changes? 1408473 3 336298 cdumez 2018-03-22 13:47:57 -0700 Comment on attachment 336298 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=336298&action=review >> Source/WebKit/ChangeLog:9 >> + can differentiate which service worker process is used for which origin in activity monitor. > > Is there a privacy concern here, like some application running in the device that could easily detect at any time whether the user is browsing to a given origin or not? We already display the origin for WebProcess so I do not think service workers are any different. That said, I haven't found the code that shows the WebProcess url in activity monitor yet. >> Source/WebCore/English.lproj/Localizable.strings:-120 >> - > > Do we need all these changes? I merely ran: Tools/Scripts/update-webkit-localizable-strings The file happened to be quite out of date. 1408476 4 336298 cdumez 2018-03-22 13:51:53 -0700 Comment on attachment 336298 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=336298&action=review >>> Source/WebKit/ChangeLog:9 >>> + can differentiate which service worker process is used for which origin in activity monitor. >> >> Is there a privacy concern here, like some application running in the device that could easily detect at any time whether the user is browsing to a given origin or not? > > We already display the origin for WebProcess so I do not think service workers are any different. That said, I haven't found the code that shows the WebProcess url in activity monitor yet. Looks like it is done slightly differently for WebProcesses via WebProcess::updateActivePages(). I'll see if I can do the same. 1408480 5 336298 cdumez 2018-03-22 14:05:12 -0700 Comment on attachment 336298 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=336298&action=review >>>> Source/WebKit/ChangeLog:9 >>>> + can differentiate which service worker process is used for which origin in activity monitor. >>> >>> Is there a privacy concern here, like some application running in the device that could easily detect at any time whether the user is browsing to a given origin or not? >> >> We already display the origin for WebProcess so I do not think service workers are any different. That said, I haven't found the code that shows the WebProcess url in activity monitor yet. > > Looks like it is done slightly differently for WebProcesses via WebProcess::updateActivePages(). I'll see if I can do the same. Actually, both seem to call _LSSetApplicationInformationItem(). In the service worker process case, the origin does not change so we can set it right away in initializeProcessName(). 1408584 6 336298 commit-queue 2018-03-22 18:37:20 -0700 Comment on attachment 336298 Patch Clearing flags on attachment: 336298 Committed r229878: <https://trac.webkit.org/changeset/229878> 1408585 7 commit-queue 2018-03-22 18:37:21 -0700 All reviewed patches have been landed. Closing bug. 1408586 8 webkit-bug-importer 2018-03-22 18:38:21 -0700 <rdar://problem/38776833> 336298 2018-03-22 13:06:25 -0700 2018-03-22 18:37:20 -0700 Patch bug-183913-20180322130625.patch text/plain 9974 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5ODU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzMzYWRlYWNlZTA1MzM1 YTc3MmIyNjFmNWNmNjAxOTZhMGMwMzUwMC4uNzBmYjNmNWNlZTFkYTUzMTk0ZjgyMWVkYmQzOTM3 Y2UwMWIzYTM1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE4LTAzLTIyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgSW5jbHVkZSBzZWN1cml0eSBv cmlnaW4gaW4gdGhlIHNlcnZpY2Ugd29ya2VyIHByb2Nlc3MgbmFtZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzOTEzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlZCBsb2NhbGl6YWJsZSBzdHJp bmdzLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzOgorCiAy MDE4LTAzLTIyICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAg ICAgIEFkb3B0IFVTRShPUEVOR0xbX0VTXSkgaW4gbW9yZSBwbGFjZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZDQ3 MmU2MjExZmVhNWU1MmYwOGQ3NzNkZmYxYTliOTc0ZmMzNzZhNi4uZjk4ZmE5OGY4ZjA1ZTkzYTkx YTY1NmVhNGQ0OTEwN2I5NjI2Y2YyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxOC0w My0yMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIEluY2x1ZGUg c2VjdXJpdHkgb3JpZ2luIGluIHRoZSBzZXJ2aWNlIHdvcmtlciBwcm9jZXNzIG5hbWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzkxMworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluY2x1ZGUgc2VjdXJp dHkgb3JpZ2luIGluIHRoZSBzZXJ2aWNlIHdvcmtlciBwcm9jZXNzIG5hbWUgdG8gZmFjaWxpdGF0 ZSBkZWJ1Z2dpbmcuIFRoaXMgd2F5LCB3ZQorICAgICAgICBjYW4gZGlmZmVyZW50aWF0ZSB3aGlj aCBzZXJ2aWNlIHdvcmtlciBwcm9jZXNzIGlzIHVzZWQgZm9yIHdoaWNoIG9yaWdpbiBpbiBhY3Rp dml0eSBtb25pdG9yLgorCisgICAgICAgICogU2hhcmVkL0NoaWxkUHJvY2Vzcy5oOgorICAgICAg ICAqIFNoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL21hYy9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VF bnRyeVBvaW50Lm1tOgorICAgICAgICAoV2ViS2l0OjpYUENTZXJ2aWNlSW5pdGlhbGl6ZXJEZWxl Z2F0ZTo6Z2V0RXh0cmFJbml0aWFsaXphdGlvbkRhdGEpOgorICAgICAgICAqIFVJUHJvY2Vzcy9T ZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdv cmtlclByb2Nlc3NQcm94eTo6Z2V0TGF1bmNoT3B0aW9ucyk6CisgICAgICAgICogV2ViUHJvY2Vz cy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6 OmluaXRpYWxpemVQcm9jZXNzTmFtZSk6CisKIDIwMTgtMDMtMjIgIFphbiBEb2JlcnNlayAgPHpk b2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtUZXhNYXBdIE1ha2UgVGV4dHVyZU1hcHBl ckNvbnRleHRBdHRyaWJ1dGVzIHRocmVhZC1zcGVjaWZpYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvRW5nbGlzaC5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzIGIvU291cmNlL1dlYkNvcmUv RW5nbGlzaC5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCmluZGV4IGE1YjgxN2IxMzVjY2RiNDlj NmZkODgwM2M1MmY5MGFjNGI0MGE1MDUuLmE4NTJkOTlmN2I2N2I3ZDdjYTgwZDFjZjhiMDk5ZTM1 MDU5ZGM4M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovTG9jYWxp emFibGUuc3RyaW5ncworKysgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL0xvY2FsaXph YmxlLnN0cmluZ3MKQEAgLTQxLDcgKzQxLDcgQEAKICIlQCBTREgiID0gIiVAIFNESCI7CiAKIC8q IFZpc2libGUgbmFtZSBvZiBTZXJ2aWNlIFdvcmtlciBwcm9jZXNzLiBUaGUgYXJndW1lbnQgaXMg dGhlIGFwcGxpY2F0aW9uIG5hbWUuICovCi0iJUAgU2VydmljZSBXb3JrZXIiID0gIiVAIFNlcnZp Y2UgV29ya2VyIjsKKyIlQCBTZXJ2aWNlIFdvcmtlciAoJUApIiA9ICIlQCBTZXJ2aWNlIFdvcmtl ciAoJUApIjsKIAogLyogdmlzaWJsZSBuYW1lIG9mIHRoZSBzdG9yYWdlIHByb2Nlc3MuIFRoZSBh cmd1bWVudCBpcyB0aGUgYXBwbGljYXRpb24gbmFtZS4gKi8KICIlQCBTdG9yYWdlIiA9ICIlQCBT dG9yYWdlIjsKQEAgLTExNSw5ICsxMTUsNiBAQAogLyogTGFiZWwgdGV4dCB0byBiZSB1c2VkIHdo ZW4gYW4gaW5zZWN1cmUgcGx1Zy1pbiB2ZXJzaW9uIHdhcyBibG9ja2VkIGZyb20gbG9hZGluZyAq LwogIkJsb2NrZWQgUGx1Zy1JbiAoSW5zZWN1cmUgcGx1Zy1pbikiID0gIkJsb2NrZWQgUGx1Zy1p biI7CiAKLS8qIExhYmVsIHRleHQgdG8gYmUgdXNlZCB3aGVuIGFuIGluc2VjdXJlIHBsdWctaW4g dmVyc2lvbiB3YXMgYmxvY2tlZCBmcm9tIGxvYWRpbmcgKi8KLSJVbnN1cHBvcnRlZCBQbHVnLUlu IiA9ICJVbnN1cHBvcnRlZCBQbHVnLWluIjsKLQogLyogQm9sZCBjb250ZXh0IG1lbnUgaXRlbSAq LwogIkJvbGQiID0gIkJvbGQiOwogCkBAIC0yMTUsNyArMjEyLDEwIEBACiAiQ3V0IChVbmRvIGFj dGlvbiBuYW1lKSIgPSAiQ3V0IjsKIAogLyogRGF5IGxhYmVsIGluIGRhdGUgcGlja2VyICovCi0i RGF5IGxhYmVsIGluIGRhdGUgcGlja2VyIiA9ICJEYXkiOworIkRheSBsYWJlbCBpbiBkYXRlIHBp Y2tlciIgPSAiRGF5IGxhYmVsIGluIGRhdGUgcGlja2VyIjsKKworLyogRnVsbHNjcmVlbiBEZWNl cHRpdmUgV2Vic2l0ZSBXYXJuaW5nIFNoZWV0IFRpdGxlICovCisiRGVjZXB0aXZlIFdlYnNpdGUg V2FybmluZyIgPSAiRGVjZXB0aXZlIFdlYnNpdGUgV2FybmluZyI7CiAKIC8qIERlZmF1bHQgd3Jp dGluZyBkaXJlY3Rpb24gY29udGV4dCBtZW51IGl0ZW0gKi8KICJEZWZhdWx0IiA9ICJEZWZhdWx0 IjsKQEAgLTIyOSwxMSArMjI5LDggQEAKIC8qIFVuZG8gYWN0aW9uIG5hbWUgKi8KICJEaWN0YXRp b24gKFVuZG8gYWN0aW9uIG5hbWUpIiA9ICJEaWN0YXRpb24iOwogCi0vKiBUZXh0IG9mIGJ1dHRv biB0aGF0IGV4aXRzIGVsZW1lbnQgZnVsbHNjcmVlbi4gKi8KLSJEb25lIiA9ICJEb25lIjsKLQog LyogVGl0bGUgb2YgdGhlIERvbmUgYnV0dG9uIGZvciB6b29tZWQgZm9ybSBjb250cm9scy4gKi8K LSJEb25lIChleHRyYSB6b29tZWQgZm9ybSBjb250cm9scykiID0gIkRvbmUiOworIkRvbmUgKGV4 dHJhIHpvb21lZCBmb3JtIGNvbnRyb2xzKSIgPSAiRG9uZSAoZXh0cmEgem9vbWVkIGZvcm0gY29u dHJvbHMpIjsKIAogLyogRG93bmxvYWQgQXVkaW8gVG8gRGlzayBjb250ZXh0IG1lbnUgaXRlbSAq LwogIkRvd25sb2FkIEF1ZGlvIiA9ICJEb3dubG9hZCBBdWRpbyI7CkBAIC0yNzQsNiArMjcxLDkg QEAKIC8qIFZpZGVvIEV4aXQgRnVsbHNjcmVlbiBjb250ZXh0IG1lbnUgaXRlbSAqLwogIkV4aXQg RnVsbCBTY3JlZW4gKGNvbnRleHQgbWVudSkiID0gIkV4aXQgRnVsbCBTY3JlZW4iOwogCisvKiBG dWxsc2NyZWVuIERlY2VwdGl2ZSBXZWJzaXRlIEV4aXQgQWN0aW9uICovCisiRXhpdCBGdWxsc2Ny ZWVuIiA9ICJFeGl0IEZ1bGxzY3JlZW4iOworCiAvKiBtZW51IGl0ZW0gKi8KICJFeGl0IFBpY3R1 cmUgaW4gUGljdHVyZSIgPSAiRXhpdCBQaWN0dXJlIGluIFBpY3R1cmUiOwogCkBAIC00MTYsNyAr NDE2LDcgQEAKICJNaXNzaW5nIFBsdWctaW4iID0gIk1pc3NpbmcgUGx1Zy1pbiI7CiAKIC8qIE1v bnRoIGxhYmVsIGluIGRhdGUgcGlja2VyICovCi0iTW9udGggbGFiZWwgaW4gZGF0ZSBwaWNrZXIi ID0gIk1vbnRoIjsKKyJNb250aCBsYWJlbCBpbiBkYXRlIHBpY2tlciIgPSAiTW9udGggbGFiZWwg aW4gZGF0ZSBwaWNrZXIiOwogCiAvKiBNZWRpYSBNdXRlIGNvbnRleHQgbWVudSBpdGVtICovCiAi TXV0ZSIgPSAiTXV0ZSI7CkBAIC02NDMsNiArNjQzLDkgQEAKIC8qIFN0YXJ0IHNwZWFraW5nIGNv bnRleHQgbWVudSBpdGVtICovCiAiU3RhcnQgU3BlYWtpbmciID0gIlN0YXJ0IFNwZWFraW5nIjsK IAorLyogRnVsbHNjcmVlbiBEZWNlcHRpdmUgV2Vic2l0ZSBTdGF5IEFjdGlvbiAqLworIlN0YXkg aW4gRnVsbHNjcmVlbiIgPSAiU3RheSBpbiBGdWxsc2NyZWVuIjsKKwogLyogU3RvcCBjb250ZXh0 IG1lbnUgaXRlbSAqLwogIlN0b3AiID0gIlN0b3AiOwogCkBAIC02NTUsNiArNjU4LDkgQEAKIC8q IFN0b3Agc3BlYWtpbmcgY29udGV4dCBtZW51IGl0ZW0gKi8KICJTdG9wIFNwZWFraW5nIiA9ICJT dG9wIFNwZWFraW5nIjsKIAorLyogTGFiZWwgZm9yIHN0cm9uZyBwYXNzd29yZC4gKi8KKyJTdHJv bmcgUGFzc3dvcmQiID0gIlN0cm9uZyBQYXNzd29yZCI7CisKIC8qIFN0eWxlcyBjb250ZXh0IG1l bnUgaXRlbSAqLwogIlN0eWxlc+KApiIgPSAiU3R5bGVz4oCmIjsKIApAQCAtNzI0LDYgKzczMCw5 IEBACiAvKiBwcm9tcHQgc3RyaW5nIGluIGF1dGhlbnRpY2F0aW9uIHBhbmVsICovCiAiVGhlIHVz ZXIgbmFtZSBvciBwYXNzd29yZCB5b3UgZW50ZXJlZCBmb3IgdGhpcyBhcmVhIG9uICVAIHdhcyBp bmNvcnJlY3QuIE1ha2Ugc3VyZSB5b3XigJlyZSBlbnRlcmluZyB0aGVtIGNvcnJlY3RseSwgYW5k IHRoZW4gdHJ5IGFnYWluLiIgPSAiVGhlIHVzZXIgbmFtZSBvciBwYXNzd29yZCB5b3UgZW50ZXJl ZCBmb3IgdGhpcyBhcmVhIG9uICVAIHdhcyBpbmNvcnJlY3QuIE1ha2Ugc3VyZSB5b3XigJlyZSBl bnRlcmluZyB0aGVtIGNvcnJlY3RseSwgYW5kIHRoZW4gdHJ5IGFnYWluLiI7CiAKKy8qIEZ1bGxz Y3JlZW4gRGVjZXB0aXZlIFdlYnNpdGUgV2FybmluZyBTaGVldCBDb250ZW50IFRleHQgKi8KKyJU aGUgd2Vic2l0ZSBcIiVAXCIgbWF5IGJlIGEgZGVjZXB0aXZlIHdlYnNpdGUuIFdvdWxkIHlvdSBs aWtlIHRvIGV4aXQgZnVsbHNjcmVlbj8iID0gIlRoZSB3ZWJzaXRlIFwiJUBcIiBtYXkgYmUgYSBk ZWNlcHRpdmUgd2Vic2l0ZS4gV291bGQgeW91IGxpa2UgdG8gZXhpdCBmdWxsc2NyZWVuPyI7CisK IC8qIHRleHQgdGhhdCBhcHBlYXJzIGF0IHRoZSBzdGFydCBvZiBuZWFybHktb2Jzb2xldGUgd2Vi IHBhZ2VzIGluIHRoZSBmb3JtIG9mIGEgJ3NlYXJjaGFibGUgaW5kZXgnICovCiAiVGhpcyBpcyBh IHNlYXJjaGFibGUgaW5kZXguIEVudGVyIHNlYXJjaCBrZXl3b3JkczogIiA9ICJUaGlzIGlzIGEg c2VhcmNoYWJsZSBpbmRleC4gRW50ZXIgc2VhcmNoIGtleXdvcmRzOiAiOwogCkBAIC03NzUsNiAr Nzg0LDkgQEAKIC8qIFVuZG8gYWN0aW9uIG5hbWUgKi8KICJVbnNjcmlwdCAoVW5kbyBhY3Rpb24g bmFtZSkiID0gIlVuc2NyaXB0IjsKIAorLyogTGFiZWwgdGV4dCB0byBiZSB1c2VkIHdoZW4gYW4g dW5zdXBwb3J0ZWQgcGx1Zy1pbiB3YXMgYmxvY2tlZCBmcm9tIGxvYWRpbmcgKi8KKyJVbnN1cHBv cnRlZCBQbHVnLUluIiA9ICJVbnN1cHBvcnRlZCBQbHVnLWluIjsKKwogLyogVW5kbyBhY3Rpb24g bmFtZSAqLwogIlVzZSBBbGwgTGlnYXR1cmVzIChVbmRvIGFjdGlvbiBuYW1lKSIgPSAiVXNlIEFs bCBMaWdhdHVyZXMiOwogCkBAIC04MjcsNyArODM5LDcgQEAKICJXcml0ZSIgPSAiV3JpdGUiOwog CiAvKiBZZWFyIGxhYmVsIGluIGRhdGUgcGlja2VyICovCi0iWWVhciBsYWJlbCBpbiBkYXRlIHBp Y2tlciIgPSAiWWVhciI7CisiWWVhciBsYWJlbCBpbiBkYXRlIHBpY2tlciIgPSAiWWVhciBsYWJl bCBpbiBkYXRlIHBpY2tlciI7CiAKIC8qIG1lc3NhZ2UgaW4gYXV0aGVudGljYXRpb24gcGFuZWwg Ki8KICJZb3VyIGxvZ2luIGluZm9ybWF0aW9uIHdpbGwgYmUgc2VudCBzZWN1cmVseS4iID0gIllv dXIgbG9naW4gaW5mb3JtYXRpb24gd2lsbCBiZSBzZW50IHNlY3VyZWx5LiI7CkBAIC0xMjAxLDkg KzEyMTMsNiBAQAogLyogTGFiZWwgZm9yIHRoZSBzdHJvbmcgY29uZmlybWF0aW9uIHBhc3N3b3Jk IGF1dG8gZmlsbCBidXR0b24gaW5zaWRlIGEgdGV4dCBmaWVsZC4gKi8KICJzdHJvbmcgY29uZmly bWF0aW9uIHBhc3N3b3JkIGF1dG8gZmlsbCIgPSAic3Ryb25nIGNvbmZpcm1hdGlvbiBwYXNzd29y ZCBhdXRvIGZpbGwiOwogCi0vKiBMYWJlbCBmb3Igc3Ryb25nIHBhc3N3b3JkLiAqLwotIlN0cm9u ZyBQYXNzd29yZCIgPSAiU3Ryb25nIFBhc3N3b3JkIjsKLQogLyogTGFiZWwgZm9yIHRoZSBzdHJv bmcgcGFzc3dvcmQgYXV0byBmaWxsIGJ1dHRvbiBpbnNpZGUgYSB0ZXh0IGZpZWxkLiAqLwogInN0 cm9uZyBwYXNzd29yZCBhdXRvIGZpbGwiID0gInN0cm9uZyBwYXNzd29yZCBhdXRvIGZpbGwiOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL21h Yy9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VFbnRyeVBvaW50Lm1tIGIvU291cmNlL1dlYktpdC9TaGFy ZWQvRW50cnlQb2ludFV0aWxpdGllcy9tYWMvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2lu dC5tbQppbmRleCA5NWUyOWVhN2FhMzRmNjBmNTM5ZmNhNjJiMzM5OTA4ODllMmY0YTcwLi4zMzQx ZmIwZDc2YjkxMDQyNDc1MjFjYjdjM2ZiMmUzY2Q4NjljZDcxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL21hYy9YUENTZXJ2aWNlL1hQQ1NlcnZp Y2VFbnRyeVBvaW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGls aXRpZXMvbWFjL1hQQ1NlcnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQubW0KQEAgLTEyMSw2ICsx MjEsMTAgQEAgYm9vbCBYUENTZXJ2aWNlSW5pdGlhbGl6ZXJEZWxlZ2F0ZTo6Z2V0RXh0cmFJbml0 aWFsaXphdGlvbkRhdGEoSGFzaE1hcDxTdHJpbmcsIFMKICAgICAgICAgZXh0cmFJbml0aWFsaXph dGlvbkRhdGEuYWRkKEFTQ0lJTGl0ZXJhbCgic2VydmljZS13b3JrZXItcHJvY2VzcyIpLCBzZXJ2 aWNlV29ya2VyUHJvY2Vzcyk7CiAjZW5kaWYKIAorICAgIFN0cmluZyBzZWN1cml0eU9yaWdpbiA9 IHhwY19kaWN0aW9uYXJ5X2dldF9zdHJpbmcoZXh0cmFEYXRhSW5pdGlhbGl6YXRpb25EYXRhT2Jq ZWN0LCAic2VjdXJpdHktb3JpZ2luIik7CisgICAgaWYgKCFzZWN1cml0eU9yaWdpbi5pc0VtcHR5 KCkpCisgICAgICAgIGV4dHJhSW5pdGlhbGl6YXRpb25EYXRhLmFkZChBU0NJSUxpdGVyYWwoInNl Y3VyaXR5LW9yaWdpbiIpLCBzZWN1cml0eU9yaWdpbik7CisKICAgICBpZiAoIWlzQ2xpZW50U2Fu ZGJveGVkKCkpIHsKICAgICAgICAgU3RyaW5nIHVzZXJEaXJlY3RvcnlTdWZmaXggPSB4cGNfZGlj dGlvbmFyeV9nZXRfc3RyaW5nKGV4dHJhRGF0YUluaXRpYWxpemF0aW9uRGF0YU9iamVjdCwgInVz ZXItZGlyZWN0b3J5LXN1ZmZpeCIpOwogICAgICAgICBpZiAoIXVzZXJEaXJlY3RvcnlTdWZmaXgu aXNFbXB0eSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU2VydmljZVdv cmtlclByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TZXJ2aWNlV29y a2VyUHJvY2Vzc1Byb3h5LmNwcAppbmRleCA1OThjMzlkNzRiODIxMzBjMWEwMTNiOWNjNmVmYTlm M2UxMzM3YzQ5Li5jYWVlZWMzYjEyNjQxNjAyNTdjNzA1OWM4OTcxZWRmZDQyMzA5NTc2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TZXJ2aWNlV29ya2VyUHJvY2Vzc1By b3h5LmNwcApAQCAtNzEsNiArNzEsNyBAQCB2b2lkIFNlcnZpY2VXb3JrZXJQcm9jZXNzUHJveHk6 OmdldExhdW5jaE9wdGlvbnMoUHJvY2Vzc0xhdW5jaGVyOjpMYXVuY2hPcHRpb25zJgogICAgIFdl YlByb2Nlc3NQcm94eTo6Z2V0TGF1bmNoT3B0aW9ucyhsYXVuY2hPcHRpb25zKTsKIAogICAgIGxh dW5jaE9wdGlvbnMuZXh0cmFJbml0aWFsaXphdGlvbkRhdGEuYWRkKEFTQ0lJTGl0ZXJhbCgic2Vy dmljZS13b3JrZXItcHJvY2VzcyIpLCBBU0NJSUxpdGVyYWwoIjEiKSk7CisgICAgbGF1bmNoT3B0 aW9ucy5leHRyYUluaXRpYWxpemF0aW9uRGF0YS5hZGQoQVNDSUlMaXRlcmFsKCJzZWN1cml0eS1v cmlnaW4iKSwgb3JpZ2luKCkudG9TdHJpbmcoKSk7CiB9CiAKIHZvaWQgU2VydmljZVdvcmtlclBy b2Nlc3NQcm94eTo6c3RhcnQoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYgc3RvcmUsIHN0ZDo6 b3B0aW9uYWw8UEFMOjpTZXNzaW9uSUQ+IGluaXRpYWxTZXNzaW9uSUQpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQppbmRleCBiMTYwYjVl MGY4Y2M2Yjk5NGUyZTFhNmJkZjgzN2I2NDIwZTExZjcyLi5kZjFmY2U5NmFjYjkzMzYyZmI3NDFm OWI0ZTYzYzBlZTJjYWI5NDlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv Y29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9j b2NvYS9XZWJQcm9jZXNzQ29jb2EubW0KQEAgLTE5Miw3ICsxOTIsNyBAQCB2b2lkIFdlYlByb2Nl c3M6OmluaXRpYWxpemVQcm9jZXNzTmFtZShjb25zdCBDaGlsZFByb2Nlc3NJbml0aWFsaXphdGlv blBhcmFtZXRlcgogICAgICAgICBhcHBsaWNhdGlvbk5hbWUgPSBbTlNTdHJpbmcgc3RyaW5nV2l0 aEZvcm1hdDpXRUJfVUlfU1RSSU5HKCIlQCBXZWIgSW5zcGVjdG9yIiwgIlZpc2libGUgbmFtZSBv ZiBXZWIgSW5zcGVjdG9yJ3Mgd2ViIHByb2Nlc3MuIFRoZSBhcmd1bWVudCBpcyB0aGUgYXBwbGlj YXRpb24gbmFtZS4iKSwgKE5TU3RyaW5nICopcGFyYW1ldGVycy51aVByb2Nlc3NOYW1lXTsKICNp ZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCiAgICAgZWxzZSBpZiAocGFyYW1ldGVycy5leHRyYUlu aXRpYWxpemF0aW9uRGF0YS5nZXQoQVNDSUlMaXRlcmFsKCJzZXJ2aWNlLXdvcmtlci1wcm9jZXNz IikpID09ICIxIikKLSAgICAgICAgYXBwbGljYXRpb25OYW1lID0gW05TU3RyaW5nIHN0cmluZ1dp dGhGb3JtYXQ6V0VCX1VJX1NUUklORygiJUAgU2VydmljZSBXb3JrZXIiLCAiVmlzaWJsZSBuYW1l IG9mIFNlcnZpY2UgV29ya2VyIHByb2Nlc3MuIFRoZSBhcmd1bWVudCBpcyB0aGUgYXBwbGljYXRp b24gbmFtZS4iKSwgKE5TU3RyaW5nICopcGFyYW1ldGVycy51aVByb2Nlc3NOYW1lXTsKKyAgICAg ICAgYXBwbGljYXRpb25OYW1lID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6V0VCX1VJX1NU UklORygiJUAgU2VydmljZSBXb3JrZXIgKCVAKSIsICJWaXNpYmxlIG5hbWUgb2YgU2VydmljZSBX b3JrZXIgcHJvY2Vzcy4gVGhlIGFyZ3VtZW50IGlzIHRoZSBhcHBsaWNhdGlvbiBuYW1lLiIpLCAo TlNTdHJpbmcgKilwYXJhbWV0ZXJzLnVpUHJvY2Vzc05hbWUsIChOU1N0cmluZyAqKXBhcmFtZXRl cnMuZXh0cmFJbml0aWFsaXphdGlvbkRhdGEuZ2V0KEFTQ0lJTGl0ZXJhbCgic2VjdXJpdHktb3Jp Z2luIikpXTsKICNlbmRpZgogICAgIGVsc2UKICAgICAgICAgYXBwbGljYXRpb25OYW1lID0gW05T U3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6V0VCX1VJX1NUUklORygiJUAgV2ViIENvbnRlbnQiLCAi VmlzaWJsZSBuYW1lIG9mIHRoZSB3ZWIgcHJvY2Vzcy4gVGhlIGFyZ3VtZW50IGlzIHRoZSBhcHBs aWNhdGlvbiBuYW1lLiIpLCAoTlNTdHJpbmcgKilwYXJhbWV0ZXJzLnVpUHJvY2Vzc05hbWVdOwo=