109429 2013-02-11 06:59:20 -0800 CSP reports for blocked 'data:' URLs should report the scheme only. 2013-02-11 13:31:28 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 85558 1 mkwst mkwst abarth mkwst+watchlist webkit.review.bot oldest_to_newest 829640 0 mkwst 2013-02-11 06:59:20 -0800 https://dvcs.w3.org/hg/content-security-policy/rev/001dc8e8bcc3 changed the CSP 1.1 spec to require that blocked URLs that don't map well to the web (e.g. 'data:', 'javascript:', etc.) be stripped down to their scheme in violation reports. I'm not sure what the best way to do that actually is... The question sorta maps to 'KURL::isHierarchical()', but not really. The current patch uses 'KURL::canSetHostOrPort()' (which maps to 'isHierarchical()'), but there's likely a better way. Adam, what do you think? 829655 1 187566 mkwst 2013-02-11 07:13:03 -0800 Created attachment 187566 Patch 829866 2 187566 abarth 2013-02-11 10:38:08 -0800 Comment on attachment 187566 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187566&action=review > Source/WebCore/page/ContentSecurityPolicy.cpp:1634 > + if (blockedURL.canSetHostOrPort()) I'd use isHierarchical rather than canSetHostOrPort, but I think they're the same. 829910 3 mkwst 2013-02-11 11:18:07 -0800 (In reply to comment #2) > (From update of attachment 187566 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=187566&action=review > > > Source/WebCore/page/ContentSecurityPolicy.cpp:1634 > > + if (blockedURL.canSetHostOrPort()) > > I'd use isHierarchical rather than canSetHostOrPort, but I think they're the same. KURL::isHierarchical is private, which is why I used this (which, as you say, is simply an alias). Should I move it out into the public API? 829914 4 abarth 2013-02-11 11:20:11 -0800 SUre. 829936 5 187628 mkwst 2013-02-11 11:29:21 -0800 Created attachment 187628 Patch 829938 6 187628 mkwst 2013-02-11 11:30:25 -0800 Comment on attachment 187628 Patch Whoops. Carrying over Adam's r+. Meant to just throw this at the bots before CQing. 830054 7 187628 webkit.review.bot 2013-02-11 13:31:24 -0800 Comment on attachment 187628 Patch Clearing flags on attachment: 187628 Committed r142506: <http://trac.webkit.org/changeset/142506> 830055 8 webkit.review.bot 2013-02-11 13:31:28 -0800 All reviewed patches have been landed. Closing bug. 187566 2013-02-11 07:13:03 -0800 2013-02-11 11:29:16 -0800 Patch bug-109429-20130211160933.patch text/plain 5073 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNDYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDUyNGEwMTUyMjBjZDcw NzM1NDUyOGVkYmVmNDM4MGQyNmM5Njg0NC4uNDY2MGVjNDg5ODJlMGM4NWUxMGRhNGVkZTgxYTk2 NmJlMDI2MDkwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEzLTAyLTExICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgQ1NQIHJlcG9ydHMgZm9yIGJs b2NrZWQgJ2RhdGE6JyBVUkxzIHNob3VsZCByZXBvcnQgdGhlIHNjaGVtZSBvbmx5LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5NDI5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9kdmNzLncz Lm9yZy9oZy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9yZXYvMDAxZGM4ZThiY2MzIGNoYW5nZWQK KyAgICAgICAgdGhlIENTUCAxLjEgc3BlYyB0byByZXF1aXJlIHRoYXQgYmxvY2tlZCBVUkxzIHRo YXQgZG9uJ3QgcmVmZXIgdG8KKyAgICAgICAgZ2VuZXJhbGx5IHJlc29sdmFibGUgc2NoZW1lcyAo ZS5nLiAnZGF0YTonLCAnamF2YXNjcmlwdDonLCBldGMuKSBiZQorICAgICAgICBzdHJpcHBlZCBk b3duIHRvIHRoZWlyIHNjaGVtZSBpbiB2aW9sYXRpb24gcmVwb3J0cy4KKworICAgICAgICBUZXN0 OiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXBvcnQtYmxvY2tl ZC1kYXRhLXVyaS5odG1sCisKKyAgICAgICAgKiBwYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OnJlcG9ydFZpb2xh dGlvbik6CisgICAgICAgICAgICBJZiB0aGUgYmxvY2tlZCBVUkwgaXMgYSB3ZWItcmVzb2x2YWJs ZSBzY2hlbWUsIGFwcGx5IHRoZSBjdXJyZW50CisgICAgICAgICAgICBzdHJpcHBpbmcgbG9naWMg dG8gaXQsIG90aGVyd2lzZSwgc3RyaXAgaXQgdG8gdGhlIHNjaGVtZSBvbmx5LgorCisyMDEzLTAy LTExICBNaWtlIFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmFuZ2U6OmNv bGxhcHNlZCBjYWxsZXJzIHNob3VsZCBleHBsaWNpdGx5IEFTU0VSVF9OT19FWENFUFRJT04uCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDg5MjEKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCmluZGV4IDFm NTM1MTVkNTk4MjcwNTJkMmExY2EzNzliN2E3YWMzODY4NmQxMDguLmQ0MGE1MjQzOWI0Mzg4MmQ0 NTQ4NjcxZmM0ZTRlYWRiM2JhMTU2NWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv Q29udGVudFNlY3VyaXR5UG9saWN5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRl bnRTZWN1cml0eVBvbGljeS5jcHAKQEAgLTE2MzEsNyArMTYzMSwxMCBAQCB2b2lkIENvbnRlbnRT ZWN1cml0eVBvbGljeTo6cmVwb3J0VmlvbGF0aW9uKGNvbnN0IFN0cmluZyYgZGlyZWN0aXZlVGV4 dCwgY29uc3QgUwogICAgICAgICBjc3BSZXBvcnQtPnNldFN0cmluZygidmlvbGF0ZWQtZGlyZWN0 aXZlIiwgZGlyZWN0aXZlVGV4dCk7CiAgICAgY3NwUmVwb3J0LT5zZXRTdHJpbmcoIm9yaWdpbmFs LXBvbGljeSIsIGhlYWRlcik7CiAgICAgaWYgKGJsb2NrZWRVUkwuaXNWYWxpZCgpKQotICAgICAg ICBjc3BSZXBvcnQtPnNldFN0cmluZygiYmxvY2tlZC11cmkiLCBkb2N1bWVudC0+c2VjdXJpdHlP cmlnaW4oKS0+Y2FuUmVxdWVzdChibG9ja2VkVVJMKSA/IGJsb2NrZWRVUkwuc3RyaXBwZWRGb3JV c2VBc1JlZmVycmVyKCkgOiBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKGJsb2NrZWRVUkwpLT50b1N0 cmluZygpKTsKKyAgICAgICAgaWYgKGJsb2NrZWRVUkwuY2FuU2V0SG9zdE9yUG9ydCgpKQorICAg ICAgICAgICAgY3NwUmVwb3J0LT5zZXRTdHJpbmcoImJsb2NrZWQtdXJpIiwgZG9jdW1lbnQtPnNl Y3VyaXR5T3JpZ2luKCktPmNhblJlcXVlc3QoYmxvY2tlZFVSTCkgPyBibG9ja2VkVVJMLnN0cmlw cGVkRm9yVXNlQXNSZWZlcnJlcigpIDogU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShibG9ja2VkVVJM KS0+dG9TdHJpbmcoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGNzcFJlcG9ydC0+c2V0 U3RyaW5nKCJibG9ja2VkLXVyaSIsIGJsb2NrZWRVUkwucHJvdG9jb2woKSk7CiAgICAgZWxzZQog ICAgICAgICBjc3BSZXBvcnQtPnNldFN0cmluZygiYmxvY2tlZC11cmkiLCBTdHJpbmcoKSk7CiAK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiMTI1NDZkOTE4MjkwMjc1N2NjNWI5ZDJhY2U2MDY3MDVkZDEzOGU0Li4xYjAyOGIz NDAxYTlhZGFlMGM4MTFmZjVkZDE2NzVhY2EwOWRjNWZiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTMtMDItMTEgIE1pa2UgV2VzdCAgPG1rd3N0QGNocm9taXVtLm9yZz4KKworICAgICAgICBD U1AgcmVwb3J0cyBmb3IgYmxvY2tlZCAnZGF0YTonIFVSTHMgc2hvdWxkIHJlcG9ydCB0aGUgc2No ZW1lIG9ubHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDk0MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3JlcG9ydC1ibG9j a2VkLWRhdGEtdXJpLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9z ZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVwb3J0LWJsb2NrZWQtZGF0YS11cmkuaHRt bDogQWRkZWQuCisKIDIwMTMtMDItMTEgIEFsZXhlaSBGaWxpcHBvdiAgPGFscGhAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNwbGl0IFByb2ZpbGVyIGRvbWFpbiBpbiBw cm90b2NvbCBpbnRvIFByb2ZpbGVyIGFuZCBIZWFwUHJvZmlsZXIKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3JlcG9ydC1i bG9ja2VkLWRhdGEtdXJpLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2Vj dXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3JlcG9ydC1ibG9ja2VkLWRhdGEtdXJpLWV4cGVj dGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi4xMmJmYzJmNWFiYThmYmJkOGMwYmUyY2FjNWQ2YTgzOTFlMWQ1 Y2QxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9j b250ZW50U2VjdXJpdHlQb2xpY3kvcmVwb3J0LWJsb2NrZWQtZGF0YS11cmktZXhwZWN0ZWQudHh0 CkBAIC0wLDAgKzEsOCBAQAorQ09OU09MRSBNRVNTQUdFOiBSZWZ1c2VkIHRvIGxvYWQgdGhlIGlt YWdlICdkYXRhOmltYWdlL2dpZjtiYXNlNjQsUjBsR09EbGhBUUFCQUFBQUFDSDVCQUVLQUFFQUxB QUFBQUFCQUFFQUFBSUNUQUVBT3c9PScgYmVjYXVzZSBpdCB2aW9sYXRlcyB0aGUgZm9sbG93aW5n IENvbnRlbnQgU2VjdXJpdHkgUG9saWN5IGRpcmVjdGl2ZTogImltZy1zcmMgJ25vbmUnIi4KKwor Q1NQIHJlcG9ydCByZWNlaXZlZDoKK0NPTlRFTlRfVFlQRTogYXBwbGljYXRpb24vanNvbgorSFRU UF9SRUZFUkVSOiBodHRwOi8vMTI3LjAuMC4xOjgwMDAvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5 UG9saWN5L3JlcG9ydC1ibG9ja2VkLWRhdGEtdXJpLmh0bWwKK1JFUVVFU1RfTUVUSE9EOiBQT1NU Cis9PT0gUE9TVCBEQVRBID09PQoreyJjc3AtcmVwb3J0Ijp7ImRvY3VtZW50LXVyaSI6Imh0dHA6 Ly8xMjcuMC4wLjE6ODAwMC9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVwb3J0LWJs b2NrZWQtZGF0YS11cmkuaHRtbCIsInJlZmVycmVyIjoiIiwidmlvbGF0ZWQtZGlyZWN0aXZlIjoi aW1nLXNyYyAnbm9uZSciLCJvcmlnaW5hbC1wb2xpY3kiOiJpbWctc3JjICdub25lJzsgcmVwb3J0 LXVyaSByZXNvdXJjZXMvc2F2ZS1yZXBvcnQucGhwIiwiYmxvY2tlZC11cmkiOiJkYXRhIn19CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0 eVBvbGljeS9yZXBvcnQtYmxvY2tlZC1kYXRhLXVyaS5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVwb3J0LWJsb2NrZWQtZGF0YS11 cmkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi5iNjU0MTYwOWY0OGVmZjM2MWQwOGQxODg3M2JjMTIzOGE4ZmU3 NGJiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9j b250ZW50U2VjdXJpdHlQb2xpY3kvcmVwb3J0LWJsb2NrZWQtZGF0YS11cmkuaHRtbApAQCAtMCww ICsxLDEwIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPG1ldGEgaHR0 cC1lcXVpdj0iQ29udGVudC1TZWN1cml0eS1Qb2xpY3kiIGNvbnRlbnQ9ImltZy1zcmMgJ25vbmUn OyByZXBvcnQtdXJpIHJlc291cmNlcy9zYXZlLXJlcG9ydC5waHAiPgorPC9oZWFkPgorPGJvZHk+ CisgICAgPGltZyBzcmM9ImRhdGE6aW1hZ2UvZ2lmO2Jhc2U2NCxSMGxHT0RsaEFRQUJBQUFBQUNI NUJBRUtBQUVBTEFBQUFBQUJBQUVBQUFJQ1RBRUFPdz09Ij4KKyAgICA8c2NyaXB0IHNyYz0icmVz b3VyY2VzL2dvLXRvLWVjaG8tcmVwb3J0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K 187628 2013-02-11 11:29:21 -0800 2013-02-11 13:31:24 -0800 Patch bug-109429-20130211202552.patch text/plain 5790 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyMzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjkxZThjM2IxNjFjZDEw NGVkZjFmNjA2MGUxZDkwOTc2YjA5ODA2Ny4uYzliNDJhMGU4YjVmZjkxZDkzM2VmNTExYjc2NzIz MGYwZGFjNWRmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAyLTExICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ1NQIHJlcG9ydHMgZm9yIGJs b2NrZWQgJ2RhdGE6JyBVUkxzIHNob3VsZCByZXBvcnQgdGhlIHNjaGVtZSBvbmx5LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5NDI5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBodHRwczovL2R2Y3MudzMub3Jn L2hnL2NvbnRlbnQtc2VjdXJpdHktcG9saWN5L3Jldi8wMDFkYzhlOGJjYzMgY2hhbmdlZAorICAg ICAgICB0aGUgQ1NQIDEuMSBzcGVjIHRvIHJlcXVpcmUgdGhhdCBibG9ja2VkIFVSTHMgdGhhdCBk b24ndCByZWZlciB0bworICAgICAgICBnZW5lcmFsbHkgcmVzb2x2YWJsZSBzY2hlbWVzIChlLmcu ICdkYXRhOicsICdqYXZhc2NyaXB0OicsIGV0Yy4pIGJlCisgICAgICAgIHN0cmlwcGVkIGRvd24g dG8gdGhlaXIgc2NoZW1lIGluIHZpb2xhdGlvbiByZXBvcnRzLgorCisgICAgICAgIFRlc3Q6IGh0 dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3JlcG9ydC1ibG9ja2VkLWRh dGEtdXJpLmh0bWwKKworICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6cmVwb3J0VmlvbGF0aW9u KToKKyAgICAgICAgICAgIElmIHRoZSBibG9ja2VkIFVSTCBpcyBhIHdlYi1yZXNvbHZhYmxlIHNj aGVtZSwgYXBwbHkgdGhlIGN1cnJlbnQKKyAgICAgICAgICAgIHN0cmlwcGluZyBsb2dpYyB0byBp dCwgb3RoZXJ3aXNlLCBzdHJpcCBpdCB0byB0aGUgc2NoZW1lIG9ubHkuCisgICAgICAgICogcGxh dGZvcm0vS1VSTC5oOgorICAgICAgICAoS1VSTCk6CisgICAgICAgICAgICBNb3ZlIEtVUkw6Omlz SGllcmFyY2hpY2FsKCkgb3V0IGludG8gS1VSTCdzIHB1YmxpYyBBUEkuCisKIDIwMTMtMDItMDkg IERvbWluaWMgTWF6em9uaSAgPGRtYXp6b25pQGdvb2dsZS5jb20+CiAKICAgICAgICAgZmFzdC9l bmNvZGluZy9wYXJzZXItdGVzdHMtKi5odG1sIHRlc3RzIHNvbWV0aW1lcyBjcmFzaApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCmluZGV4IDFmNTM1MTVk NTk4MjcwNTJkMmExY2EzNzliN2E3YWMzODY4NmQxMDguLmRiMmJlZDYyYzkyYzI4YzJkNDQ4ZDRi N2Q3ZDI2OWU1Y2IxMTg3ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVu dFNlY3VyaXR5UG9saWN5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1 cml0eVBvbGljeS5jcHAKQEAgLTE2MzEsNyArMTYzMSwxMCBAQCB2b2lkIENvbnRlbnRTZWN1cml0 eVBvbGljeTo6cmVwb3J0VmlvbGF0aW9uKGNvbnN0IFN0cmluZyYgZGlyZWN0aXZlVGV4dCwgY29u c3QgUwogICAgICAgICBjc3BSZXBvcnQtPnNldFN0cmluZygidmlvbGF0ZWQtZGlyZWN0aXZlIiwg ZGlyZWN0aXZlVGV4dCk7CiAgICAgY3NwUmVwb3J0LT5zZXRTdHJpbmcoIm9yaWdpbmFsLXBvbGlj eSIsIGhlYWRlcik7CiAgICAgaWYgKGJsb2NrZWRVUkwuaXNWYWxpZCgpKQotICAgICAgICBjc3BS ZXBvcnQtPnNldFN0cmluZygiYmxvY2tlZC11cmkiLCBkb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4o KS0+Y2FuUmVxdWVzdChibG9ja2VkVVJMKSA/IGJsb2NrZWRVUkwuc3RyaXBwZWRGb3JVc2VBc1Jl ZmVycmVyKCkgOiBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKGJsb2NrZWRVUkwpLT50b1N0cmluZygp KTsKKyAgICAgICAgaWYgKGJsb2NrZWRVUkwuaXNIaWVyYXJjaGljYWwoKSkKKyAgICAgICAgICAg IGNzcFJlcG9ydC0+c2V0U3RyaW5nKCJibG9ja2VkLXVyaSIsIGRvY3VtZW50LT5zZWN1cml0eU9y aWdpbigpLT5jYW5SZXF1ZXN0KGJsb2NrZWRVUkwpID8gYmxvY2tlZFVSTC5zdHJpcHBlZEZvclVz ZUFzUmVmZXJyZXIoKSA6IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUoYmxvY2tlZFVSTCktPnRvU3Ry aW5nKCkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBjc3BSZXBvcnQtPnNldFN0cmluZygi YmxvY2tlZC11cmkiLCBibG9ja2VkVVJMLnByb3RvY29sKCkpOwogICAgIGVsc2UKICAgICAgICAg Y3NwUmVwb3J0LT5zZXRTdHJpbmcoImJsb2NrZWQtdXJpIiwgU3RyaW5nKCkpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9LVVJMLmgKaW5kZXggNDZiZjJhZGUyNDg5MzQyNGU0ZjQxMDMzNDRlN2M0MTQxOGMxY2Y0 ZC4uYmE0MDliMWFjYjlkMTYwMzFiNDRlYmJiMjE1ODJmYWNhYmQ4M2UxMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL0tVUkwuaApAQCAtMTIwLDYgKzEyMCw3IEBAIHB1YmxpYzoKICAgICBib29sIGNhblNldEhv c3RPclBvcnQoKSBjb25zdCB7IHJldHVybiBpc0hpZXJhcmNoaWNhbCgpOyB9CiAKICAgICBib29s IGNhblNldFBhdGhuYW1lKCkgY29uc3QgeyByZXR1cm4gaXNIaWVyYXJjaGljYWwoKTsgfQorICAg IGJvb2wgaXNIaWVyYXJjaGljYWwoKSBjb25zdDsKIAogI2lmIFVTRShHT09HTEVVUkwpCiAgICAg Y29uc3QgU3RyaW5nJiBzdHJpbmcoKSBjb25zdCB7IHJldHVybiBtX3VybC5zdHJpbmcoKTsgfQpA QCAtMjMxLDcgKzIzMiw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICB2b2lkIGludmFsaWRh dGUoKTsKLSAgICBib29sIGlzSGllcmFyY2hpY2FsKCkgY29uc3Q7CiAgICAgc3RhdGljIGJvb2wg cHJvdG9jb2xJcyhjb25zdCBTdHJpbmcmLCBjb25zdCBjaGFyKik7CiAjaWYgVVNFKEdPT0dMRVVS TCkKICAgICBmcmllbmQgY2xhc3MgS1VSTEdvb2dsZVByaXZhdGU7CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNWMzYmE0M2Fi NTVjNzJkNGE1NmZlMTUzNjljMGMyMDI0MjE2MDQxMC4uZjJjMTgxYzY2ZmU1NDFlMTM2ZWFlNWUx NDc3ODY5Y2I2NmY1MjdhNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTAyLTExICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ1NQIHJlcG9ydHMgZm9yIGJs b2NrZWQgJ2RhdGE6JyBVUkxzIHNob3VsZCByZXBvcnQgdGhlIHNjaGVtZSBvbmx5LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5NDI5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICAqIGh0dHAvdGVzdHMvc2VjdXJp dHkvY29udGVudFNlY3VyaXR5UG9saWN5L3JlcG9ydC1ibG9ja2VkLWRhdGEtdXJpLWV4cGVjdGVk LnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJp dHlQb2xpY3kvcmVwb3J0LWJsb2NrZWQtZGF0YS11cmkuaHRtbDogQWRkZWQuCisKIDIwMTMtMDIt MDkgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBDaHJv bWl1bSBnYXJkZW5pbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJp dHkvY29udGVudFNlY3VyaXR5UG9saWN5L3JlcG9ydC1ibG9ja2VkLWRhdGEtdXJpLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9s aWN5L3JlcG9ydC1ibG9ja2VkLWRhdGEtdXJpLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xMmJm YzJmNWFiYThmYmJkOGMwYmUyY2FjNWQ2YTgzOTFlMWQ1Y2QxCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVw b3J0LWJsb2NrZWQtZGF0YS11cmktZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsOCBAQAorQ09OU09M RSBNRVNTQUdFOiBSZWZ1c2VkIHRvIGxvYWQgdGhlIGltYWdlICdkYXRhOmltYWdlL2dpZjtiYXNl NjQsUjBsR09EbGhBUUFCQUFBQUFDSDVCQUVLQUFFQUxBQUFBQUFCQUFFQUFBSUNUQUVBT3c9PScg YmVjYXVzZSBpdCB2aW9sYXRlcyB0aGUgZm9sbG93aW5nIENvbnRlbnQgU2VjdXJpdHkgUG9saWN5 IGRpcmVjdGl2ZTogImltZy1zcmMgJ25vbmUnIi4KKworQ1NQIHJlcG9ydCByZWNlaXZlZDoKK0NP TlRFTlRfVFlQRTogYXBwbGljYXRpb24vanNvbgorSFRUUF9SRUZFUkVSOiBodHRwOi8vMTI3LjAu MC4xOjgwMDAvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3JlcG9ydC1ibG9ja2VkLWRh dGEtdXJpLmh0bWwKK1JFUVVFU1RfTUVUSE9EOiBQT1NUCis9PT0gUE9TVCBEQVRBID09PQoreyJj c3AtcmVwb3J0Ijp7ImRvY3VtZW50LXVyaSI6Imh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9zZWN1cml0 eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVwb3J0LWJsb2NrZWQtZGF0YS11cmkuaHRtbCIsInJl ZmVycmVyIjoiIiwidmlvbGF0ZWQtZGlyZWN0aXZlIjoiaW1nLXNyYyAnbm9uZSciLCJvcmlnaW5h bC1wb2xpY3kiOiJpbWctc3JjICdub25lJzsgcmVwb3J0LXVyaSByZXNvdXJjZXMvc2F2ZS1yZXBv cnQucGhwIiwiYmxvY2tlZC11cmkiOiJkYXRhIn19CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXBvcnQtYmxvY2tlZC1k YXRhLXVyaS5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2Vj dXJpdHlQb2xpY3kvcmVwb3J0LWJsb2NrZWQtZGF0YS11cmkuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iNjU0 MTYwOWY0OGVmZjM2MWQwOGQxODg3M2JjMTIzOGE4ZmU3NGJiCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVw b3J0LWJsb2NrZWQtZGF0YS11cmkuaHRtbApAQCAtMCwwICsxLDEwIEBACis8IURPQ1RZUEUgaHRt bD4KKzxodG1sPgorPGhlYWQ+CisgICAgPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1TZWN1cml0 eS1Qb2xpY3kiIGNvbnRlbnQ9ImltZy1zcmMgJ25vbmUnOyByZXBvcnQtdXJpIHJlc291cmNlcy9z YXZlLXJlcG9ydC5waHAiPgorPC9oZWFkPgorPGJvZHk+CisgICAgPGltZyBzcmM9ImRhdGE6aW1h Z2UvZ2lmO2Jhc2U2NCxSMGxHT0RsaEFRQUJBQUFBQUNINUJBRUtBQUVBTEFBQUFBQUJBQUVBQUFJ Q1RBRUFPdz09Ij4KKyAgICA8c2NyaXB0IHNyYz0icmVzb3VyY2VzL2dvLXRvLWVjaG8tcmVwb3J0 LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K