209521 2020-03-24 16:38:48 -0700 App-bound domain checks should provide more debugging details at script evaluation sites 2020-03-25 09:55:38 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney aestes bfulgham cdumez ews-watchlist mkwst simon.fraser thorton oldest_to_newest 1633651 0 katherine_cheney 2020-03-24 16:38:48 -0700 This would be helpful for debugging. 1633652 1 katherine_cheney 2020-03-24 16:39:27 -0700 <rdar://problem/60837954> 1633665 2 394443 katherine_cheney 2020-03-24 16:59:55 -0700 Created attachment 394443 Patch 1633670 3 394443 cdumez 2020-03-24 17:04:07 -0700 Comment on attachment 394443 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394443&action=review > Source/WebCore/bindings/js/ScriptController.cpp:580 > + m_frame.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Warning, "Ignoring user script injection for non-app bound domain."); Why do release logging here? How do you know document is non null? > Source/WebCore/page/Frame.cpp:630 > return; Why do release logging here? 1633673 4 394443 katherine_cheney 2020-03-24 17:08:06 -0700 Comment on attachment 394443 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394443&action=review >> Source/WebCore/bindings/js/ScriptController.cpp:580 >> + m_frame.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Warning, "Ignoring user script injection for non-app bound domain."); > > Why do release logging here? > How do you know document is non null? I didn't see any other examples of release logging so I wasn't sure if I could here. I'll add a check for m_frame.document(). >> Source/WebCore/page/Frame.cpp:630 >> return; > > Why do release logging here? Same as above, I didn't see any other examples of release logging so I wasn't sure if I could here 1633675 5 katherine_cheney 2020-03-24 17:08:49 -0700 (In reply to katherine_cheney from comment #4) > Comment on attachment 394443 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=394443&action=review > > >> Source/WebCore/bindings/js/ScriptController.cpp:580 > >> + m_frame.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Warning, "Ignoring user script injection for non-app bound domain."); > > > > Why do release logging here? > > How do you know document is non null? > > I didn't see any other examples of release logging so I wasn't sure if I > could here. I'll add a check for m_frame.document(). > (no other examples in this file) > >> Source/WebCore/page/Frame.cpp:630 > >> return; > > > > Why do release logging here? > > Same as above, I didn't see any other examples of release logging so I > wasn't sure if I could here 1633705 6 cdumez 2020-03-24 17:38:07 -0700 (In reply to katherine_cheney from comment #4) > Comment on attachment 394443 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=394443&action=review > > >> Source/WebCore/bindings/js/ScriptController.cpp:580 > >> + m_frame.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Warning, "Ignoring user script injection for non-app bound domain."); > > > > Why do release logging here? > > How do you know document is non null? > > I didn't see any other examples of release logging so I wasn't sure if I > could here. I'll add a check for m_frame.document(). > > >> Source/WebCore/page/Frame.cpp:630 > >> return; > > > > Why do release logging here? > > Same as above, I didn't see any other examples of release logging so I > wasn't sure if I could here I believe you can do release logging anywhere you'd like. 1633886 7 394502 katherine_cheney 2020-03-25 08:54:32 -0700 Created attachment 394502 Patch 1633898 8 ews-feeder 2020-03-25 09:30:01 -0700 Committed r258986: <https://trac.webkit.org/changeset/258986> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394502. 1633914 9 394502 simon.fraser 2020-03-25 09:55:38 -0700 Comment on attachment 394502 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394502&action=review > Source/WebCore/bindings/js/ScriptController.cpp:584 > + document->addConsoleMessage(MessageSource::Security, MessageLevel::Warning, "Ignoring user script injection for non-app bound domain."); I don't think "user script injection" makes sense here, authors won't know what that means when they see it in the console. This needs to say something like "Scripts injected by extensions" or "Scripts injected by the application". Ideally it would explicitly identify the extension or app by name. Also, no-one will know what "app-bound domains" are. 394443 2020-03-24 16:59:55 -0700 2020-03-25 08:54:30 -0700 Patch bug-209521-20200324165955.patch text/plain 5332 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4OTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI3NzgyNmEzMzliODdl MGE4OWFkZjk3MWM4NmE2Yjg2NGFhNzE2Ni4uYmU3MWQwZjg0MjE0YWE1MzQ5MDE5OGU5ODVmM2Zm NDE5YzllZGY2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTAzLTI0ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIEFwcC1ib3Vu ZCBkb21haW4gY2hlY2tzIHNob3VsZCBwcm92aWRlIG1vcmUgZGVidWdnaW5nIGRldGFpbHMgYXQg c2NyaXB0IGV2YWx1YXRpb24gc2l0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwOTUyMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjA4Mzc5NTQ+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBiaW5k aW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdENv bnRyb2xsZXI6OmV4ZWN1dGVTY3JpcHRJbldvcmxkKToKKyAgICAgICAgUmV0dXJuIG1ha2VVbmV4 cGVjdGVkIG9iamVjdCB3aXRoIGFuIGVycm9yIG1lc3NhZ2UgaW5zdGVhZCBvZiBudWxsIHRvCisg ICAgICAgIHByb3ZpZGUgbW9yZSBkZXRhaWxzIGFzIHRvIHdoeSB0aGUgZXhlY3V0ZVNjcmlwdElu V29ybGQoKQorICAgICAgICBjYWxsIHdhcyBub3QgY29tcGxldGVkLiBBbHNvIGFkZCBjb25zb2xl IGxvZ2dpbmcuCisgCisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZTo6aW5qZWN0VXNlclNjcmlwdEltbWVkaWF0ZWx5KToKKyAgICAgICAgQWRkIGNvbnNv bGUgbG9nZ2luZyBiZWNhdXNlIHRoZXJlIGlzIG5vIG9wdGlvbiB0bworICAgICAgICByZXR1cm4g YW4gZXhjZXB0aW9uIGhlcmUuCisKIDIwMjAtMDMtMjQgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRz QGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViIEFuaW1hdGlvbnNdIENsZWFuIHRpbWVsaW5lIGhl YWRlcnMgdXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKaW5kZXggM2ZiNmU0MzQ1MTg2MTQ1OGZkZjIzMjU0MDg2YTdiODlhYWY5 YTk3OS4uZDlhMThhMDMxYjViZTc2Mjk2MWQxZmJhYTFiNWU3NDFkY2Q5MDA0ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOCBAQAorMjAyMC0wMy0yNCAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hl bmV5QGFwcGxlLmNvbT4KKworICAgICAgICBBcHAtYm91bmQgZG9tYWluIGNoZWNrcyBzaG91bGQg cHJvdmlkZSBtb3JlIGRlYnVnZ2luZyBkZXRhaWxzIGF0IHNjcmlwdCBldmFsdWF0aW9uIHNpdGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk1MjEK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYwODM3OTU0PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJldHVybiBhbiBleGNlcHRpb24gYW5kIGFkZCBh IFJFTEVBU0VfTE9HX0VSUk9SIG1lc3NhZ2UgYmVjYXVzZSB0aGF0CisgICAgICAgIG9wdGlvbiBp cyBhdmFpbGFibGUgaGVyZSwgYW5kIGFsc28gYWRkIGNvbnNvbGUgbG9nZ2luZyBmb3IgY29uc2lz dGVuY3kKKyAgICAgICAgYWNyb3NzIGFwcC1ib3VuZCBkb21haW4gY2hlY2tzLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlOjpydW5KYXZhU2NyaXB0KToKKwogMjAyMC0wMy0yNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpA YXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjU4OTI4LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAppbmRleCBh ZjM2OGI3NmI0NGQ4ODQwOTVhMmJjM2RhYWZiZTE0M2I5MDU5M2UwLi5mMWY0OTUwMzIyZGFkZmEx MGIzMTZjYzA5Y2NjNjUwZWRkYzVlYTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcApAQCAtNTc2LDggKzU3NiwxMCBAQCBKU0M6OkpTVmFs dWUgU2NyaXB0Q29udHJvbGxlcjo6ZXhlY3V0ZVNjcmlwdEluV29ybGRJZ25vcmluZ0V4Y2VwdGlv bihET01XcmFwcGVyVwogCiBWYWx1ZU9yRXhjZXB0aW9uIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1 dGVTY3JpcHRJbldvcmxkKERPTVdyYXBwZXJXb3JsZCYgd29ybGQsIFJ1bkphdmFTY3JpcHRQYXJh bWV0ZXJzJiYgcGFyYW1ldGVycykKIHsKLSAgICBpZiAobV9mcmFtZS5sb2FkZXIoKS5jbGllbnQo KS5oYXNOYXZpZ2F0ZWRBd2F5RnJvbUFwcEJvdW5kRG9tYWluKCkgJiYgIW1fZnJhbWUubG9hZGVy KCkuY2xpZW50KCkubmVlZHNJbkFwcEJyb3dzZXJQcml2YWN5UXVpcmtzKCkpCi0gICAgICAgIHJl dHVybiBqc051bGwoKTsKKyAgICBpZiAobV9mcmFtZS5sb2FkZXIoKS5jbGllbnQoKS5oYXNOYXZp Z2F0ZWRBd2F5RnJvbUFwcEJvdW5kRG9tYWluKCkgJiYgIW1fZnJhbWUubG9hZGVyKCkuY2xpZW50 KCkubmVlZHNJbkFwcEJyb3dzZXJQcml2YWN5UXVpcmtzKCkpIHsKKyAgICAgICAgbV9mcmFtZS5k b2N1bWVudCgpLT5hZGRDb25zb2xlTWVzc2FnZShNZXNzYWdlU291cmNlOjpTZWN1cml0eSwgTWVz c2FnZUxldmVsOjpXYXJuaW5nLCAiSWdub3JpbmcgdXNlciBzY3JpcHQgaW5qZWN0aW9uIGZvciBu b24tYXBwIGJvdW5kIGRvbWFpbi4iKTsKKyAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKEV4 Y2VwdGlvbkRldGFpbHMgeyAiSWdub3JpbmcgdXNlciBzY3JpcHQgaW5qZWN0aW9uIGZvciBub24t YXBwIGJvdW5kIGRvbWFpbiJfcyB9KTsKKyAgICB9CiAKICAgICBVc2VyR2VzdHVyZUluZGljYXRv ciBnZXN0dXJlSW5kaWNhdG9yKHBhcmFtZXRlcnMuZm9yY2VVc2VyR2VzdHVyZSA9PSBGb3JjZVVz ZXJHZXN0dXJlOjpZZXMgPyBPcHRpb25hbDxQcm9jZXNzaW5nVXNlckdlc3R1cmVTdGF0ZT4oUHJv Y2Vzc2luZ1VzZXJHZXN0dXJlKSA6IFdURjo6bnVsbG9wdCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAK aW5kZXggZWNhNTE0MWM5MmI5MDkzOWUyNDk5NzVlYWZhOTNmMGU2NzZhYjcwNS4uOTliZjUzMjU1 MDAwMzUyZDIxMjA2ZjgxNTNlYzc0ODQzOWI1MzA5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKQEAg LTYyNCw4ICs2MjQsMTEgQEAgdm9pZCBGcmFtZTo6aW5qZWN0VXNlclNjcmlwdHMoVXNlclNjcmlw dEluamVjdGlvblRpbWUgaW5qZWN0aW9uVGltZSkKIAogdm9pZCBGcmFtZTo6aW5qZWN0VXNlclNj cmlwdEltbWVkaWF0ZWx5KERPTVdyYXBwZXJXb3JsZCYgd29ybGQsIGNvbnN0IFVzZXJTY3JpcHQm IHNjcmlwdCkKIHsKLSAgICBpZiAobG9hZGVyKCkuY2xpZW50KCkuaGFzTmF2aWdhdGVkQXdheUZy b21BcHBCb3VuZERvbWFpbigpICYmICFsb2FkZXIoKS5jbGllbnQoKS5uZWVkc0luQXBwQnJvd3Nl clByaXZhY3lRdWlya3MoKSkKKyAgICBpZiAobG9hZGVyKCkuY2xpZW50KCkuaGFzTmF2aWdhdGVk QXdheUZyb21BcHBCb3VuZERvbWFpbigpICYmICFsb2FkZXIoKS5jbGllbnQoKS5uZWVkc0luQXBw QnJvd3NlclByaXZhY3lRdWlya3MoKSkgeworICAgICAgICBpZiAoYXV0byogZG9jdW1lbnQgPSB0 aGlzLT5kb2N1bWVudCgpKQorICAgICAgICAgICAgZG9jdW1lbnQtPmFkZENvbnNvbGVNZXNzYWdl KE1lc3NhZ2VTb3VyY2U6OlNlY3VyaXR5LCBNZXNzYWdlTGV2ZWw6Oldhcm5pbmcsICJJZ25vcmlu ZyB1c2VyIHNjcmlwdCBpbmplY3Rpb24gZm9yIG5vbi1hcHAgYm91bmQgZG9tYWluLiJfcyk7CiAg ICAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBhdXRvKiBkb2N1bWVudCA9IHRoaXMtPmRvY3Vt ZW50KCk7CiAgICAgaWYgKCFkb2N1bWVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMWNkMGIzMGM1ODhmNGI0NDU1NTI0YzEyNDVkZjQ0ODgz OWE5N2IyNi4uM2U3NzE4MWVhZmEzMjY4NDM0ODZmMDRhMzAzZDg5YjY5ZWIyZTdiOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTM0NDgsNiAr MzQ0OCw5IEBAIHZvaWQgV2ViUGFnZTo6cnVuSmF2YVNjcmlwdChXZWJGcmFtZSogZnJhbWUsIFJ1 bkphdmFTY3JpcHRQYXJhbWV0ZXJzJiYgcGFyYW1ldGVyCiAgICAgCiAgICAgaWYgKGhhc05hdmln YXRlZEF3YXlGcm9tQXBwQm91bmREb21haW4oKSA9PSBOYXZpZ2F0ZWRBd2F5RnJvbUFwcEJvdW5k RG9tYWluOjpZZXMgJiYgIW1fbmVlZHNJbkFwcEJyb3dzZXJQcml2YWN5UXVpcmtzKSB7CiAgICAg ICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2NyaXB0VmFsdWVDYWxsYmFjayh7IH0s IEV4Y2VwdGlvbkRldGFpbHMgeyAiVW5hYmxlIHRvIGV4ZWN1dGUgSmF2YVNjcmlwdCJfcyB9LCBj YWxsYmFja0lEKSk7CisgICAgICAgIGlmIChhdXRvKiBkb2N1bWVudCA9IG1fcGFnZS0+bWFpbkZy YW1lKCkuZG9jdW1lbnQoKSkKKyAgICAgICAgICAgIGRvY3VtZW50LT5hZGRDb25zb2xlTWVzc2Fn ZShNZXNzYWdlU291cmNlOjpTZWN1cml0eSwgTWVzc2FnZUxldmVsOjpXYXJuaW5nLCAiSWdub3Jp bmcgdXNlciBzY3JpcHQgaW5qZWN0aW9uIGZvciBub24tYXBwIGJvdW5kIGRvbWFpbi4iKTsKKyAg ICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChQcm9jZXNzLCAicnVuSmF2YVNjcmlw dDogSWdub3JpbmcgdXNlciBzY3JpcHQgaW5qZWN0aW9uIGZvciBub24gYXBwLWJvdW5kIGRvbWFp biIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCg== 394502 2020-03-25 08:54:32 -0700 2020-03-25 09:30:01 -0700 Patch bug-209521-20200325085431.patch text/plain 6773 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4OTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI3NzgyNmEzMzliODdl MGE4OWFkZjk3MWM4NmE2Yjg2NGFhNzE2Ni4uMjcwYTAxYTY1Njg0ZTQwMzA4MzkyNjY5NzMzYjVj ZDA3MTM1MTU0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTAzLTI0ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIEFwcC1ib3Vu ZCBkb21haW4gY2hlY2tzIHNob3VsZCBwcm92aWRlIG1vcmUgZGVidWdnaW5nIGRldGFpbHMgYXQg c2NyaXB0IGV2YWx1YXRpb24gc2l0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwOTUyMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjA4Mzc5NTQ+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBiaW5k aW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdENv bnRyb2xsZXI6OmV4ZWN1dGVTY3JpcHRJbldvcmxkKToKKyAgICAgICAgUmV0dXJuIG1ha2VVbmV4 cGVjdGVkIG9iamVjdCB3aXRoIGFuIGVycm9yIG1lc3NhZ2UgaW5zdGVhZCBvZiBudWxsIHRvCisg ICAgICAgIHByb3ZpZGUgbW9yZSBkZXRhaWxzIGFzIHRvIHdoeSB0aGUgZXhlY3V0ZVNjcmlwdElu V29ybGQoKQorICAgICAgICBjYWxsIHdhcyBub3QgY29tcGxldGVkLiBBbHNvIGFkZCBjb25zb2xl IGxvZ2dpbmcgYW5kIHJlbGVhc2UgbG9nZ2luZy4KKyAKKyAgICAgICAgKiBwYWdlL0ZyYW1lLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjppbmplY3RVc2VyU2NyaXB0SW1tZWRpYXRlbHkp OgorICAgICAgICBUaGVyZSBpcyBubyBvcHRpb24gdG8gcmV0dXJuIGFuIGV4Y2VwdGlvbiBoZXJl LCBzbyB0aGlzIHBhdGNoIGFkZHMKKyAgICAgICAgY29uc29sZSBsb2dnaW5nIGFuZCByZWxlYXNl IGxvZ2dpbmcuCisKIDIwMjAtMDMtMjQgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNv bT4KIAogICAgICAgICBbV2ViIEFuaW1hdGlvbnNdIENsZWFuIHRpbWVsaW5lIGhlYWRlcnMgdXAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggM2ZiNmU0MzQ1MTg2MTQ1OGZkZjIzMjU0MDg2YTdiODlhYWY5YTk3OS4uMTg5 ZDk1MjhlODdlYjhiYmM4Y2ZkYjM0YjUzZDlmNjQ1OGYxODE5OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNyBAQAorMjAyMC0wMy0yNCAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxl LmNvbT4KKworICAgICAgICBBcHAtYm91bmQgZG9tYWluIGNoZWNrcyBzaG91bGQgcHJvdmlkZSBt b3JlIGRlYnVnZ2luZyBkZXRhaWxzIGF0IHNjcmlwdCBldmFsdWF0aW9uIHNpdGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk1MjEKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzYwODM3OTU0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJldHVybiBhbiBleGNlcHRpb24gYmVjYXVzZSB0aGF0IG9wdGlv biBpcyBhdmFpbGFibGUgaGVyZSwgYW5kIGFsc28gYWRkCisgICAgICAgIGNvbnNvbGUgYW5kIHJl bGVhc2UgbG9nZ2luZyBmb3IgY29uc2lzdGVuY3kgYWNyb3NzIGFwcC1ib3VuZCBkb21haW4gY2hl Y2tzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjpydW5KYXZhU2NyaXB0KToKKwogMjAyMC0wMy0yNCAgQ2hyaXMg RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGlu ZyByMjU4OTI4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0 Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9s bGVyLmNwcAppbmRleCBhZjM2OGI3NmI0NGQ4ODQwOTVhMmJjM2RhYWZiZTE0M2I5MDU5M2UwLi44 MWE3YzVmN2JiMWI4YjExNmIwNGQ2YmMwNTFiNjcyZjI0NzI4YzhlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcApAQCAtNDAsNiArNDAsNyBA QAogI2luY2x1ZGUgIkpTRG9jdW1lbnQuaCIKICNpbmNsdWRlICJKU0V4ZWNTdGF0ZS5oIgogI2lu Y2x1ZGUgIkxvYWRhYmxlTW9kdWxlU2NyaXB0LmgiCisjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2lu Y2x1ZGUgIk1vZHVsZUZldGNoRmFpbHVyZUtpbmQuaCIKICNpbmNsdWRlICJNb2R1bGVGZXRjaFBh cmFtZXRlcnMuaCIKICNpbmNsdWRlICJOUF9qc29iamVjdC5oIgpAQCAtNzcsNiArNzgsOCBAQAog I2luY2x1ZGUgPHd0Zi9UaHJlYWRpbmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9UZXh0UG9zaXRp b24uaD4KIAorI2RlZmluZSBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKGNoYW5uZWwsIGZt dCwgLi4uKSBSRUxFQVNFX0xPR19FUlJPUl9JRihtX2ZyYW1lLmlzQWx3YXlzT25Mb2dnaW5nQWxs b3dlZCgpLCBjaGFubmVsLCAiJXAgLSBTY3JpcHRDb250cm9sbGVyOjoiIGZtdCwgdGhpcywgIyNf X1ZBX0FSR1NfXykKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogdXNpbmcgbmFtZXNwYWNlIEpTQzsK IApAQCAtNTc2LDggKzU3OSwxMiBAQCBKU0M6OkpTVmFsdWUgU2NyaXB0Q29udHJvbGxlcjo6ZXhl Y3V0ZVNjcmlwdEluV29ybGRJZ25vcmluZ0V4Y2VwdGlvbihET01XcmFwcGVyVwogCiBWYWx1ZU9y RXhjZXB0aW9uIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVTY3JpcHRJbldvcmxkKERPTVdyYXBw ZXJXb3JsZCYgd29ybGQsIFJ1bkphdmFTY3JpcHRQYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKIHsK LSAgICBpZiAobV9mcmFtZS5sb2FkZXIoKS5jbGllbnQoKS5oYXNOYXZpZ2F0ZWRBd2F5RnJvbUFw cEJvdW5kRG9tYWluKCkgJiYgIW1fZnJhbWUubG9hZGVyKCkuY2xpZW50KCkubmVlZHNJbkFwcEJy b3dzZXJQcml2YWN5UXVpcmtzKCkpCi0gICAgICAgIHJldHVybiBqc051bGwoKTsKKyAgICBpZiAo bV9mcmFtZS5sb2FkZXIoKS5jbGllbnQoKS5oYXNOYXZpZ2F0ZWRBd2F5RnJvbUFwcEJvdW5kRG9t YWluKCkgJiYgIW1fZnJhbWUubG9hZGVyKCkuY2xpZW50KCkubmVlZHNJbkFwcEJyb3dzZXJQcml2 YWN5UXVpcmtzKCkpIHsKKyAgICAgICAgaWYgKGF1dG8qIGRvY3VtZW50ID0gbV9mcmFtZS5kb2N1 bWVudCgpKQorICAgICAgICAgICAgZG9jdW1lbnQtPmFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VT b3VyY2U6OlNlY3VyaXR5LCBNZXNzYWdlTGV2ZWw6Oldhcm5pbmcsICJJZ25vcmluZyB1c2VyIHNj cmlwdCBpbmplY3Rpb24gZm9yIG5vbi1hcHAgYm91bmQgZG9tYWluLiIpOworICAgICAgICBSRUxF QVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKExvYWRpbmcsICJleGVjdXRlU2NyaXB0SW5Xb3JsZDog SWdub3JpbmcgdXNlciBzY3JpcHQgaW5qZWN0aW9uIGZvciBub24gYXBwLWJvdW5kIGRvbWFpbiIp OworICAgICAgICByZXR1cm4gbWFrZVVuZXhwZWN0ZWQoRXhjZXB0aW9uRGV0YWlscyB7ICJJZ25v cmluZyB1c2VyIHNjcmlwdCBpbmplY3Rpb24gZm9yIG5vbi1hcHAgYm91bmQgZG9tYWluIl9zIH0p OworICAgIH0KIAogICAgIFVzZXJHZXN0dXJlSW5kaWNhdG9yIGdlc3R1cmVJbmRpY2F0b3IocGFy YW1ldGVycy5mb3JjZVVzZXJHZXN0dXJlID09IEZvcmNlVXNlckdlc3R1cmU6OlllcyA/IE9wdGlv bmFsPFByb2Nlc3NpbmdVc2VyR2VzdHVyZVN0YXRlPihQcm9jZXNzaW5nVXNlckdlc3R1cmUpIDog V1RGOjpudWxsb3B0KTsKIApAQCAtODYwLDMgKzg2Nyw1IEBAIGJvb2wgU2NyaXB0Q29udHJvbGxl cjo6ZXhlY3V0ZUlmSmF2YVNjcmlwdFVSTChjb25zdCBVUkwmIHVybCwgUmVmUHRyPFNlY3VyaXR5 T3JpCiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKKworI3VuZGVmIFJFTEVBU0VfTE9HX0VS Uk9SX0lGX0FMTE9XRUQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKaW5kZXggZWNhNTE0MWM5MmI5MDkzOWUy NDk5NzVlYWZhOTNmMGU2NzZhYjcwNS4uNTE5ZjNlZmJmNzNkNTNkNGRmNDYyMGQ5OWVmOTA3MmMz OWJmMmM4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKQEAgLTEwNyw2ICsxMDcsOCBAQAogI2luY2x1 ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVy Lmg+CiAKKyNkZWZpbmUgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChjaGFubmVsLCBmbXQs IC4uLikgUkVMRUFTRV9MT0dfRVJST1JfSUYoaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIGNo YW5uZWwsICIlcCAtIEZyYW1lOjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FSR1NfXykKKwogbmFtZXNw YWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwpAQCAtNjI0LDggKzYy NiwxMiBAQCB2b2lkIEZyYW1lOjppbmplY3RVc2VyU2NyaXB0cyhVc2VyU2NyaXB0SW5qZWN0aW9u VGltZSBpbmplY3Rpb25UaW1lKQogCiB2b2lkIEZyYW1lOjppbmplY3RVc2VyU2NyaXB0SW1tZWRp YXRlbHkoRE9NV3JhcHBlcldvcmxkJiB3b3JsZCwgY29uc3QgVXNlclNjcmlwdCYgc2NyaXB0KQog ewotICAgIGlmIChsb2FkZXIoKS5jbGllbnQoKS5oYXNOYXZpZ2F0ZWRBd2F5RnJvbUFwcEJvdW5k RG9tYWluKCkgJiYgIWxvYWRlcigpLmNsaWVudCgpLm5lZWRzSW5BcHBCcm93c2VyUHJpdmFjeVF1 aXJrcygpKQorICAgIGlmIChsb2FkZXIoKS5jbGllbnQoKS5oYXNOYXZpZ2F0ZWRBd2F5RnJvbUFw cEJvdW5kRG9tYWluKCkgJiYgIWxvYWRlcigpLmNsaWVudCgpLm5lZWRzSW5BcHBCcm93c2VyUHJp dmFjeVF1aXJrcygpKSB7CisgICAgICAgIGlmIChhdXRvKiBkb2N1bWVudCA9IHRoaXMtPmRvY3Vt ZW50KCkpCisgICAgICAgICAgICBkb2N1bWVudC0+YWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNv dXJjZTo6U2VjdXJpdHksIE1lc3NhZ2VMZXZlbDo6V2FybmluZywgIklnbm9yaW5nIHVzZXIgc2Ny aXB0IGluamVjdGlvbiBmb3Igbm9uLWFwcCBib3VuZCBkb21haW4uIl9zKTsKKyAgICAgICAgUkVM RUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChMb2FkaW5nLCAiaW5qZWN0VXNlclNjcmlwdEltbWVk aWF0ZWx5OiBJZ25vcmluZyB1c2VyIHNjcmlwdCBpbmplY3Rpb24gZm9yIG5vbiBhcHAtYm91bmQg ZG9tYWluIik7CiAgICAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBhdXRvKiBkb2N1bWVudCA9 IHRoaXMtPmRvY3VtZW50KCk7CiAgICAgaWYgKCFkb2N1bWVudCkKQEAgLTEwNDcsMyArMTA1Myw1 IEBAIHZvaWQgRnJhbWU6OnNlbGZPbmx5RGVyZWYoKQogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCisKKyN1bmRlZiBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VECmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDFjZDBiMzBjNTg4ZjRiNDQ1 NTUyNGMxMjQ1ZGY0NDg4MzlhOTdiMjYuLjAzMjg2N2JkYTc1YTQwODE4ZTEwMjA2YmRlNzg5YTE5 MzZhOGNkZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCkBAIC0zNDQ4LDYgKzM0NDgsOSBAQCB2b2lkIFdlYlBhZ2U6OnJ1bkphdmFTY3JpcHQoV2Vi RnJhbWUqIGZyYW1lLCBSdW5KYXZhU2NyaXB0UGFyYW1ldGVycyYmIHBhcmFtZXRlcgogICAgIAog ICAgIGlmIChoYXNOYXZpZ2F0ZWRBd2F5RnJvbUFwcEJvdW5kRG9tYWluKCkgPT0gTmF2aWdhdGVk QXdheUZyb21BcHBCb3VuZERvbWFpbjo6WWVzICYmICFtX25lZWRzSW5BcHBCcm93c2VyUHJpdmFj eVF1aXJrcykgewogICAgICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNjcmlwdFZh bHVlQ2FsbGJhY2soeyB9LCBFeGNlcHRpb25EZXRhaWxzIHsgIlVuYWJsZSB0byBleGVjdXRlIEph dmFTY3JpcHQiX3MgfSwgY2FsbGJhY2tJRCkpOworICAgICAgICBpZiAoYXV0byogZG9jdW1lbnQg PSBtX3BhZ2UtPm1haW5GcmFtZSgpLmRvY3VtZW50KCkpCisgICAgICAgICAgICBkb2N1bWVudC0+ YWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6U2VjdXJpdHksIE1lc3NhZ2VMZXZlbDo6 V2FybmluZywgIklnbm9yaW5nIHVzZXIgc2NyaXB0IGluamVjdGlvbiBmb3Igbm9uLWFwcCBib3Vu ZCBkb21haW4uIik7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoTG9hZGlu ZywgInJ1bkphdmFTY3JpcHQ6IElnbm9yaW5nIHVzZXIgc2NyaXB0IGluamVjdGlvbiBmb3Igbm9u IGFwcC1ib3VuZCBkb21haW4iKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAo=