156935 2016-04-22 16:09:39 -0700 REGRESSION (r196012): Subresource may be blocked by Content Security Policy if it only matches 'self' 2016-06-01 23:52:52 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=157472 InRadar, Regression P2 Normal --- 153748 1 dbates dbates aestes bfulgham bugzilla commit-queue darin mkwst webkit-bug-importer wilander oldest_to_newest 1186484 0 dbates 2016-04-22 16:09:39 -0700 Using WebKit r196012 or later, perform the following: 1. Visit <http://www.blogger.com> and sign in. 2. Create a new blog if you do not already have one. 3. Create a new block post by clicking the button with the pen icon Blogger.com will navigate to the editor dashboard page and this page is almost entirely blank when it would otherwise display a document editor to create a new blog post. In the console you will see messages of the form: [Error] Refused to load https://www.blogger.com/static/v1/gwt/deferredjs/82FBD225E45CFA09FBE0B2E0F2D9D25B/13.cache.js because it does not appear in the script-src directive of the Content Security Policy. [Error] Refused to load https://www.blogger.com/static/v1/gwt/deferredjs/82FBD225E45CFA09FBE0B2E0F2D9D25B/13.cache.js?autoRetry=1 because it does not appear in the script-src directive of the Content Security Policy. [Error] Refused to load https://www.blogger.com/static/v1/gwt/deferredjs/82FBD225E45CFA09FBE0B2E0F2D9D25B/13.cache.js?autoRetry=2 because it does not appear in the script-src directive of the Content Security Policy. [Error] Refused to load https://www.blogger.com/static/v1/gwt/deferredjs/82FBD225E45CFA09FBE0B2E0F2D9D25B/13.cache.js?autoRetry=3 because it does not appear in the script-src directive of the Content Security Policy. 1186485 1 dbates 2016-04-22 16:10:03 -0700 <rdar://problem/25351286> 1186496 2 277113 dbates 2016-04-22 16:36:29 -0700 Created attachment 277113 Patch and Layout Tests Even though it is not strictly necessary to call ContentSecurityPolicy::updateSourceSelf() from ContentSecurityPolicy(ScriptExecutionContext&) because we will call this function when we apply the policy to the script execution context in ContentSecurityPolicy::applyPolicyToScriptExecutionContext() I thought to do so to keep symmetry with the ContentSecurityPolicy(const SecurityOrigin&, const Frame*) constructor and this code is unlikely to be sufficiently hot in a profile. Let me know if it is preferred to omit the call to ContentSecurityPolicy::updateSourceSelf() from ContentSecurityPolicy(ScriptExecutionContext&). 1186955 3 dbates 2016-04-25 09:27:11 -0700 Committed r200030: <http://trac.webkit.org/changeset/200030> 1198470 4 dbates 2016-06-01 23:52:52 -0700 *** Bug 157472 has been marked as a duplicate of this bug. *** 277113 2016-04-22 16:36:29 -0700 2016-04-22 17:17:00 -0700 Patch and Layout Tests Bug156935.patch text/plain 13470 dbates RnJvbSAyNjgzZTkzOWFmMTY4M2U2ZDViODIyODdiOWVkYjdkOGQ3ZjE5YzBmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW5pZWwgQmF0ZXMgPGRhYmF0ZXNAYXBwbGUuY29tPgpEYXRl OiBGcmksIDIyIEFwciAyMDE2IDE2OjI5OjMzIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gUkVHUkVT U0lPTiAocjE5NjAxMik6IFN1YnJlc291cmNlIG1heSBiZSBibG9ja2VkIGJ5IENvbnRlbnQKIFNl Y3VyaXR5IFBvbGljeSBpZiBpdCBvbmx5IG1hdGNoZXMgJ3NlbGYnCiBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2OTM1IDxyZGFyOi8vcHJvYmxlbS8yNTM1MTI4Nj4K ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKU291cmNlL1dlYkNvcmU6CgpGaXhlcyBhbiBp c3N1ZSB3aGVyZSBzdWJyZXNvdXJjZSBsb2FkIG1heSBiZSBibG9ja2VkIGJ5IHRoZSBDb250ZW50 IFNlY3VyaXR5IFBvbGljeSAoQ1NQKSBpZiBpdHMgVVJMIG9ubHkKbWF0Y2hlZCAnc2VsZicuIElu IHBhcnRpY3VsYXIsIHRoZSBsb2FkIHdvdWxkIGJlIGJsb2NrZWQgaWYgaW5pdGlhdGVkIGZyb20g YSBkb2N1bWVudCB0aGF0IGluaGVyaXRlZCB0aGUKb3JpZ2luIG9mIGl0cyBvd25lciBkb2N1bWVu dCAoZS5nLiB0aGUgZG9jdW1lbnQgY29udGFpbmVkIGluIDxpZnJhbWUgc3JjPSJhYm91dDpibGFu ayI+PC9pZnJhbWU+KS4KCkZvbGxvd2luZyByMTk2MDEyIHdlIGNvbXB1dGUgYW5kIGNhY2hlICdz ZWxmJyBhbmQgaXRzIHByb3RvY29sIG9uIGluc3RhbnRpYXRpb24gb2YgYSBDb250ZW50U2VjdXJp dHlQb2xpY3kKb2JqZWN0IGZvciB1c2Ugd2hlbiBtYXRjaGluZyBhIFVSTCBhZ2FpbnN0IGl0LiBU aGVzZSBjYWNoZWQgdmFsdWVzIGJlY29tZSBvdXQtb2YtZGF0ZSBpZiB0aGUgZG9jdW1lbnQKc3Vi c2VxdWVudGx5IGluaGVyaXRzIHRoZSBvcmlnaW4gb2YgaXRzIG93bmVyIGRvY3VtZW50LiBUaGVy ZWZvcmUgbWF0Y2hlcyBhZ2FpbnN0ICdzZWxmJyB3aWxsIGZhaWwgYW5kCkNTUCB3aWxsIGJsb2Nr IGEgbG9hZCBpZiBpdHMgbm90IG90aGVyd2lzZSBhbGxvd2VkIGJ5IHRoZSBwb2xpY3kuIFByZXZp b3VzbHkgd2Ugd291bGQgY29tcHV0ZSAnc2VsZicgd2hlbgpwYXJzaW5nIHRoZSBkZWZpbml0aW9u IG9mIGEgc291cmNlIGxpc3QgYW5kIGNvbXB1dGUgdGhlIHByb3RvY29sIGZvciAnc2VsZicgZWFj aCB0aW1lIHdlIHRyaWVkIHRvIG1hdGNoIGEKVVJMIGFnYWluc3QgJ3NlbGYnLiBTbywgJ3NlbGYn IHdvdWxkIGFsd2F5cyBiZSB1cC10by1kYXRlIHdpdGggcmVzcGVjdCB0byB0aGUgb3JpZ2luIG9m IHRoZSBkb2N1bWVudC4KClRlc3RzOiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0 eVBvbGljeS9pZnJhbWUtYmxhbmstdXJsLXByb2dyYW1tYXRpY2FsbHktYWRkLWV4dGVybmFsLXNj cmlwdC5odG1sCiAgICAgICBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGlj eS9pZnJhbWUtc3JjZG9jLWV4dGVybmFsLXNjcmlwdC5odG1sCgoqIHBhZ2UvY3NwL0NvbnRlbnRT ZWN1cml0eVBvbGljeS5jcHA6CihXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OkNvbnRl bnRTZWN1cml0eVBvbGljeSk6IEV4dHJhY3Qgb3V0IGxvZ2ljIGZvciBjb21wdXRpbmcgYW5kIGNh Y2hpbmcKJ3NlbGYnIGFuZCBpdHMgcHJvdG9jb2wgaW50byBDb250ZW50U2VjdXJpdHlQb2xpY3k6 OnVwZGF0ZVNvdXJjZVNlbGYoKSBhbmQgbWFrZSB1c2Ugb2YgdGhpcyBmdW5jdGlvbi4KKFdlYkNv cmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6dXBkYXRlU291cmNlU2VsZik6IENvbXB1dGVzIGFu ZCBjYWNoZXMgJ3NlbGYnIGFuZCBpdHMgcHJvdG9jb2wgd2l0aApyZXNwZWN0IHRvIHRoZSBzcGVj aWZpZWQgU2VjdXJpdHlPcmlnaW4uCihXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFw cGx5UG9saWN5VG9TY3JpcHRFeGVjdXRpb25Db250ZXh0KTogQ2FsbCBDb250ZW50U2VjdXJpdHlQ b2xpY3k6OnVwZGF0ZVNvdXJjZVNlbGYoKQp0byBlbnN1cmUgdGhhdCB3ZSBoYXZlIGFuIHVwLXRv LWRhdGUgcmVwcmVzZW50YXRpb24gZm9yICdzZWxmJyBhbmQgdGhlIHByb3RvY29sIG9mICdzZWxm JyB3aGljaCBjYW4KYmVjb21lIG91dC1vZi1kYXRlIGlmIHRoZSBkb2N1bWVudCBpbmhlcml0ZWQg dGhlIG9yaWdpbiBvZiBpdHMgb3duZXIgZG9jdW1lbnQuCiogcGFnZS9jc3AvQ29udGVudFNlY3Vy aXR5UG9saWN5Lmg6CgpMYXlvdXRUZXN0czoKCkFkZCB0ZXN0cyB0byBlbnN1cmUgdGhhdCB3ZSBt YXRjaCAnc2VsZicgY29ycmVjdGx5IGluIGFuIGlmcmFtZSB3aXRoIGFuIGFib3V0OmJsYW5rIGRv Y3VtZW50LgoKKiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9pZnJh bWUtYmxhbmstdXJsLXByb2dyYW1tYXRpY2FsbHktYWRkLWV4dGVybmFsLXNjcmlwdC1leHBlY3Rl ZC50eHQ6IEFkZGVkLgoqIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5 L2lmcmFtZS1ibGFuay11cmwtcHJvZ3JhbW1hdGljYWxseS1hZGQtZXh0ZXJuYWwtc2NyaXB0Lmh0 bWw6IEFkZGVkLgoqIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lm cmFtZS1zcmNkb2MtZXh0ZXJuYWwtc2NyaXB0LWV4cGVjdGVkLnR4dDogQWRkZWQuCiogaHR0cC90 ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaWZyYW1lLXNyY2RvYy1leHRlcm5h bC1zY3JpcHQuaHRtbDogQWRkZWQuCi0tLQogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfCAxNSArKysrKysrKysrCiAuLi5vZ3JhbW1hdGljYWxseS1h ZGQtZXh0ZXJuYWwtc2NyaXB0LWV4cGVjdGVkLnR4dCB8ICA3ICsrKysrCiAuLi5rLXVybC1wcm9n cmFtbWF0aWNhbGx5LWFkZC1leHRlcm5hbC1zY3JpcHQuaHRtbCB8IDI1ICsrKysrKysrKysrKysr KysrCiAuLi4vaWZyYW1lLXNyY2RvYy1leHRlcm5hbC1zY3JpcHQtZXhwZWN0ZWQudHh0ICAgICB8 ICAyICsrCiAuLi4vaWZyYW1lLXNyY2RvYy1leHRlcm5hbC1zY3JpcHQuaHRtbCAgICAgICAgICAg ICB8IDEzICsrKysrKysrKwogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAzMiArKysrKysrKysrKysrKysrKysrKysrCiBTb3VyY2UvV2ViQ29yZS9w YWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwICB8IDIwICsrKysrKysrKystLS0tCiBT b3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaCAgICB8ICAxICsK IDggZmlsZXMgY2hhbmdlZCwgMTEwIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCiBjcmVh dGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2Vj dXJpdHlQb2xpY3kvaWZyYW1lLWJsYW5rLXVybC1wcm9ncmFtbWF0aWNhbGx5LWFkZC1leHRlcm5h bC1zY3JpcHQtZXhwZWN0ZWQudHh0CiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaWZyYW1lLWJsYW5rLXVybC1w cm9ncmFtbWF0aWNhbGx5LWFkZC1leHRlcm5hbC1zY3JpcHQuaHRtbAogY3JlYXRlIG1vZGUgMTAw NjQ0IExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5 L2lmcmFtZS1zcmNkb2MtZXh0ZXJuYWwtc2NyaXB0LWV4cGVjdGVkLnR4dAogY3JlYXRlIG1vZGUg MTAwNjQ0IExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9s aWN5L2lmcmFtZS1zcmNkb2MtZXh0ZXJuYWwtc2NyaXB0Lmh0bWwKCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNTY3ZjgxYi4u NjgxZTUyNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTA0LTIyICBEYW5pZWwgQmF0ZXMg IDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTk2MDEyKTogU3Vi cmVzb3VyY2UgbWF5IGJlIGJsb2NrZWQgYnkgQ29udGVudCBTZWN1cml0eSBQb2xpY3kgaWYgaXQg b25seSBtYXRjaGVzICdzZWxmJworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTU2OTM1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNTM1MTI4Nj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGVzdHMg dG8gZW5zdXJlIHRoYXQgd2UgbWF0Y2ggJ3NlbGYnIGNvcnJlY3RseSBpbiBhbiBpZnJhbWUgd2l0 aCBhbiBhYm91dDpibGFuayBkb2N1bWVudC4KKworICAgICAgICAqIGh0dHAvdGVzdHMvc2VjdXJp dHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lmcmFtZS1ibGFuay11cmwtcHJvZ3JhbW1hdGljYWxs eS1hZGQtZXh0ZXJuYWwtc2NyaXB0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0 cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaWZyYW1lLWJsYW5rLXVybC1w cm9ncmFtbWF0aWNhbGx5LWFkZC1leHRlcm5hbC1zY3JpcHQuaHRtbDogQWRkZWQuCisgICAgICAg ICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaWZyYW1lLXNyY2Rv Yy1leHRlcm5hbC1zY3JpcHQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rl c3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9pZnJhbWUtc3JjZG9jLWV4dGVybmFs LXNjcmlwdC5odG1sOiBBZGRlZC4KKwogMjAxNi0wNC0yMSAgUnlhbiBIYWRkYWQgIDxyeWFuaGFk ZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBTa2lwIDxhcmVhIHBpbmc+IHRlc3RzIG9uIGlvcy1z aW11bGF0b3IKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29u dGVudFNlY3VyaXR5UG9saWN5L2lmcmFtZS1ibGFuay11cmwtcHJvZ3JhbW1hdGljYWxseS1hZGQt ZXh0ZXJuYWwtc2NyaXB0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2Vj dXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lmcmFtZS1ibGFuay11cmwtcHJvZ3JhbW1hdGlj YWxseS1hZGQtZXh0ZXJuYWwtc2NyaXB0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwLi4yYzYyOWRmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaWZyYW1lLWJsYW5rLXVy bC1wcm9ncmFtbWF0aWNhbGx5LWFkZC1leHRlcm5hbC1zY3JpcHQtZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEsNyBAQAorQUxFUlQ6IFBBU1MKKworCistLS0tLS0tLQorRnJhbWU6ICdmcmFtZScKKy0t LS0tLS0tCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29u dGVudFNlY3VyaXR5UG9saWN5L2lmcmFtZS1ibGFuay11cmwtcHJvZ3JhbW1hdGljYWxseS1hZGQt ZXh0ZXJuYWwtc2NyaXB0Lmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2Nv bnRlbnRTZWN1cml0eVBvbGljeS9pZnJhbWUtYmxhbmstdXJsLXByb2dyYW1tYXRpY2FsbHktYWRk LWV4dGVybmFsLXNjcmlwdC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LmYzZWRiNjUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3Vy aXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9pZnJhbWUtYmxhbmstdXJsLXByb2dyYW1tYXRpY2Fs bHktYWRkLWV4dGVybmFsLXNjcmlwdC5odG1sCkBAIC0wLDAgKzEsMjUgQEAKKzwhRE9DVFlQRSBo dG1sPgorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtU2VjdXJpdHkt UG9saWN5IiBjb250ZW50PSJzY3JpcHQtc3JjICdzZWxmJyAndW5zYWZlLWlubGluZSciPgorPC9o ZWFkPgorPGJvZHk+Cis8aWZyYW1lIHNyYz0iYWJvdXQ6YmxhbmsiIGlkPSJmcmFtZSI+PC9pZnJh bWU+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgdGVzdFJ1bm5lci5k dW1wQXNUZXh0KCk7CisgICAgdGVzdFJ1bm5lci5kdW1wQ2hpbGRGcmFtZXNBc1RleHQoKTsKKyAg ICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKK30KKworZnVuY3Rpb24gYXBwZW5kVGVzdFNj cmlwdFRvRG9jdW1lbnQoY29udGVudERvY3VtZW50KQoreworICAgIHZhciBzY3JpcHQgPSBjb250 ZW50RG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic2NyaXB0Iik7CisgICAgc2NyaXB0LnNyYyA9ICJy ZXNvdXJjZXMvYWxlcnQtcGFzcy1hbmQtbm90aWZ5LWRvbmUuanMiOworICAgIGNvbnRlbnREb2N1 bWVudC5ib2R5LmFwcGVuZENoaWxkKHNjcmlwdCk7Cit9CisKK2FwcGVuZFRlc3RTY3JpcHRUb0Rv Y3VtZW50KGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJmcmFtZSIpLmNvbnRlbnREb2N1bWVudCk7 Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lmcmFtZS1zcmNkb2MtZXh0 ZXJuYWwtc2NyaXB0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJp dHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lmcmFtZS1zcmNkb2MtZXh0ZXJuYWwtc2NyaXB0LWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45YzcwMzIxCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50 U2VjdXJpdHlQb2xpY3kvaWZyYW1lLXNyY2RvYy1leHRlcm5hbC1zY3JpcHQtZXhwZWN0ZWQudHh0 CkBAIC0wLDAgKzEsMiBAQAorQUxFUlQ6IFBBU1MKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaWZyYW1lLXNyY2RvYy1l eHRlcm5hbC1zY3JpcHQuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29u dGVudFNlY3VyaXR5UG9saWN5L2lmcmFtZS1zcmNkb2MtZXh0ZXJuYWwtc2NyaXB0Lmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTE1NjE1ZAotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5 L2lmcmFtZS1zcmNkb2MtZXh0ZXJuYWwtc2NyaXB0Lmh0bWwKQEAgLTAsMCArMSwxMyBAQAorPCFE T0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KK2lmICh3aW5kb3cudGVzdFJ1 bm5lcikKKyAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKzwvc2NyaXB0PgorPG1ldGEgaHR0 cC1lcXVpdj0iQ29udGVudC1TZWN1cml0eS1Qb2xpY3kiIGNvbnRlbnQ9InNjcmlwdC1zcmMgJ3Nl bGYnIj4KKzwvaGVhZD4KKzxib2R5PgorPGlmcmFtZSBzcmNkb2M9JzxzY3JpcHQgc3JjPSJyZXNv dXJjZXMvYWxlcnQtcGFzcy5qcyI+PC9zY3JpcHQ+Jz48L2lmcmFtZT4KKzwvYm9keT4KKzwvaHRt bD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwppbmRleCAzMGMzMDRkLi45OGVlOWFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MzUgQEAKKzIwMTYtMDQtMjIgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisg ICAgICAgIFJFR1JFU1NJT04gKHIxOTYwMTIpOiBTdWJyZXNvdXJjZSBtYXkgYmUgYmxvY2tlZCBi eSBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBpZiBpdCBvbmx5IG1hdGNoZXMgJ3NlbGYnCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTY5MzUKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzI1MzUxMjg2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZpeGVzIGFuIGlzc3VlIHdoZXJlIHN1YnJlc291cmNlIGxv YWQgbWF5IGJlIGJsb2NrZWQgYnkgdGhlIENvbnRlbnQgU2VjdXJpdHkgUG9saWN5IChDU1ApIGlm IGl0cyBVUkwgb25seQorICAgICAgICBtYXRjaGVkICdzZWxmJy4gSW4gcGFydGljdWxhciwgdGhl IGxvYWQgd291bGQgYmUgYmxvY2tlZCBpZiBpbml0aWF0ZWQgZnJvbSBhIGRvY3VtZW50IHRoYXQg aW5oZXJpdGVkIHRoZQorICAgICAgICBvcmlnaW4gb2YgaXRzIG93bmVyIGRvY3VtZW50IChlLmcu IHRoZSBkb2N1bWVudCBjb250YWluZWQgaW4gPGlmcmFtZSBzcmM9ImFib3V0OmJsYW5rIj48L2lm cmFtZT4pLgorCisgICAgICAgIEZvbGxvd2luZyByMTk2MDEyIHdlIGNvbXB1dGUgYW5kIGNhY2hl ICdzZWxmJyBhbmQgaXRzIHByb3RvY29sIG9uIGluc3RhbnRpYXRpb24gb2YgYSBDb250ZW50U2Vj dXJpdHlQb2xpY3kKKyAgICAgICAgb2JqZWN0IGZvciB1c2Ugd2hlbiBtYXRjaGluZyBhIFVSTCBh Z2FpbnN0IGl0LiBUaGVzZSBjYWNoZWQgdmFsdWVzIGJlY29tZSBvdXQtb2YtZGF0ZSBpZiB0aGUg ZG9jdW1lbnQKKyAgICAgICAgc3Vic2VxdWVudGx5IGluaGVyaXRzIHRoZSBvcmlnaW4gb2YgaXRz IG93bmVyIGRvY3VtZW50LiBUaGVyZWZvcmUgbWF0Y2hlcyBhZ2FpbnN0ICdzZWxmJyB3aWxsIGZh aWwgYW5kCisgICAgICAgIENTUCB3aWxsIGJsb2NrIGEgbG9hZCBpZiBpdHMgbm90IG90aGVyd2lz ZSBhbGxvd2VkIGJ5IHRoZSBwb2xpY3kuIFByZXZpb3VzbHkgd2Ugd291bGQgY29tcHV0ZSAnc2Vs Zicgd2hlbgorICAgICAgICBwYXJzaW5nIHRoZSBkZWZpbml0aW9uIG9mIGEgc291cmNlIGxpc3Qg YW5kIGNvbXB1dGUgdGhlIHByb3RvY29sIGZvciAnc2VsZicgZWFjaCB0aW1lIHdlIHRyaWVkIHRv IG1hdGNoIGEKKyAgICAgICAgVVJMIGFnYWluc3QgJ3NlbGYnLiBTbywgJ3NlbGYnIHdvdWxkIGFs d2F5cyBiZSB1cC10by1kYXRlIHdpdGggcmVzcGVjdCB0byB0aGUgb3JpZ2luIG9mIHRoZSBkb2N1 bWVudC4KKworICAgICAgICBUZXN0czogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJp dHlQb2xpY3kvaWZyYW1lLWJsYW5rLXVybC1wcm9ncmFtbWF0aWNhbGx5LWFkZC1leHRlcm5hbC1z Y3JpcHQuaHRtbAorICAgICAgICAgICAgICAgaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2Vj dXJpdHlQb2xpY3kvaWZyYW1lLXNyY2RvYy1leHRlcm5hbC1zY3JpcHQuaHRtbAorCisgICAgICAg ICogcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6Q29udGVudFNlY3VyaXR5UG9saWN5KTogRXh0cmFjdCBv dXQgbG9naWMgZm9yIGNvbXB1dGluZyBhbmQgY2FjaGluZworICAgICAgICAnc2VsZicgYW5kIGl0 cyBwcm90b2NvbCBpbnRvIENvbnRlbnRTZWN1cml0eVBvbGljeTo6dXBkYXRlU291cmNlU2VsZigp IGFuZCBtYWtlIHVzZSBvZiB0aGlzIGZ1bmN0aW9uLgorICAgICAgICAoV2ViQ29yZTo6Q29udGVu dFNlY3VyaXR5UG9saWN5Ojp1cGRhdGVTb3VyY2VTZWxmKTogQ29tcHV0ZXMgYW5kIGNhY2hlcyAn c2VsZicgYW5kIGl0cyBwcm90b2NvbCB3aXRoCisgICAgICAgIHJlc3BlY3QgdG8gdGhlIHNwZWNp ZmllZCBTZWN1cml0eU9yaWdpbi4KKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBv bGljeTo6YXBwbHlQb2xpY3lUb1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQpOiBDYWxsIENvbnRlbnRT ZWN1cml0eVBvbGljeTo6dXBkYXRlU291cmNlU2VsZigpCisgICAgICAgIHRvIGVuc3VyZSB0aGF0 IHdlIGhhdmUgYW4gdXAtdG8tZGF0ZSByZXByZXNlbnRhdGlvbiBmb3IgJ3NlbGYnIGFuZCB0aGUg cHJvdG9jb2wgb2YgJ3NlbGYnIHdoaWNoIGNhbgorICAgICAgICBiZWNvbWUgb3V0LW9mLWRhdGUg aWYgdGhlIGRvY3VtZW50IGluaGVyaXRlZCB0aGUgb3JpZ2luIG9mIGl0cyBvd25lciBkb2N1bWVu dC4KKyAgICAgICAgKiBwYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaDoKKwogMjAxNi0w NC0yMSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHJl bGlhbmNlIG9uIFdlYkFWTWVkaWFTZWxlY3Rpb25PcHRpb25NYWMgZm9yIHRoZSAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCmluZGV4IGU5 NWQwNGUuLjk4ZWNiNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRl bnRTZWN1cml0eVBvbGljeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVu dFNlY3VyaXR5UG9saWN5LmNwcApAQCAtOTEsMTcgKzkxLDE0IEBAIENvbnRlbnRTZWN1cml0eVBv bGljeTo6Q29udGVudFNlY3VyaXR5UG9saWN5KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIHNjcmlw dEV4ZWN1CiAgICAgLCBtX3NhbmRib3hGbGFncyhTYW5kYm94Tm9uZSkKIHsKICAgICBBU1NFUlQo c2NyaXB0RXhlY3V0aW9uQ29udGV4dC5zZWN1cml0eU9yaWdpbigpKTsKLSAgICBhdXRvJiBzZWN1 cml0eU9yaWdpbiA9ICpzY3JpcHRFeGVjdXRpb25Db250ZXh0LnNlY3VyaXR5T3JpZ2luKCk7Ci0g ICAgbV9zZWxmU291cmNlUHJvdG9jb2wgPSBzZWN1cml0eU9yaWdpbi5wcm90b2NvbCgpOwotICAg IG1fc2VsZlNvdXJjZSA9IHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudFNlY3VyaXR5UG9saWN5U291 cmNlPigqdGhpcywgbV9zZWxmU291cmNlUHJvdG9jb2wsIHNlY3VyaXR5T3JpZ2luLmhvc3QoKSwg c2VjdXJpdHlPcmlnaW4ucG9ydCgpLCBlbXB0eVN0cmluZygpLCBmYWxzZSwgZmFsc2UpOworICAg IHVwZGF0ZVNvdXJjZVNlbGYoKnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQuc2VjdXJpdHlPcmlnaW4o KSk7CiB9CiAKIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Q29udGVudFNlY3VyaXR5UG9saWN5KGNv bnN0IFNlY3VyaXR5T3JpZ2luJiBzZWN1cml0eU9yaWdpbiwgY29uc3QgRnJhbWUqIGZyYW1lKQog ICAgIDogbV9mcmFtZShmcmFtZSkKICAgICAsIG1fc2FuZGJveEZsYWdzKFNhbmRib3hOb25lKQog ewotICAgIG1fc2VsZlNvdXJjZVByb3RvY29sID0gc2VjdXJpdHlPcmlnaW4ucHJvdG9jb2woKTsK LSAgICBtX3NlbGZTb3VyY2UgPSBzdGQ6Om1ha2VfdW5pcXVlPENvbnRlbnRTZWN1cml0eVBvbGlj eVNvdXJjZT4oKnRoaXMsIG1fc2VsZlNvdXJjZVByb3RvY29sLCBzZWN1cml0eU9yaWdpbi5ob3N0 KCksIHNlY3VyaXR5T3JpZ2luLnBvcnQoKSwgZW1wdHlTdHJpbmcoKSwgZmFsc2UsIGZhbHNlKTsK KyAgICB1cGRhdGVTb3VyY2VTZWxmKHNlY3VyaXR5T3JpZ2luKTsKIH0KIAogQ29udGVudFNlY3Vy aXR5UG9saWN5Ojp+Q29udGVudFNlY3VyaXR5UG9saWN5KCkKQEAgLTE3NSw5ICsxNzIsMjIgQEAg dm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmRpZFJlY2VpdmVIZWFkZXIoY29uc3QgU3RyaW5n JiBoZWFkZXIsIENvbnRlbnRTZWN1cmkKICAgICAgICAgYXBwbHlQb2xpY3lUb1NjcmlwdEV4ZWN1 dGlvbkNvbnRleHQoKTsKIH0KIAordm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OnVwZGF0ZVNv dXJjZVNlbGYoY29uc3QgU2VjdXJpdHlPcmlnaW4mIHNlY3VyaXR5T3JpZ2luKQoreworICAgIG1f c2VsZlNvdXJjZVByb3RvY29sID0gc2VjdXJpdHlPcmlnaW4ucHJvdG9jb2woKTsKKyAgICBtX3Nl bGZTb3VyY2UgPSBzdGQ6Om1ha2VfdW5pcXVlPENvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZT4o KnRoaXMsIG1fc2VsZlNvdXJjZVByb3RvY29sLCBzZWN1cml0eU9yaWdpbi5ob3N0KCksIHNlY3Vy aXR5T3JpZ2luLnBvcnQoKSwgZW1wdHlTdHJpbmcoKSwgZmFsc2UsIGZhbHNlKTsKK30KKwogdm9p ZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFwcGx5UG9saWN5VG9TY3JpcHRFeGVjdXRpb25Db250 ZXh0KCkKIHsKICAgICBBU1NFUlQobV9zY3JpcHRFeGVjdXRpb25Db250ZXh0KTsKKworICAgIC8v IFVwZGF0ZSBzb3VyY2Ugc2VsZiBhcyB0aGUgc2VjdXJpdHkgb3JpZ2luIG1heSBoYXZlIGNoYW5n ZWQgYmV0d2VlbiB0aGUgdGltZSB3ZSB3ZXJlIGNyZWF0ZWQgYW5kIG5vdy4KKyAgICAvLyBGb3Ig aW5zdGFuY2UsIHdlIG1heSBoYXZlIGJlZW4gaW5pdGlhbGx5IGNyZWF0ZWQgZm9yIGFuIGFib3V0 OmJsYW5rIGlmcmFtZSB0aGF0IGxhdGVyIGluaGVyaXRlZCB0aGUKKyAgICAvLyBzZWN1cml0eSBv cmlnaW4gb2YgaXRzIG93bmVyIGRvY3VtZW50LgorICAgIEFTU0VSVChtX3NjcmlwdEV4ZWN1dGlv bkNvbnRleHQtPnNlY3VyaXR5T3JpZ2luKCkpOworICAgIHVwZGF0ZVNvdXJjZVNlbGYoKm1fc2Ny aXB0RXhlY3V0aW9uQ29udGV4dC0+c2VjdXJpdHlPcmlnaW4oKSk7CisKICAgICBpZiAoIW1fbGFz dFBvbGljeUV2YWxEaXNhYmxlZEVycm9yTWVzc2FnZS5pc051bGwoKSkKICAgICAgICAgbV9zY3Jp cHRFeGVjdXRpb25Db250ZXh0LT5kaXNhYmxlRXZhbChtX2xhc3RQb2xpY3lFdmFsRGlzYWJsZWRF cnJvck1lc3NhZ2UpOwogICAgIGlmIChtX3NhbmRib3hGbGFncyAhPSBTYW5kYm94Tm9uZSAmJiBp czxEb2N1bWVudD4obV9zY3JpcHRFeGVjdXRpb25Db250ZXh0KSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oIGIvU291cmNlL1dlYkNv cmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmgKaW5kZXggMzg3MjZmNS4uOWE2OTM0 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9s aWN5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5 LmgKQEAgLTE0OSw2ICsxNDksNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgdm9pZCBsb2dU b0NvbnNvbGUoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBjb25zdCBTdHJpbmcmIGNvbnRleHRVUkwg PSBTdHJpbmcoKSwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSA9IFdURjo6 T3JkaW5hbE51bWJlcjo6YmVmb3JlRmlyc3QoKSwgSlNDOjpFeGVjU3RhdGUqID0gbnVsbHB0cikg Y29uc3Q7CisgICAgdm9pZCB1cGRhdGVTb3VyY2VTZWxmKGNvbnN0IFNlY3VyaXR5T3JpZ2luJik7 CiAgICAgdm9pZCBhcHBseVBvbGljeVRvU2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpOwogCiAgICAg dm9pZCBkaWRSZWNlaXZlSGVhZGVyKGNvbnN0IFN0cmluZyYsIENvbnRlbnRTZWN1cml0eVBvbGlj eUhlYWRlclR5cGUsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UG9saWN5RnJvbSk7Ci0tIAoyLjcu NCAoQXBwbGUgR2l0LTY2KQoK