165531 2016-12-07 10:24:52 -0800 [CSP] Policy of window opener not applied to about:blank window 2017-05-12 15:08:37 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 172038 1 dbates dbates ap bfulgham cdumez commit-queue esprehn+autocc japhet kangil.han mkwst webkit-bug-importer wilander oldest_to_newest 1257264 0 dbates 2016-12-07 10:24:52 -0800 about:blank windows should inherit the content security policy of their opener document. 1257265 1 dbates 2016-12-07 10:25:29 -0800 <rdar://problem/29426639> 1257268 2 296398 dbates 2016-12-07 10:35:33 -0800 Created attachment 296398 Patch and layout test I chose to remove the upgrade-insecure-requests comment from Document::initContentSecurityPolicy() because I did not see the value in it and its second to last sentence was inaccurate with respect to this function. Let me know if there is value in adding a comment to Document::initContentSecurityPolicy() about how we handle upgrade insecure requests. We should look to centralize the upgrade-insecure-requests inheritance logic for child frames and child windows. Currently this logic is dispersed across Document::initSecurityContext(), Document::initContentSecurityPolicy(), and DocumentWriter::begin(). I suggest we do this in a separate bug. 1258147 3 296398 bfulgham 2016-12-09 09:24:02 -0800 Comment on attachment 296398 Patch and layout test Looks good. r=me. 1258148 4 296398 dbates 2016-12-09 09:27:56 -0800 Comment on attachment 296398 Patch and layout test Clearing flags on attachment: 296398 Committed r209608: <http://trac.webkit.org/changeset/209608> 1258149 5 dbates 2016-12-09 09:28:01 -0800 All reviewed patches have been landed. Closing bug. 296398 2016-12-07 10:35:33 -0800 2016-12-09 09:27:56 -0800 Patch and layout test bug-165531-20161207103454.patch text/plain 12087 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5MzY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQ4M2Q3ZDQ0YTBiZGRm YmIxZjdmYmM3Y2FkMWYyZjJhOWNjZDc1My4uOWQ3MTg3NDBmOTliODE3NTRiNDVlMTQyMjBkNGU3 ZDBiNGQ5N2E0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE2LTEyLTA3ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NQXSBQb2xpY3kgb2Yg d2luZG93IG9wZW5lciBub3QgYXBwbGllZCB0byBhYm91dDpibGFuayB3aW5kb3cKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTUzMQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMjk0MjY2Mzk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRml4ZXMgYW4gaXNzdWUgd2hlcmUgdGhlIGNvbnRlbnQgc2VjdXJp dHkgcG9saWN5IG9mIHRoZSBvcGVuZXIgZG9jdW1lbnQgd2FzIG5vdCBhcHBsaWVkIHRvCisgICAg ICAgIGFuIGFib3V0OmJsYW5rIHdpbmRvdy4KKworICAgICAgICBBbiBhYm91dDpibGFuayB3aW5k b3cgaW5oZXJpdHMgaXRzIHNlY3VyaXR5IG9yaWdpbiBmcm9tIGl0cyBvcGVuZXIgZG9jdW1lbnQu IEl0IHNob3VsZCBhbHNvCisgICAgICAgIGNvcHkgKGluaGVyaXQpIHRoZSBDb250ZW50U2VjdXJp dHlQb2xpY3kgZnJvbSBpdHMgb3BlbmVyIGRvY3VtZW50LiBXaGVuIGNvcHlpbmcgdGhlIENvbnRl bnRTZWN1cml0eVBvbGljeQorICAgICAgICBzdGF0ZSBmcm9tIHRoZSBvcGVuZXIgZG9jdW1lbnQg dG8gdGhlIGFib3V0OmJsYW5rIGRvY3VtZW50IHdlIG11c3QgdGFrZSBjYXJlIHRvIGF2b2lkIGNv cHlpbmcKKyAgICAgICAgYW55IHVwZ3JhZGUtaW5zZWN1cmUtcmVxdWVzdCBkaXJlY3RpdmUgYmVj YXVzZSBuZXcgd2luZG93cyBzaG91bGQgbm90IGluaGVyaXQgaXQgYnkgZGVmaW5pdGlvbi4KKyAg ICAgICAgV2l0aCByZXNwZWN0IHRvIHVwZ3JhZGUtaW5zZWN1cmUtcmVxdWVzdHMsIG5ldyB3aW5k b3dzIHNob3VsZCBvbmx5IGluaGVyaXQgdGhlIGluc2VjdXJlIG5hdmlnYXRpb24gc2V0CisgICAg ICAgIGZyb20gdGhlaXIgb3BlbmVyIGRvY3VtZW50LgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVz dHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2ltYWdlLWJsb2NrZWQtaW4tYWJvdXQt Ymxhbmstd2luZG93Lmh0bWwKKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpEb2N1bWVudDo6aW5pdENvbnRlbnRTZWN1cml0eVBvbGljeSk6IENvcHkgdGhl IENvbnRlbnRTZWN1cml0eVBvbGljeSBzdGF0ZSBmcm9tIHRoZQorICAgICAgICBvd25lciBkb2N1 bWVudCB0byB0aGlzIGRvY3VtZW50IHdoZW4gaXQgaW5oZXJpdHMgaXRzIHNlY3VyaXR5IG9yaWdp biBmcm9tIGl0cyBvd25lci4gQW4gYWJvdXQ6YmxhbmsKKyAgICAgICAgd2luZG93IGlzIG9uZSBl eGFtcGxlIG9mIGEgZG9jdW1lbnQgdGhhdCBpbmhlcml0cyBpdHMgc2VjdXJpdHkgb3JpZ2luIGZy b20gaXRzIG93bmVyLgorICAgICAgICAqIGxvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclRocmVhZGFibGVMb2FkZXI6Ok1haW5UaHJlYWRC cmlkZ2U6Ok1haW5UaHJlYWRCcmlkZ2UpOiBDYWxsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Y29w eVVwZ3JhZGVJbnNlY3VyZVJlcXVlc3RTdGF0ZUZyb20oKQorICAgICAgICB0byBjb3B5IHRoZSB1 cGdyYWRlIGluc2VjdXJlIHJlcXVlc3RzIHN0YXRlIGZyb20gdGhlIG93bmVyIGRvY3VtZW50IHRv IHRoZSB3b3JrZXIgbm93IHRoYXQKKyAgICAgICAgQ29udGVudFNlY3VyaXR5UG9saWN5Ojpjb3B5 U3RhdGVGcm9tKCkgbm8gbG9uZ2VyIGRvZXMgdGhpcy4KKyAgICAgICAgKiBwYWdlL2NzcC9Db250 ZW50U2VjdXJpdHlQb2xpY3kuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5 UG9saWN5Ojpjb3B5U3RhdGVGcm9tKTogRG8gbm90IGNvcHkgdGhlIHVwZ3JhZGUgaW5zZWN1cmUg cmVxdWVzdCBzdGF0ZS4KKyAgICAgICAgQ2FsbGVycyBhcmUgbm93IHJlc3BvbnNpYmxlIGZvciBj YWxsaW5nIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Y29weVVwZ3JhZGVJbnNlY3VyZVJlcXVlc3RT dGF0ZUZyb20oKQorICAgICAgICB0byBjb3B5IHRoaXMgc3RhdGUuCisgICAgICAgICogcGFnZS9j c3AvQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0OjpwYXJzZSk6IElnbm9yZSBk aXJlY3RpdmUgdXBncmFkZS1pbnNlY3VyZS1yZXF1ZXN0cyB3aGVuCisgICAgICAgIGluaGVyaXRp bmcgQ29udGVudFNlY3VyaXR5UG9saWN5IHN0YXRlIGFzIHRoaXMgZGlyZWN0aXZlIGFzIHRoZSBV cGdyYWRlIEluc2VjdXJlIFJlcXVlc3RzIGZlYXR1cmUgaGFzCisgICAgICAgIGl0cyBvd24gaW5o ZXJpdGFuY2Ugc2VtYW50aWNzIHRoYXQgZGlmZmVyIGZyb20gdGhlIHNlbWFudGljcyBvZiBjb3B5 aW5nIGEgQ29udGVudFNlY3VyaXR5UG9saWN5IG9iamVjdC4KKyAgICAgICAgKiB4bWwvWFNMVFBy b2Nlc3Nvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYU0xUUHJvY2Vzc29yOjpjcmVhdGVEb2N1 bWVudEZyb21Tb3VyY2UpOiBDYWxsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Y29weVVwZ3JhZGVJ bnNlY3VyZVJlcXVlc3RTdGF0ZUZyb20oKQorICAgICAgICB0byBjb3B5IHRoZSB1cGdyYWRlIGlu c2VjdXJlIHJlcXVlc3RzIHN0YXRlIGZyb20gdGhlIG9yaWdpbmFsIGRvY3VtZW50IHRvIHRoZSB0 cmFuc2Zvcm1lZCBkb2N1bWVudCBub3cKKyAgICAgICAgdGhhdCBDb250ZW50U2VjdXJpdHlQb2xp Y3k6OmNvcHlTdGF0ZUZyb20oKSBubyBsb25nZXIgZG9lcyB0aGlzLgorCiAyMDE2LTEyLTA2ICBE YW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgU3Ry aWN0IE1peGVkIENvbnRlbnQgQ2hlY2tpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGQw YzExZmY5N2FkOGRmZmYzZGEyYWFhYzE4YTU2MzRiOTBlOTBjZjcuLjBlZTgxNjdlOWFmY2IxMDk0 Zjk1M2U2NTVjYzBiMTNkOWY0YWUwNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNTIw NywxOSArNTIwNywxOSBAQCB2b2lkIERvY3VtZW50Ojppbml0U2VjdXJpdHlDb250ZXh0KCkKIAog dm9pZCBEb2N1bWVudDo6aW5pdENvbnRlbnRTZWN1cml0eVBvbGljeSgpCiB7Ci0gICAgaWYgKCFt X2ZyYW1lLT50cmVlKCkucGFyZW50KCkpCisgICAgRnJhbWUqIHBhcmVudEZyYW1lID0gbV9mcmFt ZS0+dHJlZSgpLnBhcmVudCgpOworICAgIGlmIChwYXJlbnRGcmFtZSkKKyAgICAgICAgY29udGVu dFNlY3VyaXR5UG9saWN5KCktPmNvcHlVcGdyYWRlSW5zZWN1cmVSZXF1ZXN0U3RhdGVGcm9tKCpw YXJlbnRGcmFtZS0+ZG9jdW1lbnQoKS0+Y29udGVudFNlY3VyaXR5UG9saWN5KCkpOworCisgICAg aWYgKCFzaG91bGRJbmhlcml0U2VjdXJpdHlPcmlnaW5Gcm9tT3duZXIobV91cmwpICYmICFpc1Bs dWdpbkRvY3VtZW50KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICghc2hvdWxkSW5oZXJp dFNlY3VyaXR5T3JpZ2luRnJvbU93bmVyKG1fdXJsKSAmJiAhaXNQbHVnaW5Eb2N1bWVudCgpKSB7 Ci0gICAgICAgIC8vIFBlciA8aHR0cDovL3d3dy53My5vcmcvVFIvdXBncmFkZS1pbnNlY3VyZS1y ZXF1ZXN0cy8+LCB3ZSBuZWVkIHRvIHJldGFpbiBhbiBvbmdvaW5nIHNldCBvZiB1cGdyYWRlZAot ICAgICAgICAvLyByZXF1ZXN0cyBpbiBuZXcgbmF2aWdhdGlvbiBjb250ZXh0cy4gQWx0aG91Z2gg dGhpcyBpbmZvcm1hdGlvbiBpcyBwcmVzZW50IHdoZW4gd2UgY29uc3RydWN0IHRoZQotICAgICAg ICAvLyBEb2N1bWVudCBvYmplY3QsIGl0IGlzIGRpc2NhcmQgaW4gdGhlIHN1YnNlcXVlbnQgJ2Ns ZWFyJyBzdGF0ZW1lbnRzIGJlbG93LiBTbywgd2UgbXVzdCBjYXB0dXJlIGl0Ci0gICAgICAgIEFT U0VSVChtX2ZyYW1lLT50cmVlKCkucGFyZW50KCktPmRvY3VtZW50KCkpOwotICAgICAgICBjb250 ZW50U2VjdXJpdHlQb2xpY3koKS0+Y29weVVwZ3JhZGVJbnNlY3VyZVJlcXVlc3RTdGF0ZUZyb20o Km1fZnJhbWUtPnRyZWUoKS5wYXJlbnQoKS0+ZG9jdW1lbnQoKS0+Y29udGVudFNlY3VyaXR5UG9s aWN5KCkpOworICAgIEZyYW1lKiBvd25lckZyYW1lID0gcGFyZW50RnJhbWU7CisgICAgaWYgKCFv d25lckZyYW1lKQorICAgICAgICBvd25lckZyYW1lID0gbV9mcmFtZS0+bG9hZGVyKCkub3BlbmVy KCk7CisgICAgaWYgKCFvd25lckZyYW1lKQogICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIAot ICAgIGNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5jb3B5U3RhdGVGcm9tKG1fZnJhbWUtPnRyZWUo KS5wYXJlbnQoKS0+ZG9jdW1lbnQoKS0+Y29udGVudFNlY3VyaXR5UG9saWN5KCkpOworICAgIGNv bnRlbnRTZWN1cml0eVBvbGljeSgpLT5jb3B5U3RhdGVGcm9tKG93bmVyRnJhbWUtPmRvY3VtZW50 KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpKTsgLy8gRG9lcyBub3QgY29weSBVcGdyYWRlIElu c2VjdXJlIFJlcXVlc3RzIHN0YXRlLgogfQogCiBib29sIERvY3VtZW50Ojppc0NvbnRleHRUaHJl YWQoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1dvcmtlclRocmVh ZGFibGVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1dvcmtlclRocmVhZGFibGVM b2FkZXIuY3BwCmluZGV4IDE0NTVhMmUzOTIyYWQxMzMwOTllYTMyOTQwYTVlZTFiZWZiNDg0MzUu Ljk5OGFmNThhNTZjYWRlODc0ZGI2YjlkMzAzODc5NjA5OGIxNGQ3NmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvV29ya2VyVGhyZWFkYWJsZUxvYWRlci5jcHAKQEAgLTExMSw2ICsx MTEsNyBAQCBXb3JrZXJUaHJlYWRhYmxlTG9hZGVyOjpNYWluVGhyZWFkQnJpZGdlOjpNYWluVGhy ZWFkQnJpZGdlKFRocmVhZGFibGVMb2FkZXJDbGllbgogICAgIGF1dG8gc2VjdXJpdHlPcmlnaW5D b3B5ID0gc2VjdXJpdHlPcmlnaW4tPmlzb2xhdGVkQ29weSgpOwogICAgIGF1dG8gY29udGVudFNl Y3VyaXR5UG9saWN5Q29weSA9IHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudFNlY3VyaXR5UG9saWN5 PihzZWN1cml0eU9yaWdpbkNvcHkpOwogICAgIGNvbnRlbnRTZWN1cml0eVBvbGljeUNvcHktPmNv cHlTdGF0ZUZyb20oY29udGVudFNlY3VyaXR5UG9saWN5KTsKKyAgICBjb250ZW50U2VjdXJpdHlQ b2xpY3lDb3B5LT5jb3B5VXBncmFkZUluc2VjdXJlUmVxdWVzdFN0YXRlRnJvbSgqY29udGVudFNl Y3VyaXR5UG9saWN5KTsKIAogICAgIGF1dG8gb3B0aW9uc0NvcHkgPSBzdGQ6Om1ha2VfdW5pcXVl PExvYWRlclRhc2tPcHRpb25zPihvcHRpb25zLCByZXF1ZXN0Lmh0dHBSZWZlcnJlcigpLmlzTnVs bCgpID8gb3V0Z29pbmdSZWZlcnJlciA6IHJlcXVlc3QuaHR0cFJlZmVycmVyKCksIFdURk1vdmUo c2VjdXJpdHlPcmlnaW5Db3B5KSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv Y3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9D b250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCmluZGV4IDJjMWYyMTk3ZDliZGExZmMwNTNiZTdhNDlh ZDZmNjBmNDQ1YTZkOTMuLmNiNzhkMDZhN2VmMTQzZjI2ZWU1NDk2MzliMjQ5NTY1YzQ2YWEwNjgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGlj eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5 LmNwcApAQCAtMTEzLDggKzExMyw2IEBAIHZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5Ojpjb3B5 U3RhdGVGcm9tKGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeSogb3RoZXIpCiAgICAgQVNTRVJU KG1fcG9saWNpZXMuaXNFbXB0eSgpKTsKICAgICBmb3IgKGF1dG8mIHBvbGljeSA6IG90aGVyLT5t X3BvbGljaWVzKQogICAgICAgICBkaWRSZWNlaXZlSGVhZGVyKHBvbGljeS0+aGVhZGVyKCksIHBv bGljeS0+aGVhZGVyVHlwZSgpLCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlBvbGljeUZyb206Oklu aGVyaXRlZCk7Ci0KLSAgICBjb3B5VXBncmFkZUluc2VjdXJlUmVxdWVzdFN0YXRlRnJvbSgqb3Ro ZXIpOwogfQogCiB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Y29weVVwZ3JhZGVJbnNlY3Vy ZVJlcXVlc3RTdGF0ZUZyb20oY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5JiBvdGhlcikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeURp cmVjdGl2ZUxpc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5 UG9saWN5RGlyZWN0aXZlTGlzdC5jcHAKaW5kZXggNzlkYjdjMjZlM2U4NjBkYTg5ZTczYmE4OTNl Yjk4ZWM4MjRlMWQ4Ni4uNGJkYzZmMWQyODk1YWUxMGE0OGQwZTIyN2M2OWJhODIxNWRiZmYzOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5 RGlyZWN0aXZlTGlzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNl Y3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdC5jcHAKQEAgLTMwNywxOSArMzA3LDE4IEBAIHZvaWQg Q29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdDo6cGFyc2UoY29uc3QgU3RyaW5nJiBw b2xpY3ksIENvbnRlbnRTZWN1CiAgICAgICAgIFN0cmluZyBuYW1lLCB2YWx1ZTsKICAgICAgICAg aWYgKHBhcnNlRGlyZWN0aXZlKGRpcmVjdGl2ZUJlZ2luLCBwb3NpdGlvbiwgbmFtZSwgdmFsdWUp KSB7CiAgICAgICAgICAgICBBU1NFUlQoIW5hbWUuaXNFbXB0eSgpKTsKLSAgICAgICAgICAgIHN3 aXRjaCAocG9saWN5RnJvbSkgewotICAgICAgICAgICAgY2FzZSBDb250ZW50U2VjdXJpdHlQb2xp Y3k6OlBvbGljeUZyb206OkhUVFBFcXVpdk1ldGE6CisgICAgICAgICAgICBpZiAocG9saWN5RnJv bSA9PSBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlBvbGljeUZyb206OkluaGVyaXRlZCkgeworICAg ICAgICAgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG5hbWUsIENvbnRlbnRTZWN1 cml0eVBvbGljeURpcmVjdGl2ZU5hbWVzOjp1cGdyYWRlSW5zZWN1cmVSZXF1ZXN0cykpCisgICAg ICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfSBlbHNlIGlmIChwb2xpY3lG cm9tID09IENvbnRlbnRTZWN1cml0eVBvbGljeTo6UG9saWN5RnJvbTo6SFRUUEVxdWl2TWV0YSkg ewogICAgICAgICAgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG5hbWUsIENvbnRl bnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZU5hbWVzOjpzYW5kYm94KQogICAgICAgICAgICAgICAg ICAgICB8fCBlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG5hbWUsIENvbnRlbnRTZWN1cml0eVBvbGlj eURpcmVjdGl2ZU5hbWVzOjpyZXBvcnRVUkkpCiAgICAgICAgICAgICAgICAgICAgIHx8IGVxdWFs SWdub3JpbmdBU0NJSUNhc2UobmFtZSwgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTmFt ZXM6OmZyYW1lQW5jZXN0b3JzKSkgewogICAgICAgICAgICAgICAgICAgICBtX3BvbGljeS5yZXBv cnRJbnZhbGlkRGlyZWN0aXZlSW5IVFRQRXF1aXZNZXRhKG5hbWUpOwotICAgICAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICAg ICAgfQotICAgICAgICAgICAgICAgIEZBTExUSFJPVUdIOwotICAgICAgICAgICAgZGVmYXVsdDoK LSAgICAgICAgICAgICAgICBhZGREaXJlY3RpdmUobmFtZSwgdmFsdWUpOwotICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICAgICAgfQorICAgICAgICAgICAgYWRkRGlyZWN0aXZlKG5hbWUs IHZhbHVlKTsKICAgICAgICAgfQogCiAgICAgICAgIEFTU0VSVChwb3NpdGlvbiA9PSBlbmQgfHwg KnBvc2l0aW9uID09ICc7Jyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFNMVFBy b2Nlc3Nvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWFNMVFByb2Nlc3Nvci5jcHAKaW5kZXgg NTNhYWNjZDFlMTgyNGZhNGRhYWYyOWY3MGEzMzFjMTM1YTViMDdlMi4uYzI4NWViNmRiOGZjZDU3 MGE2Y2U0MTEyOWM2NzViMTIwZjY2OWFmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUveG1s L1hTTFRQcm9jZXNzb3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YU0xUUHJvY2Vzc29y LmNwcApAQCAtOTQsNiArOTQsNyBAQCBSZWY8RG9jdW1lbnQ+IFhTTFRQcm9jZXNzb3I6OmNyZWF0 ZURvY3VtZW50RnJvbVNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZVN0cmluZwogICAgICAgICAg ICAgcmVzdWx0LT5zZXRGaXJzdFBhcnR5Rm9yQ29va2llcyhvbGREb2N1bWVudC0+Zmlyc3RQYXJ0 eUZvckNvb2tpZXMoKSk7CiAgICAgICAgICAgICByZXN1bHQtPnNldFN0cmljdE1peGVkQ29udGVu dE1vZGUob2xkRG9jdW1lbnQtPmlzU3RyaWN0TWl4ZWRDb250ZW50TW9kZSgpKTsKICAgICAgICAg ICAgIHJlc3VsdC0+Y29udGVudFNlY3VyaXR5UG9saWN5KCktPmNvcHlTdGF0ZUZyb20ob2xkRG9j dW1lbnQtPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpKTsKKyAgICAgICAgICAgIHJlc3VsdC0+Y29u dGVudFNlY3VyaXR5UG9saWN5KCktPmNvcHlVcGdyYWRlSW5zZWN1cmVSZXF1ZXN0U3RhdGVGcm9t KCpvbGREb2N1bWVudC0+Y29udGVudFNlY3VyaXR5UG9saWN5KCkpOwogICAgICAgICB9CiAKICAg ICAgICAgZnJhbWUtPnNldERvY3VtZW50KHJlc3VsdC5jb3B5UmVmKCkpOwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDgyNzBm NDAwNDlkYWNhMWFjZWY5NzRjYjhiY2Q1YzJjNmRjYmEwM2MuLmZlNzIxYjJlOTQwY2Y5NDY4NjEy ZGM4ZGY2ZWFhNmZmMmUyNGJiNTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxNi0xMi0wNyAg RGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CisKKyAgICAgICAgW0NTUF0gUG9saWN5 IG9mIHdpbmRvdyBvcGVuZXIgbm90IGFwcGxpZWQgdG8gYWJvdXQ6Ymxhbmsgd2luZG93CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjU1MzEKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzI5NDI2NjM5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIHRlc3QgdG8gZW5zdXJlIHRoYXQgYW4gYWJvdXQ6 Ymxhbmsgd2luZG93IGluaGVyaXRzIHRoZSBDU1AgcG9saWN5IG9mIGl0cworICAgICAgICBvcGVu ZXIgZG9jdW1lbnQuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1 cml0eVBvbGljeS9pbWFnZS1ibG9ja2VkLWluLWFib3V0LWJsYW5rLXdpbmRvdy1leHBlY3RlZC50 eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5 UG9saWN5L2ltYWdlLWJsb2NrZWQtaW4tYWJvdXQtYmxhbmstd2luZG93LWJsb2NrZWQuaHRtbDog QWRkZWQuCisKIDIwMTYtMTItMDYgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgog CiAgICAgICAgIEltcGxlbWVudCBTdHJpY3QgTWl4ZWQgQ29udGVudCBDaGVja2luZwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xp Y3kvaW1hZ2UtYmxvY2tlZC1pbi1hYm91dC1ibGFuay13aW5kb3ctZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW1hZ2Ut YmxvY2tlZC1pbi1hYm91dC1ibGFuay13aW5kb3ctZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmU2 Mjc4NGJkMjMzMGJjYmY2NGY5NGE0MGFlYjkzZWFlZjFmMzA5NDAKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9p bWFnZS1ibG9ja2VkLWluLWFib3V0LWJsYW5rLXdpbmRvdy1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSwzIEBACitDT05TT0xFIE1FU1NBR0U6IFJlZnVzZWQgdG8gbG9hZCBodHRwOi8vMTI3LjAuMC4x OjgwMDAvc2VjdXJpdHkvcmVzb3VyY2VzL2FiZS5wbmcgYmVjYXVzZSBpdCBkb2VzIG5vdCBhcHBl YXIgaW4gdGhlIGltZy1zcmMgZGlyZWN0aXZlIG9mIHRoZSBDb250ZW50IFNlY3VyaXR5IFBvbGlj eS4KK1BBU1MgZGlkIG5vdCBsb2FkIGltYWdlLgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9pbWFnZS1ibG9ja2VkLWlu LWFib3V0LWJsYW5rLXdpbmRvdy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0 eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW1hZ2UtYmxvY2tlZC1pbi1hYm91dC1ibGFuay13aW5k b3cuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi40YTA3MzJlYjIxNmM2YWI1MmZhYzc0MTlhMzMzNjRmYmFlNjMy NTJhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9j b250ZW50U2VjdXJpdHlQb2xpY3kvaW1hZ2UtYmxvY2tlZC1pbi1hYm91dC1ibGFuay13aW5kb3cu aHRtbApAQCAtMCwwICsxLDI3IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8 bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LVNlY3VyaXR5LVBvbGljeSIgY29udGVudD0ic2NyaXB0 LXNyYyAnc2VsZicgJ3Vuc2FmZS1pbmxpbmUnOyBpbWctc3JjICdub25lJyI+Cis8c2NyaXB0Pgor aWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7Cisg ICAgdGVzdFJ1bm5lci5zZXRDYW5PcGVuV2luZG93cygpOworICAgIHRlc3RSdW5uZXIuc2V0Q2xv c2VSZW1haW5pbmdXaW5kb3dzV2hlbkNvbXBsZXRlKHRydWUpOworICAgIHRlc3RSdW5uZXIud2Fp dFVudGlsRG9uZSgpOworfQorCit3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsIGZ1 bmN0aW9uIChtZXNzYWdlRXZlbnQpIHsKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29u c29sZSIpLnRleHRDb250ZW50ID0gbWVzc2FnZUV2ZW50LmRhdGEgKyAiXG4iOworICAgIGlmICh3 aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7Cit9LCBm YWxzZSk7Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHByZSBpZD0iY29uc29sZSI+PC9w cmU+Cis8c2NyaXB0PgorbGV0IGNoaWxkV2luZG93ID0gd2luZG93Lm9wZW4oImFib3V0OmJsYW5r Iik7CitjaGlsZFdpbmRvdy5kb2N1bWVudC53cml0ZShgPGltZyBzcmM9Ii4uL3Jlc291cmNlcy9h YmUucG5nIiBvbmVycm9yPSJ3aW5kb3cub3BlbmVyLnBvc3RNZXNzYWdlKCdQQVNTIGRpZCBub3Qg bG9hZCBpbWFnZS4nLCAnKicpIiBvbmxvYWQ9IndpbmRvdy5vcGVuZXIucG9zdE1lc3NhZ2UoJ0ZB SUwgZGlkIGxvYWQgaW1hZ2UuJywgJyonKSI+YCk7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRt bD4K