224703 2021-04-16 16:22:52 -0700 [macOS] Add additional logging to help identify SSO dialog dismissals 2021-04-20 11:38:57 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham bradrini jiewen_tan katherine_cheney kkinnunen mjs webkit-bug-importer oldest_to_newest 1751318 0 bfulgham 2021-04-16 16:22:52 -0700 We've seen some reports that AppSSO flows sometimes leave a stuck authentication sheet stuck on the display. This is extremely disruptive, since the sheet is app-modal, preventing other tabs from being used. This patch adds some logging to try to identify when this condition happens, and what might cause it. 1751319 1 webkit-bug-importer 2021-04-16 16:23:13 -0700 <rdar://problem/76783787> 1751372 2 426313 bfulgham 2021-04-16 19:50:47 -0700 Created attachment 426313 Patch 1751453 3 426343 bfulgham 2021-04-17 13:05:45 -0700 Created attachment 426343 Patch 1752149 4 426343 mjs 2021-04-19 22:42:23 -0700 Comment on attachment 426343 Patch r=me 1752358 5 ews-feeder 2021-04-20 11:38:55 -0700 Committed r276314 (236795@main): <https://commits.webkit.org/236795@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426343. 426313 2021-04-16 19:50:47 -0700 2021-04-17 13:05:43 -0700 Patch bug-224703-20210416195046.patch text/plain 5968 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkwMDVlNTM2Y2ZhNzA0NTZh NTcyOGY0OWMzZjVlMjlmNGZmNTU0ODMuLjM0ODEyZDI1ZWM2NjIyNGU5NTBmMjY4MTM5ZTg2ZWFm NmZjZGZiZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDQtMTYgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSBBZGQgYWRkaXRp b25hbCBsb2dnaW5nIHRvIGhlbHAgaWRlbnRpZnkgU1NPIGRpYWxvZyBkaXNtaXNzYWxzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ3MDMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzc2NzgzNzg3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBsb2dnaW5nIGFyb3VuZCB0aGUgU1NPIHNoZWV0IGxp ZmUgY3ljbGUgdG8gaGVscCBpZGVudGlmeSBlZGdlIGNhc2VzLi4uIgorCisgICAgICAgICogVUlQ cm9jZXNzL0NvY29hL1NPQXV0aG9yaXphdGlvbi9TT0F1dGhvcml6YXRpb25TZXNzaW9uLm1tOgor ICAgICAgICAoV2ViS2l0OjpTT0F1dGhvcml6YXRpb25TZXNzaW9uOjpwcmVzZW50Vmlld0NvbnRy b2xsZXIpOgorICAgICAgICAoV2ViS2l0OjpTT0F1dGhvcml6YXRpb25TZXNzaW9uOjpkaXNtaXNz Vmlld0NvbnRyb2xsZXIpOgorCiAyMDIxLTA0LTE0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVkdWNlIG1heGltdW0gSGFzaFRhYmxlIGVu dHJ5IHNpemUgdG8gMTI4IGJ5dGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Db2NvYS9TT0F1dGhvcml6YXRpb24vU09BdXRob3JpemF0aW9uU2Vzc2lvbi5tbSBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1NPQXV0aG9yaXphdGlvbi9TT0F1dGhvcml6YXRpb25T ZXNzaW9uLm1tCmluZGV4IGRlMDQxM2NlY2NkZmI5YTUyZjA1ODJkYmVjNzcyYzRlNDNlYTYwZWIu LjY1Nzk3MTMxMmMzNGEyMWQ0YjNmN2NhZTJkYjk1OWIzYzUwMzJjYjUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1NPQXV0aG9yaXphdGlvbi9TT0F1dGhvcml6YXRp b25TZXNzaW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1NPQXV0aG9y aXphdGlvbi9TT0F1dGhvcml6YXRpb25TZXNzaW9uLm1tCkBAIC0yNjUsNiArMjY1LDcgQEAgdm9p ZCBTT0F1dGhvcml6YXRpb25TZXNzaW9uOjpwcmVzZW50Vmlld0NvbnRyb2xsZXIoU09BdXRob3Jp emF0aW9uVmlld0NvbnRyb2xsZXIKICAgICBtX3NoZWV0V2luZG93V2lsbENsb3NlT2JzZXJ2ZXIg PSBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyRm9yTmFt ZTpOU1dpbmRvd1dpbGxDbG9zZU5vdGlmaWNhdGlvbiBvYmplY3Q6bV9zaGVldFdpbmRvdy5nZXQo KSBxdWV1ZTpuaWwgdXNpbmdCbG9jazpbd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyldIChO U05vdGlmaWNhdGlvbiAqKSB7CiAgICAgICAgIGlmICghd2Vha1RoaXMpCiAgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIFJFTEVBU0VfTE9HKEFwcFNTTywgInByZXNlbnRWaWV3Q29udHJvbGxl cjogUmVjZWl2ZWQgTlNXaW5kb3dXaWxsQ2xvc2VOb3RpZmljYXRpb24uIERpc21pc3NpbmcgdGhl IHZpZXcgY29udHJvbGxlci4iKTsKICAgICAgICAgd2Vha1RoaXMtPmRpc21pc3NWaWV3Q29udHJv bGxlcigpOwogICAgIH1dOwogCkBAIC0yNzMsNiArMjc0LDggQEAgdm9pZCBTT0F1dGhvcml6YXRp b25TZXNzaW9uOjpwcmVzZW50Vmlld0NvbnRyb2xsZXIoU09BdXRob3JpemF0aW9uVmlld0NvbnRy b2xsZXIKICAgICAgICAgdWlDYWxsYmFjayhOTywgYWRvcHROUyhbW05TRXJyb3IgYWxsb2NdIGlu aXRXaXRoRG9tYWluOlNPRXJyb3JEb21haW4gY29kZTprU09FcnJvckF1dGhvcml6YXRpb25QcmVz ZW50YXRpb25GYWlsZWQgdXNlckluZm86bmlsXSkuZ2V0KCkpOwogICAgICAgICByZXR1cm47CiAg ICAgfQorCisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgicHJlc2VudFZpZXdDb250cm9sbGVy OiBDYWxsaW5nIGJlZ2luU2hlZXQgb24gJXAgZm9yIHNoZWV0ICVwLiIsIHByZXNlbnRpbmdXaW5k b3csIG1fc2hlZXRXaW5kb3cuZ2V0KCkpOwogICAgIFtwcmVzZW50aW5nV2luZG93IGJlZ2luU2hl ZXQ6bV9zaGVldFdpbmRvdy5nZXQoKSBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOwogI2VsaWYgUExB VEZPUk0oSU9TKQogICAgIFVJVmlld0NvbnRyb2xsZXIgKnByZXNlbnRpbmdWaWV3Q29udHJvbGxl ciA9IG1fcGFnZS0+dWlDbGllbnQoKS5wcmVzZW50aW5nVmlld0NvbnRyb2xsZXIoKTsKQEAgLTMw MCw5ICszMDMsMTMgQEAgdm9pZCBTT0F1dGhvcml6YXRpb25TZXNzaW9uOjpkaXNtaXNzVmlld0Nv bnRyb2xsZXIoKQogICAgIGlmIChtX3BhZ2UgJiYgbV9wYWdlLT5wbGF0Zm9ybVdpbmRvdygpKSB7 CiAgICAgICAgIGF1dG8gKnByZXNlbnRpbmdXaW5kb3cgPSBtX3BhZ2UtPnBsYXRmb3JtV2luZG93 KCk7CiAgICAgICAgIGlmIChwcmVzZW50aW5nV2luZG93Lm1pbmlhdHVyaXplZCkgewotICAgICAg ICAgICAgaWYgKG1fcHJlc2VudGluZ1dpbmRvd0RpZERlbWluaWF0dXJpemVPYnNlcnZlcikKKyAg ICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpc21pc3NWaWV3Q29udHJvbGxlcjog UGFnZSdzIHdpbmRvdyBpcyBtaW5pYXR1cml6ZWQuIFdhaXRpbmcgdG8gZGlzbWlzcyB1bnRpbCBh Y3RpdmUuIik7CisgICAgICAgICAgICBpZiAobV9wcmVzZW50aW5nV2luZG93RGlkRGVtaW5pYXR1 cml6ZU9ic2VydmVyKSB7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgi ZGlzbWlzc1ZpZXdDb250cm9sbGVyOiBbTWluaWF0dXJpemVkXSBBbHJlYWR5IGhhcyBhIGRlbWlu aWF0dXJpemVkIG9ic2VydmVyICglcCkuIEhpZGRlbiBvYnNlcnZlciBpcyAlcCIsIG1fcHJlc2Vu dGluZ1dpbmRvd0RpZERlbWluaWF0dXJpemVPYnNlcnZlci5nZXQoKSwgbV9hcHBsaWNhdGlvbkRp ZFVuaGlkZU9ic2VydmVyLmdldCgpKTsKICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAg ICAgICB9CiAgICAgICAgICAgICBtX3ByZXNlbnRpbmdXaW5kb3dEaWREZW1pbmlhdHVyaXplT2Jz ZXJ2ZXIgPSBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVy Rm9yTmFtZTpOU1dpbmRvd0RpZERlbWluaWF0dXJpemVOb3RpZmljYXRpb24gb2JqZWN0OnByZXNl bnRpbmdXaW5kb3cgcXVldWU6bmlsIHVzaW5nQmxvY2s6W3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVm UHRyKHRoaXMpLCB0aGlzXSAoTlNOb3RpZmljYXRpb24gKikgeworICAgICAgICAgICAgICAgIFJF TEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpc21pc3NWaWV3Q29udHJvbGxlcjogV2luZG93IGhhcyBk ZW1pbmlhdHVyaXplZC4gQ29tcGxldGluZyB0aGUgZGlzbWlzc2FsLiIpOwogICAgICAgICAgICAg ICAgIGRpc21pc3NWaWV3Q29udHJvbGxlcigpOwogICAgICAgICAgICAgICAgIFtbTlNOb3RpZmlj YXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6bV9wcmVzZW50aW5nV2lu ZG93RGlkRGVtaW5pYXR1cml6ZU9ic2VydmVyLmdldCgpXTsKICAgICAgICAgICAgICAgICBtX3By ZXNlbnRpbmdXaW5kb3dEaWREZW1pbmlhdHVyaXplT2JzZXJ2ZXIgPSBudWxscHRyOwpAQCAtMzEy LDkgKzMxOSwxMyBAQCB2b2lkIFNPQXV0aG9yaXphdGlvblNlc3Npb246OmRpc21pc3NWaWV3Q29u dHJvbGxlcigpCiAgICAgfQogCiAgICAgaWYgKE5TQXBwLmhpZGRlbikgewotICAgICAgICBpZiAo bV9hcHBsaWNhdGlvbkRpZFVuaGlkZU9ic2VydmVyKQorICAgICAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKCJkaXNtaXNzVmlld0NvbnRyb2xsZXI6IEFwcGxpY2F0aW9uIGlzIGhpZGRlbi4gV2Fp dGluZyB0byBkaXNtaXNzIHVudGlsIGFjdGl2ZS4iKTsKKyAgICAgICAgaWYgKG1fYXBwbGljYXRp b25EaWRVbmhpZGVPYnNlcnZlcikgeworICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RCgiZGlzbWlzc1ZpZXdDb250cm9sbGVyOiBbSGlkZGVuXSBBbHJlYWR5IGhhcyBhbiBVbmhpZGUg b2JzZXJ2ZXIgKCVwKS4gRGVtaW5pYXR1cml6ZWQgb2JzZXJ2ZXIgaXMgJXAiLCBtX3ByZXNlbnRp bmdXaW5kb3dEaWREZW1pbmlhdHVyaXplT2JzZXJ2ZXIuZ2V0KCksIG1fYXBwbGljYXRpb25EaWRV bmhpZGVPYnNlcnZlci5nZXQoKSk7CiAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KICAg ICAgICAgbV9hcHBsaWNhdGlvbkRpZFVuaGlkZU9ic2VydmVyID0gW1tOU05vdGlmaWNhdGlvbkNl bnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlckZvck5hbWU6TlNBcHBsaWNhdGlvbkRpZFVu aGlkZU5vdGlmaWNhdGlvbiBvYmplY3Q6TlNBcHAgcXVldWU6bmlsIHVzaW5nQmxvY2s6W3Byb3Rl Y3RlZFRoaXMgPSBtYWtlUmVmUHRyKHRoaXMpLCB0aGlzXSAoTlNOb3RpZmljYXRpb24gKikgewor ICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlzbWlzc1ZpZXdDb250cm9sbGVy OiBBcHBsaWNhdGlvbiBpcyBubyBsb25nZXIgaGlkZGVuLiBDb21wbGV0aW5nIHRoZSBkaXNtaXNz YWwuIik7CiAgICAgICAgICAgICBkaXNtaXNzVmlld0NvbnRyb2xsZXIoKTsKICAgICAgICAgICAg IFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6bV9h cHBsaWNhdGlvbkRpZFVuaGlkZU9ic2VydmVyLmdldCgpXTsKICAgICAgICAgICAgIG1fYXBwbGlj YXRpb25EaWRVbmhpZGVPYnNlcnZlciA9IG51bGxwdHI7CkBAIC0zMjUsMTMgKzMzNiwxNyBAQCB2 b2lkIFNPQXV0aG9yaXphdGlvblNlc3Npb246OmRpc21pc3NWaWV3Q29udHJvbGxlcigpCiAgICAg W1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjptX3No ZWV0V2luZG93V2lsbENsb3NlT2JzZXJ2ZXIuZ2V0KCldOwogICAgIG1fc2hlZXRXaW5kb3dXaWxs Q2xvc2VPYnNlcnZlciA9IG51bGxwdHI7CiAKLSAgICBbW21fc2hlZXRXaW5kb3cgc2hlZXRQYXJl bnRdIGVuZFNoZWV0Om1fc2hlZXRXaW5kb3cuZ2V0KCldOworICAgIGF1dG8gKnByZXNlbnRpbmdX aW5kb3cgPSBtX3NoZWV0V2luZG93LmdldCgpLnNoZWV0UGFyZW50OworICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQoImRpc21pc3NWaWV3Q29udHJvbGxlcjogQ2FsbGluZyBlbmRTaGVldCBvbiAl cCBmb3Igc2hlZXQgJXAuIiwgcHJlc2VudGluZ1dpbmRvdywgbV9zaGVldFdpbmRvdy5nZXQoKSk7 CisgICAgW3ByZXNlbnRpbmdXaW5kb3cgZW5kU2hlZXQ6bV9zaGVldFdpbmRvdy5nZXQoKV07CiAg ICAgbV9zaGVldFdpbmRvdyA9IG51bGxwdHI7CiAjZWxpZiBQTEFURk9STShJT1MpCiAgICAgW1tt X3ZpZXdDb250cm9sbGVyIHByZXNlbnRpbmdWaWV3Q29udHJvbGxlcl0gZGlzbWlzc1ZpZXdDb250 cm9sbGVyQW5pbWF0ZWQ6WUVTIGNvbXBsZXRpb246bmlsXTsKICNlbmRpZgogCiAgICAgbV92aWV3 Q29udHJvbGxlciA9IG51bGxwdHI7CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaXNt aXNzVmlld0NvbnRyb2xsZXI6IEZpbmlzaGVkIGNhbGwgd2l0aCBkZW1pbmlhdHVyaXplZCBvYnNl cnZlciAoJXApIGFuZCBIaWRkZW4gb2JzZXJ2ZXIgKCVwKSIsIG1fcHJlc2VudGluZ1dpbmRvd0Rp ZERlbWluaWF0dXJpemVPYnNlcnZlci5nZXQoKSwgbV9hcHBsaWNhdGlvbkRpZFVuaGlkZU9ic2Vy dmVyLmdldCgpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg== 426343 2021-04-17 13:05:45 -0700 2021-04-20 11:38:56 -0700 Patch bug-224703-20210417130544.patch text/plain 5902 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkwMDVlNTM2Y2ZhNzA0NTZh NTcyOGY0OWMzZjVlMjlmNGZmNTU0ODMuLjM0ODEyZDI1ZWM2NjIyNGU5NTBmMjY4MTM5ZTg2ZWFm NmZjZGZiZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDQtMTYgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSBBZGQgYWRkaXRp b25hbCBsb2dnaW5nIHRvIGhlbHAgaWRlbnRpZnkgU1NPIGRpYWxvZyBkaXNtaXNzYWxzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ3MDMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzc2NzgzNzg3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBsb2dnaW5nIGFyb3VuZCB0aGUgU1NPIHNoZWV0IGxp ZmUgY3ljbGUgdG8gaGVscCBpZGVudGlmeSBlZGdlIGNhc2VzLi4uIgorCisgICAgICAgICogVUlQ cm9jZXNzL0NvY29hL1NPQXV0aG9yaXphdGlvbi9TT0F1dGhvcml6YXRpb25TZXNzaW9uLm1tOgor ICAgICAgICAoV2ViS2l0OjpTT0F1dGhvcml6YXRpb25TZXNzaW9uOjpwcmVzZW50Vmlld0NvbnRy b2xsZXIpOgorICAgICAgICAoV2ViS2l0OjpTT0F1dGhvcml6YXRpb25TZXNzaW9uOjpkaXNtaXNz Vmlld0NvbnRyb2xsZXIpOgorCiAyMDIxLTA0LTE0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVkdWNlIG1heGltdW0gSGFzaFRhYmxlIGVu dHJ5IHNpemUgdG8gMTI4IGJ5dGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Db2NvYS9TT0F1dGhvcml6YXRpb24vU09BdXRob3JpemF0aW9uU2Vzc2lvbi5tbSBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1NPQXV0aG9yaXphdGlvbi9TT0F1dGhvcml6YXRpb25T ZXNzaW9uLm1tCmluZGV4IGRlMDQxM2NlY2NkZmI5YTUyZjA1ODJkYmVjNzcyYzRlNDNlYTYwZWIu LmI0YjZkYjMxNTY5MTU3ZmM5ZDY0OTA1ZTdjNDI3YmM2YTJlYThmYjMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1NPQXV0aG9yaXphdGlvbi9TT0F1dGhvcml6YXRp b25TZXNzaW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1NPQXV0aG9y aXphdGlvbi9TT0F1dGhvcml6YXRpb25TZXNzaW9uLm1tCkBAIC0yNjUsNiArMjY1LDcgQEAgdm9p ZCBTT0F1dGhvcml6YXRpb25TZXNzaW9uOjpwcmVzZW50Vmlld0NvbnRyb2xsZXIoU09BdXRob3Jp emF0aW9uVmlld0NvbnRyb2xsZXIKICAgICBtX3NoZWV0V2luZG93V2lsbENsb3NlT2JzZXJ2ZXIg PSBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyRm9yTmFt ZTpOU1dpbmRvd1dpbGxDbG9zZU5vdGlmaWNhdGlvbiBvYmplY3Q6bV9zaGVldFdpbmRvdy5nZXQo KSBxdWV1ZTpuaWwgdXNpbmdCbG9jazpbd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyldIChO U05vdGlmaWNhdGlvbiAqKSB7CiAgICAgICAgIGlmICghd2Vha1RoaXMpCiAgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIFJFTEVBU0VfTE9HKEFwcFNTTywgInByZXNlbnRWaWV3Q29udHJvbGxl cjogUmVjZWl2ZWQgTlNXaW5kb3dXaWxsQ2xvc2VOb3RpZmljYXRpb24uIERpc21pc3NpbmcgdGhl IHZpZXcgY29udHJvbGxlci4iKTsKICAgICAgICAgd2Vha1RoaXMtPmRpc21pc3NWaWV3Q29udHJv bGxlcigpOwogICAgIH1dOwogCkBAIC0yNzMsNiArMjc0LDggQEAgdm9pZCBTT0F1dGhvcml6YXRp b25TZXNzaW9uOjpwcmVzZW50Vmlld0NvbnRyb2xsZXIoU09BdXRob3JpemF0aW9uVmlld0NvbnRy b2xsZXIKICAgICAgICAgdWlDYWxsYmFjayhOTywgYWRvcHROUyhbW05TRXJyb3IgYWxsb2NdIGlu aXRXaXRoRG9tYWluOlNPRXJyb3JEb21haW4gY29kZTprU09FcnJvckF1dGhvcml6YXRpb25QcmVz ZW50YXRpb25GYWlsZWQgdXNlckluZm86bmlsXSkuZ2V0KCkpOwogICAgICAgICByZXR1cm47CiAg ICAgfQorCisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgicHJlc2VudFZpZXdDb250cm9sbGVy OiBDYWxsaW5nIGJlZ2luU2hlZXQgb24gJXAgZm9yIHNoZWV0ICVwLiIsIHByZXNlbnRpbmdXaW5k b3csIG1fc2hlZXRXaW5kb3cuZ2V0KCkpOwogICAgIFtwcmVzZW50aW5nV2luZG93IGJlZ2luU2hl ZXQ6bV9zaGVldFdpbmRvdy5nZXQoKSBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOwogI2VsaWYgUExB VEZPUk0oSU9TKQogICAgIFVJVmlld0NvbnRyb2xsZXIgKnByZXNlbnRpbmdWaWV3Q29udHJvbGxl ciA9IG1fcGFnZS0+dWlDbGllbnQoKS5wcmVzZW50aW5nVmlld0NvbnRyb2xsZXIoKTsKQEAgLTMw MCw5ICszMDMsMTMgQEAgdm9pZCBTT0F1dGhvcml6YXRpb25TZXNzaW9uOjpkaXNtaXNzVmlld0Nv bnRyb2xsZXIoKQogICAgIGlmIChtX3BhZ2UgJiYgbV9wYWdlLT5wbGF0Zm9ybVdpbmRvdygpKSB7 CiAgICAgICAgIGF1dG8gKnByZXNlbnRpbmdXaW5kb3cgPSBtX3BhZ2UtPnBsYXRmb3JtV2luZG93 KCk7CiAgICAgICAgIGlmIChwcmVzZW50aW5nV2luZG93Lm1pbmlhdHVyaXplZCkgewotICAgICAg ICAgICAgaWYgKG1fcHJlc2VudGluZ1dpbmRvd0RpZERlbWluaWF0dXJpemVPYnNlcnZlcikKKyAg ICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpc21pc3NWaWV3Q29udHJvbGxlcjog UGFnZSdzIHdpbmRvdyBpcyBtaW5pYXR1cml6ZWQuIFdhaXRpbmcgdG8gZGlzbWlzcyB1bnRpbCBh Y3RpdmUuIik7CisgICAgICAgICAgICBpZiAobV9wcmVzZW50aW5nV2luZG93RGlkRGVtaW5pYXR1 cml6ZU9ic2VydmVyKSB7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgi ZGlzbWlzc1ZpZXdDb250cm9sbGVyOiBbTWluaWF0dXJpemVkXSBBbHJlYWR5IGhhcyBhIGRlbWlu aWF0dXJpemVkIG9ic2VydmVyICglcCkuIEhpZGRlbiBvYnNlcnZlciBpcyAlcCIsIG1fcHJlc2Vu dGluZ1dpbmRvd0RpZERlbWluaWF0dXJpemVPYnNlcnZlci5nZXQoKSwgbV9hcHBsaWNhdGlvbkRp ZFVuaGlkZU9ic2VydmVyLmdldCgpKTsKICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAg ICAgICB9CiAgICAgICAgICAgICBtX3ByZXNlbnRpbmdXaW5kb3dEaWREZW1pbmlhdHVyaXplT2Jz ZXJ2ZXIgPSBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVy Rm9yTmFtZTpOU1dpbmRvd0RpZERlbWluaWF0dXJpemVOb3RpZmljYXRpb24gb2JqZWN0OnByZXNl bnRpbmdXaW5kb3cgcXVldWU6bmlsIHVzaW5nQmxvY2s6W3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVm UHRyKHRoaXMpLCB0aGlzXSAoTlNOb3RpZmljYXRpb24gKikgeworICAgICAgICAgICAgICAgIFJF TEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpc21pc3NWaWV3Q29udHJvbGxlcjogV2luZG93IGhhcyBk ZW1pbmlhdHVyaXplZC4gQ29tcGxldGluZyB0aGUgZGlzbWlzc2FsLiIpOwogICAgICAgICAgICAg ICAgIGRpc21pc3NWaWV3Q29udHJvbGxlcigpOwogICAgICAgICAgICAgICAgIFtbTlNOb3RpZmlj YXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6bV9wcmVzZW50aW5nV2lu ZG93RGlkRGVtaW5pYXR1cml6ZU9ic2VydmVyLmdldCgpXTsKICAgICAgICAgICAgICAgICBtX3By ZXNlbnRpbmdXaW5kb3dEaWREZW1pbmlhdHVyaXplT2JzZXJ2ZXIgPSBudWxscHRyOwpAQCAtMzEy LDkgKzMxOSwxMyBAQCB2b2lkIFNPQXV0aG9yaXphdGlvblNlc3Npb246OmRpc21pc3NWaWV3Q29u dHJvbGxlcigpCiAgICAgfQogCiAgICAgaWYgKE5TQXBwLmhpZGRlbikgewotICAgICAgICBpZiAo bV9hcHBsaWNhdGlvbkRpZFVuaGlkZU9ic2VydmVyKQorICAgICAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKCJkaXNtaXNzVmlld0NvbnRyb2xsZXI6IEFwcGxpY2F0aW9uIGlzIGhpZGRlbi4gV2Fp dGluZyB0byBkaXNtaXNzIHVudGlsIGFjdGl2ZS4iKTsKKyAgICAgICAgaWYgKG1fYXBwbGljYXRp b25EaWRVbmhpZGVPYnNlcnZlcikgeworICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RCgiZGlzbWlzc1ZpZXdDb250cm9sbGVyOiBbSGlkZGVuXSBBbHJlYWR5IGhhcyBhbiBVbmhpZGUg b2JzZXJ2ZXIgKCVwKS4gRGVtaW5pYXR1cml6ZWQgb2JzZXJ2ZXIgaXMgJXAiLCBtX3ByZXNlbnRp bmdXaW5kb3dEaWREZW1pbmlhdHVyaXplT2JzZXJ2ZXIuZ2V0KCksIG1fYXBwbGljYXRpb25EaWRV bmhpZGVPYnNlcnZlci5nZXQoKSk7CiAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KICAg ICAgICAgbV9hcHBsaWNhdGlvbkRpZFVuaGlkZU9ic2VydmVyID0gW1tOU05vdGlmaWNhdGlvbkNl bnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlckZvck5hbWU6TlNBcHBsaWNhdGlvbkRpZFVu aGlkZU5vdGlmaWNhdGlvbiBvYmplY3Q6TlNBcHAgcXVldWU6bmlsIHVzaW5nQmxvY2s6W3Byb3Rl Y3RlZFRoaXMgPSBtYWtlUmVmUHRyKHRoaXMpLCB0aGlzXSAoTlNOb3RpZmljYXRpb24gKikgewor ICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlzbWlzc1ZpZXdDb250cm9sbGVy OiBBcHBsaWNhdGlvbiBpcyBubyBsb25nZXIgaGlkZGVuLiBDb21wbGV0aW5nIHRoZSBkaXNtaXNz YWwuIik7CiAgICAgICAgICAgICBkaXNtaXNzVmlld0NvbnRyb2xsZXIoKTsKICAgICAgICAgICAg IFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6bV9h cHBsaWNhdGlvbkRpZFVuaGlkZU9ic2VydmVyLmdldCgpXTsKICAgICAgICAgICAgIG1fYXBwbGlj YXRpb25EaWRVbmhpZGVPYnNlcnZlciA9IG51bGxwdHI7CkBAIC0zMjUsOCArMzM2LDExIEBAIHZv aWQgU09BdXRob3JpemF0aW9uU2Vzc2lvbjo6ZGlzbWlzc1ZpZXdDb250cm9sbGVyKCkKICAgICBb W05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIHJlbW92ZU9ic2VydmVyOm1fc2hl ZXRXaW5kb3dXaWxsQ2xvc2VPYnNlcnZlci5nZXQoKV07CiAgICAgbV9zaGVldFdpbmRvd1dpbGxD bG9zZU9ic2VydmVyID0gbnVsbHB0cjsKIAotICAgIFtbbV9zaGVldFdpbmRvdyBzaGVldFBhcmVu dF0gZW5kU2hlZXQ6bV9zaGVldFdpbmRvdy5nZXQoKV07CisgICAgYXV0byAqcHJlc2VudGluZ1dp bmRvdyA9IG1fc2hlZXRXaW5kb3cuZ2V0KCkuc2hlZXRQYXJlbnQ7CisgICAgUkVMRUFTRV9MT0df SUZfQUxMT1dFRCgiZGlzbWlzc1ZpZXdDb250cm9sbGVyOiBDYWxsaW5nIGVuZFNoZWV0IG9uICVw IGZvciBzaGVldCAlcC4iLCBwcmVzZW50aW5nV2luZG93LCBtX3NoZWV0V2luZG93LmdldCgpKTsK KyAgICBbcHJlc2VudGluZ1dpbmRvdyBlbmRTaGVldDptX3NoZWV0V2luZG93LmdldCgpXTsKICAg ICBtX3NoZWV0V2luZG93ID0gbnVsbHB0cjsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJk aXNtaXNzVmlld0NvbnRyb2xsZXI6IEZpbmlzaGVkIGNhbGwgd2l0aCBkZW1pbmlhdHVyaXplZCBv YnNlcnZlciAoJXApIGFuZCBIaWRkZW4gb2JzZXJ2ZXIgKCVwKSIsIG1fcHJlc2VudGluZ1dpbmRv d0RpZERlbWluaWF0dXJpemVPYnNlcnZlci5nZXQoKSwgbV9hcHBsaWNhdGlvbkRpZFVuaGlkZU9i c2VydmVyLmdldCgpKTsKICNlbGlmIFBMQVRGT1JNKElPUykKICAgICBbW21fdmlld0NvbnRyb2xs ZXIgcHJlc2VudGluZ1ZpZXdDb250cm9sbGVyXSBkaXNtaXNzVmlld0NvbnRyb2xsZXJBbmltYXRl ZDpZRVMgY29tcGxldGlvbjpuaWxdOwogI2VuZGlmCg==