113307 2013-03-26 06:58:59 -0700 CSP 1.1: Experiment with 'base-uri' directive. 2013-03-26 08:25:17 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 99318 85558 1 mkwst mkwst abarth eric esprehn+autocc jochen justashar mkwst+watchlist ojan.autocc slightlyoff webkit.review.bot oldest_to_newest 863634 0 mkwst 2013-03-26 06:58:59 -0700 https://dvcs.w3.org/hg/content-security-policy/raw-file/tip/csp-specification.dev.html#base-uri defines a 'base-uri' directive which restricts the valid URIs which can be used to set the document's base URI. In order to feed implementation experience back into the working group, and to get a feel for how the API would work (and whether it addresses the use cases we care about), we should put together an experimental implementation behind the CSP_NEXT flag. Spec: https://dvcs.w3.org/hg/content-security-policy/rev/4b89c246ea16 Thread: http://lists.w3.org/Archives/Public/public-webappsec/2013Feb/0074.html 863638 1 195079 mkwst 2013-03-26 07:07:06 -0700 Created attachment 195079 Patch 863640 2 mkwst 2013-03-26 07:11:40 -0700 Hey Jochen, I'm not sure if you're interested in reviewing CSP patches while Adam's out. If you are, would you mind taking a look at this one? If not, I'll poke Eric later. This isn't at all high-priority, so no rush. Thanks! 863646 3 195079 jochen 2013-03-26 07:20:19 -0700 Comment on attachment 195079 Patch ok 863655 4 mkwst 2013-03-26 07:30:19 -0700 Cool. Once the CSP_NEXT bots are happy, I'll CQ the patch. 863695 5 195079 webkit.review.bot 2013-03-26 08:25:14 -0700 Comment on attachment 195079 Patch Clearing flags on attachment: 195079 Committed r146886: <http://trac.webkit.org/changeset/146886> 863696 6 webkit.review.bot 2013-03-26 08:25:17 -0700 All reviewed patches have been landed. Closing bug. 195079 2013-03-26 07:07:06 -0700 2013-03-26 08:25:14 -0700 Patch bug-113307-20130326150247.patch text/plain 14080 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2ODczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGI2Yzg4YmUwZWQyN2Ri MGI5ZGY1ZDRjZTcwMTBmMDI3ODMyYzlkNS4uYjA5MjljZDY4ZjhmY2EzOTVhMjJiZDI1ZTZmNDQ4 ZmQyZmJjODE1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDEzLTAzLTI2ICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ1NQIDEuMTogRXhwZXJpbWVu dCB3aXRoICdiYXNlLXVyaScgZGlyZWN0aXZlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzMzA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlICdiYXNlLXVyaScgZGlyZWN0aXZlIHdhcyBpbnRyb2R1 Y2VkWzFdIGFzIGFuIGV4cGVyaW1lbnRhbCBkaXJlY3RpdmUKKyAgICAgICAgaW4gQ1NQIDEuMSBh ZnRlciBhIGJpdCBvZiBkaXNjdXNzaW9uWzJdWzNdLiBUaGUgZXhhY3Qgc2VtYW50aWNzIHdpbGwK KyAgICAgICAgbGlrZWx5IGNoYW5nZSwgYnV0IGl0IHdvdWxkIGJlIGdvb2QgZm9yIHVzIHRvIGdl dCBzb21lIGltcGxlbWVudGF0aW9uCisgICAgICAgIGV4cGVyaWVuY2Ugd2l0aCB0aGUgQVBJIGFz IGN1cnJlbnRseSBzcGVjaWZpZWQsIGFuZCB0byBhbGxvdyBmb2xrcyB0bworICAgICAgICBwbGF5 IHdpdGggdGhlIGltcGxlbWVudGF0aW9uIHRvIGRldGVybWluZSB3aGV0aGVyIGl0IG1lZXRzIHRo ZQorICAgICAgICByZXF1aXJlbWVudHMgdGhlIHdheSB3ZSB0aGluayBpdCBtaWdodC4KKworICAg ICAgICBUaGlzIHBhdGNoIGlzIGEgZmlyc3QgcGFzcyBhdCB0aGF0IGltcGxlbWVudGF0aW9uOiBp dCB3aWxsIGhhdmUgbm8KKyAgICAgICAgZWZmZWN0IG9uIHBvcnRzIHRoYXQgaGF2ZW4ndCBlbmFi bGVkIHRoZSBDU1BfTkVYVCBmbGFnLgorCisgICAgICAgIFsxXTogaHR0cHM6Ly9kdmNzLnczLm9y Zy9oZy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9yZXYvNGI4OWMyNDZlYTE2CisgICAgICAgIFsy XTogaHR0cDovL2xpc3RzLnczLm9yZy9BcmNoaXZlcy9QdWJsaWMvcHVibGljLXdlYmFwcHNlYy8y MDEyT2N0LzAwMjIuaHRtbAorICAgICAgICBbM106IGh0dHA6Ly9saXN0cy53My5vcmcvQXJjaGl2 ZXMvUHVibGljL3B1YmxpYy13ZWJhcHBzZWMvMjAxM0ZlYi8wMDc0Lmh0bWwKKworICAgICAgICBU ZXN0czogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvMS4xL2Jhc2Ut dXJpLWFsbG93Lmh0bWwKKyAgICAgICAgICAgICAgIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVu dFNlY3VyaXR5UG9saWN5LzEuMS9iYXNlLXVyaS1kZW55Lmh0bWwKKworICAgICAgICAqIGRvbS9E b2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6cHJvY2Vzc0Jhc2VFbGVt ZW50KToKKyAgICAgICAgICAgIENoZWNrIHRoYXQgdGhlIG5ldyBiYXNlIFVSSSBpcyBhbGxvd2Vk IGJ5IENTUCBiZWZvcmUgdXNpbmcgaXQgYXMKKyAgICAgICAgICAgIHRoZSBkb2N1bWVudCdzIGJh c2UgVVJJLgorICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAg ICAgICAgIEFkZCBhIGNvbnN0YW50IGZvciB0aGUgbmV3IGRpcmVjdGl2ZSBuYW1lIChhbmQsIGFz IGEgZHJpdmUtYnksIHNwbGl0CisgICAgICAgICAgICB0aGUgbGlzdCBpbnRvIENTUCAxLjAgYW5k IENTUCAxLjEgZm9yIGNsYXJpdHkpLgorICAgICAgICAoQ1NQRGlyZWN0aXZlTGlzdCk6CisgICAg ICAgICAgICBBZGQgYSBwcm9wZXJ0eSB0byBob2xkIHRoZSBiYXNlIFVSSSBwb2xpY3kgZGlyZWN0 aXZlIHZhbHVlLgorICAgICAgICAoV2ViQ29yZTo6Q1NQRGlyZWN0aXZlTGlzdDo6Y2hlY2tTb3Vy Y2VBbmRSZXBvcnRWaW9sYXRpb24pOgorICAgICAgICAgICAgQ3VzdG9taXplIHRoZSBlcnJvciBt ZXNzYWdlIGlmZiB3ZSdyZSBkZWFsaW5nIHdpdGggJ2Jhc2UtdXJpJy4KKyAgICAgICAgKFdlYkNv cmU6OkNTUERpcmVjdGl2ZUxpc3Q6OmFsbG93QmFzZVVSSSk6CisgICAgICAgICAgICBDaGVjayB0 aGUgZ2l2ZW4gVVJJIGFnYWluc3QgdGhlICdiYXNlLXVyaScgZGlyZWN0aXZlJ3MgdmFsdWUsCisg ICAgICAgICAgICBleGFjdGx5IGFzIHdlIGRvIGZvciBldmVyeSBvdGhlciBzb3VyY2UtbGlzdCB0 eXBlIG9mIGRpcmVjdGl2ZS4KKyAgICAgICAgKFdlYkNvcmU6OkNTUERpcmVjdGl2ZUxpc3Q6OmFk ZERpcmVjdGl2ZSk6CisgICAgICAgICAgICBBY2NlcHQgJ2Jhc2UtdXJpJyBhcyBhIHZhbGlkIGRp cmVjdGl2ZSBpZmYgQ1NQX05FWFQgaXMgc2V0LCBhbmQKKyAgICAgICAgICAgIHRoZSBlbWJlZGRl ciBoYXMgb3B0ZWQtaW4gdmlhIHRoZSBydW50aW1lIGZsYWcuCisgICAgICAgIChXZWJDb3JlOjpD b250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93QmFzZVVSSSk6CisgICAgICAgICAgICBFeHBvc2Ug YW4gQVBJIG1ldGhvZCBvbiBDb250ZW50U2VjdXJpdHlQb2xpY3kgdG8gY2hlY2sgVVJJcyBhZ2Fp bnN0CisgICAgICAgICAgICB0aGUgJ2Jhc2UtdXJpJyBkaXJlY3RpdmUncyB2YWx1ZS4KKwogMjAx My0wMy0yNiAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE0Njc2Ny4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu Y3BwCmluZGV4IDA0ODNmNTFmN2RmNWZiYjJkMDM3MTBkYmIzZDc5ZDI5Njc1MGM3ZDMuLjQ3MGZh MDU3Yjk2MTAxOGU2MDhhMDAxNTI0Y2Q2YzBhNmJkMjc3YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmNwcApAQCAtMjc2NCw3ICsyNzY0LDcgQEAgdm9pZCBEb2N1bWVudDo6cHJvY2Vzc0Jhc2VFbGVt ZW50KCkKICAgICAgICAgaWYgKCFzdHJpcHBlZEhyZWYuaXNFbXB0eSgpKQogICAgICAgICAgICAg YmFzZUVsZW1lbnRVUkwgPSBLVVJMKHVybCgpLCBzdHJpcHBlZEhyZWYpOwogICAgIH0KLSAgICBp ZiAobV9iYXNlRWxlbWVudFVSTCAhPSBiYXNlRWxlbWVudFVSTCkgeworICAgIGlmIChtX2Jhc2VF bGVtZW50VVJMICE9IGJhc2VFbGVtZW50VVJMICYmIGNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5h bGxvd0Jhc2VVUkkoYmFzZUVsZW1lbnRVUkwpKSB7CiAgICAgICAgIG1fYmFzZUVsZW1lbnRVUkwg PSBiYXNlRWxlbWVudFVSTDsKICAgICAgICAgdXBkYXRlQmFzZVVSTCgpOwogICAgIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAppbmRleCA0ZGYwZDM5 ZTI1NzkxODM0MjgyZDg4MzcyNzI2NDg2ZjJiYWM1M2RmLi43ODcxNjVkNmMzMTE2NjllMDg5YTY2 MThiNDUzNjU4OGE0MmFiMThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRl bnRTZWN1cml0eVBvbGljeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2Vj dXJpdHlQb2xpY3kuY3BwCkBAIC0xMDYsNiArMTA2LDcgQEAgYm9vbCBpc01lZGlhVHlwZUNoYXJh Y3RlcihVQ2hhciBjKQogICAgIHJldHVybiAhaXNBU0NJSVNwYWNlKGMpICYmIGMgIT0gJy8nOwog fQogCisvLyBDU1AgMS4wIERpcmVjdGl2ZXMKIHN0YXRpYyBjb25zdCBjaGFyIGNvbm5lY3RTcmNb XSA9ICJjb25uZWN0LXNyYyI7CiBzdGF0aWMgY29uc3QgY2hhciBkZWZhdWx0U3JjW10gPSAiZGVm YXVsdC1zcmMiOwogc3RhdGljIGNvbnN0IGNoYXIgZm9udFNyY1tdID0gImZvbnQtc3JjIjsKQEAg LTExNyw2ICsxMTgsOSBAQCBzdGF0aWMgY29uc3QgY2hhciByZXBvcnRVUklbXSA9ICJyZXBvcnQt dXJpIjsKIHN0YXRpYyBjb25zdCBjaGFyIHNhbmRib3hbXSA9ICJzYW5kYm94IjsKIHN0YXRpYyBj b25zdCBjaGFyIHNjcmlwdFNyY1tdID0gInNjcmlwdC1zcmMiOwogc3RhdGljIGNvbnN0IGNoYXIg c3R5bGVTcmNbXSA9ICJzdHlsZS1zcmMiOworCisvLyBDU1AgMS4xIERpcmVjdGl2ZXMKK3N0YXRp YyBjb25zdCBjaGFyIGJhc2VVUklbXSA9ICJiYXNlLXVyaSI7CiBzdGF0aWMgY29uc3QgY2hhciBm b3JtQWN0aW9uW10gPSAiZm9ybS1hY3Rpb24iOwogc3RhdGljIGNvbnN0IGNoYXIgcGx1Z2luVHlw ZXNbXSA9ICJwbHVnaW4tdHlwZXMiOwogc3RhdGljIGNvbnN0IGNoYXIgc2NyaXB0Tm9uY2VbXSA9 ICJzY3JpcHQtbm9uY2UiOwpAQCAtMTM2LDYgKzE0MCw3IEBAIGJvb2wgaXNEaXJlY3RpdmVOYW1l KGNvbnN0IFN0cmluZyYgbmFtZSkKICAgICAgICAgfHwgZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwg c2NyaXB0U3JjKQogICAgICAgICB8fCBlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCBzdHlsZVNyYykK ICNpZiBFTkFCTEUoQ1NQX05FWFQpCisgICAgICAgIHx8IGVxdWFsSWdub3JpbmdDYXNlKG5hbWUs IGJhc2VVUkkpCiAgICAgICAgIHx8IGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIGZvcm1BY3Rpb24p CiAgICAgICAgIHx8IGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIHBsdWdpblR5cGVzKQogICAgICAg ICB8fCBlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCBzY3JpcHROb25jZSkKQEAgLTg0NSw2ICs4NTAs NyBAQCBwdWJsaWM6CiAgICAgYm9vbCBhbGxvd01lZGlhRnJvbVNvdXJjZShjb25zdCBLVVJMJiwg Q29udGVudFNlY3VyaXR5UG9saWN5OjpSZXBvcnRpbmdTdGF0dXMpIGNvbnN0OwogICAgIGJvb2wg YWxsb3dDb25uZWN0VG9Tb3VyY2UoY29uc3QgS1VSTCYsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6 UmVwb3J0aW5nU3RhdHVzKSBjb25zdDsKICAgICBib29sIGFsbG93Rm9ybUFjdGlvbihjb25zdCBL VVJMJiwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpSZXBvcnRpbmdTdGF0dXMpIGNvbnN0OworICAg IGJvb2wgYWxsb3dCYXNlVVJJKGNvbnN0IEtVUkwmLCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlJl cG9ydGluZ1N0YXR1cykgY29uc3Q7CiAKICAgICB2b2lkIGdhdGhlclJlcG9ydFVSSXMoRE9NU3Ry aW5nTGlzdCYpIGNvbnN0OwogICAgIGNvbnN0IFN0cmluZyYgZXZhbERpc2FibGVkRXJyb3JNZXNz YWdlKCkgeyByZXR1cm4gbV9ldmFsRGlzYWJsZWRFcnJvck1lc3NhZ2U7IH0KQEAgLTg5OSw2ICs5 MDUsNyBAQCBwcml2YXRlOgogCiAgICAgT3duUHRyPE1lZGlhTGlzdERpcmVjdGl2ZT4gbV9wbHVn aW5UeXBlczsKICAgICBPd25QdHI8Tm9uY2VEaXJlY3RpdmU+IG1fc2NyaXB0Tm9uY2U7CisgICAg T3duUHRyPFNvdXJjZUxpc3REaXJlY3RpdmU+IG1fYmFzZVVSSTsKICAgICBPd25QdHI8U291cmNl TGlzdERpcmVjdGl2ZT4gbV9jb25uZWN0U3JjOwogICAgIE93blB0cjxTb3VyY2VMaXN0RGlyZWN0 aXZlPiBtX2RlZmF1bHRTcmM7CiAgICAgT3duUHRyPFNvdXJjZUxpc3REaXJlY3RpdmU+IG1fZm9u dFNyYzsKQEAgLTEwNDgsNiArMTA1NSw4IEBAIGJvb2wgQ1NQRGlyZWN0aXZlTGlzdDo6Y2hlY2tT b3VyY2VBbmRSZXBvcnRWaW9sYXRpb24oU291cmNlTGlzdERpcmVjdGl2ZSogZGlyZWN0CiAgICAg ICAgIHByZWZpeCA9ICJSZWZ1c2VkIHRvIGNvbm5lY3QgdG8gJyI7CiAgICAgaWYgKHR5cGUgPT0g ImZvcm0iKQogICAgICAgICBwcmVmaXggPSAiUmVmdXNlZCB0byBzZW5kIGZvcm0gZGF0YSB0byAn IjsKKyAgICBpZiAodHlwZSA9PSAiYmFzZSIpCisgICAgICAgIHByZWZpeCA9ICJSZWZ1c2VkIHRv IHNldCB0aGUgZG9jdW1lbnQncyBiYXNlIFVSSSB0byAnIjsKIAogICAgIFN0cmluZyBzdWZmaXgg PSBTdHJpbmcoKTsKICAgICBpZiAoZGlyZWN0aXZlID09IG1fZGVmYXVsdFNyYykKQEAgLTEyMDIs NiArMTIxMSwxNCBAQCBib29sIENTUERpcmVjdGl2ZUxpc3Q6OmFsbG93Rm9ybUFjdGlvbihjb25z dCBLVVJMJiB1cmwsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UgogICAgICAgICBjaGVja1NvdXJj ZShtX2Zvcm1BY3Rpb24uZ2V0KCksIHVybCk7CiB9CiAKK2Jvb2wgQ1NQRGlyZWN0aXZlTGlzdDo6 YWxsb3dCYXNlVVJJKGNvbnN0IEtVUkwmIHVybCwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpSZXBv cnRpbmdTdGF0dXMgcmVwb3J0aW5nU3RhdHVzKSBjb25zdAoreworICAgIERFRklORV9TVEFUSUNf TE9DQUwoU3RyaW5nLCB0eXBlLCAoQVNDSUlMaXRlcmFsKCJiYXNlIikpKTsKKyAgICByZXR1cm4g cmVwb3J0aW5nU3RhdHVzID09IENvbnRlbnRTZWN1cml0eVBvbGljeTo6U2VuZFJlcG9ydCA/Cisg ICAgICAgIGNoZWNrU291cmNlQW5kUmVwb3J0VmlvbGF0aW9uKG1fYmFzZVVSSS5nZXQoKSwgdXJs LCB0eXBlLCBiYXNlVVJJKSA6CisgICAgICAgIGNoZWNrU291cmNlKG1fYmFzZVVSSS5nZXQoKSwg dXJsKTsKK30KKwogLy8gcG9saWN5ICAgICAgICAgICAgPSBkaXJlY3RpdmUtbGlzdAogLy8gZGly ZWN0aXZlLWxpc3QgICAgPSBbIGRpcmVjdGl2ZSAqKCAiOyIgWyBkaXJlY3RpdmUgXSApIF0KIC8v CkBAIC0xNDAzLDcgKzE0MjAsOSBAQCB2b2lkIENTUERpcmVjdGl2ZUxpc3Q6OmFkZERpcmVjdGl2 ZShjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpCiAgICAgICAgIHBhcnNl UmVwb3J0VVJJKG5hbWUsIHZhbHVlKTsKICNpZiBFTkFCTEUoQ1NQX05FWFQpCiAgICAgZWxzZSBp ZiAobV9wb2xpY3ktPmV4cGVyaW1lbnRhbEZlYXR1cmVzRW5hYmxlZCgpKSB7Ci0gICAgICAgIGlm IChlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCBmb3JtQWN0aW9uKSkKKyAgICAgICAgaWYgKGVxdWFs SWdub3JpbmdDYXNlKG5hbWUsIGJhc2VVUkkpKQorICAgICAgICAgICAgc2V0Q1NQRGlyZWN0aXZl PFNvdXJjZUxpc3REaXJlY3RpdmU+KG5hbWUsIHZhbHVlLCBtX2Jhc2VVUkkpOworICAgICAgICBl bHNlIGlmIChlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCBmb3JtQWN0aW9uKSkKICAgICAgICAgICAg IHNldENTUERpcmVjdGl2ZTxTb3VyY2VMaXN0RGlyZWN0aXZlPihuYW1lLCB2YWx1ZSwgbV9mb3Jt QWN0aW9uKTsKICAgICAgICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgcGx1Z2lu VHlwZXMpKQogICAgICAgICAgICAgc2V0Q1NQRGlyZWN0aXZlPE1lZGlhTGlzdERpcmVjdGl2ZT4o bmFtZSwgdmFsdWUsIG1fcGx1Z2luVHlwZXMpOwpAQCAtMTYzMSw2ICsxNjUwLDExIEBAIGJvb2wg Q29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0Zvcm1BY3Rpb24oY29uc3QgS1VSTCYgdXJsLCBD b250ZW50U2VjdXJpdHlQb2xpCiAgICAgcmV0dXJuIGlzQWxsb3dlZEJ5QWxsV2l0aFVSTDwmQ1NQ RGlyZWN0aXZlTGlzdDo6YWxsb3dGb3JtQWN0aW9uPihtX3BvbGljaWVzLCB1cmwsIHJlcG9ydGlu Z1N0YXR1cyk7CiB9CiAKK2Jvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0Jhc2VVUkko Y29uc3QgS1VSTCYgdXJsLCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlJlcG9ydGluZ1N0YXR1cyBy ZXBvcnRpbmdTdGF0dXMpIGNvbnN0Cit7CisgICAgcmV0dXJuIGlzQWxsb3dlZEJ5QWxsV2l0aFVS TDwmQ1NQRGlyZWN0aXZlTGlzdDo6YWxsb3dCYXNlVVJJPihtX3BvbGljaWVzLCB1cmwsIHJlcG9y dGluZ1N0YXR1cyk7Cit9CisKIGJvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5Ojppc0FjdGl2ZSgp IGNvbnN0CiB7CiAgICAgcmV0dXJuICFtX3BvbGljaWVzLmlzRW1wdHkoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmggYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCmluZGV4IDBjMGRjZDRmMDEyNGU5MGZl N2I1OWVmZTYwNzViN2RkZWZmYjM3ZDIuLjM2MzQyMjg2ZmVlYmFlMjQxNTI4MzM3M2MxM2Y5N2Jm NmE2OWJmMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5 UG9saWN5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3ku aApAQCAtMTA0LDYgKzEwNCw3IEBAIHB1YmxpYzoKICAgICBib29sIGFsbG93TWVkaWFGcm9tU291 cmNlKGNvbnN0IEtVUkwmLCBSZXBvcnRpbmdTdGF0dXMgPSBTZW5kUmVwb3J0KSBjb25zdDsKICAg ICBib29sIGFsbG93Q29ubmVjdFRvU291cmNlKGNvbnN0IEtVUkwmLCBSZXBvcnRpbmdTdGF0dXMg PSBTZW5kUmVwb3J0KSBjb25zdDsKICAgICBib29sIGFsbG93Rm9ybUFjdGlvbihjb25zdCBLVVJM JiwgUmVwb3J0aW5nU3RhdHVzID0gU2VuZFJlcG9ydCkgY29uc3Q7CisgICAgYm9vbCBhbGxvd0Jh c2VVUkkoY29uc3QgS1VSTCYsIFJlcG9ydGluZ1N0YXR1cyA9IFNlbmRSZXBvcnQpIGNvbnN0Owog CiAgICAgUmVmbGVjdGVkWFNTRGlzcG9zaXRpb24gcmVmbGVjdGVkWFNTRGlzcG9zaXRpb24oKSBj b25zdDsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCmluZGV4IGI4YjkyODIzOTNjODZiZWIwNzljYjRmMTI0MmM4YTI3OTQ5Y2I1MGYu LjZhZjY1OGMzNjgyYmFlNTlkOGNjZjQ3NTdiYzQ0YjQ5MTA2ZTlhNjMgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNSBAQAorMjAxMy0wMy0yNiAgTWlrZSBXZXN0ICA8bWt3c3RAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIENTUCAxLjE6IEV4cGVyaW1lbnQgd2l0aCAnYmFzZS11cmknIGRpcmVjdGl2ZS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzMwNworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0 cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvMS4xL2Jhc2UtdXJpLWFsbG93LWV4cGVj dGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2Vj dXJpdHlQb2xpY3kvMS4xL2Jhc2UtdXJpLWFsbG93Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGh0 dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5LzEuMS9iYXNlLXVyaS1kZW55 LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250 ZW50U2VjdXJpdHlQb2xpY3kvMS4xL2Jhc2UtdXJpLWRlbnkuaHRtbDogQWRkZWQuCisKIDIwMTMt MDMtMjYgIFpvbHRhbiBBcnZhaSAgPHphcnZhaUBpbmYudS1zemVnZWQuaHU+CiAKICAgICAgICAg W1F0XSBVbnJldmlld2VkIGdhcmRlbmluZy4gUmViYXNlbGluaW5nLiBNYWtpbmcgcGl4ZWwgdGVz dCBib3QgaGFwcGllciBhZnRlciByMTQ2MjA2LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvMS4xL2Jhc2UtdXJpLWFsbG93 LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNl Y3VyaXR5UG9saWN5LzEuMS9iYXNlLXVyaS1hbGxvdy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u MTUzYmEzNTQyNDU2YjVhNzU3ZTA0N2UxNjNlZDJkMDhlZDAyNzJmNwotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5 LzEuMS9iYXNlLXVyaS1hbGxvdy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMCBAQAorQ2hlY2sg dGhhdCBiYXNlIFVSSXMgY2FuIGJlIHNldCBpZiB0aGV5IGRvIG5vdCB2aW9sYXRlIHRoZSBwYWdl J3MgcG9saWN5LgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1Mi IG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBkb2N1bWVu dC5iYXNlVVJJIGlzICJodHRwOi8vZXhhbXBsZS5jb20vIgorUEFTUyBzdWNjZXNzZnVsbHlQYXJz ZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5LzEuMS9iYXNlLXVyaS1hbGxv dy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQ b2xpY3kvMS4xL2Jhc2UtdXJpLWFsbG93Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGIyNzUzZWIxMmYwZjAw OGQwOWRmOGNjMWI2ODg5MzEzMzE5YWEzMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5LzEuMS9iYXNlLXVyaS1h bGxvdy5odG1sCkBAIC0wLDAgKzEsMTUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVh ZD4KKyAgICA8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LVNlY3VyaXR5LVBvbGljeSIgY29udGVu dD0iYmFzZS11cmkgaHR0cDovL2V4YW1wbGUuY29tIj4KKyAgICA8YmFzZSBocmVmPSJodHRwOi8v ZXhhbXBsZS5jb20vIj4KKyAgICA8c2NyaXB0IHNyYz0iaHR0cDovL2xvY2FsaG9zdDo4MDAwL2pz LXRlc3QtcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0Pgor ICAgICAgICBkZXNjcmlwdGlvbignQ2hlY2sgdGhhdCBiYXNlIFVSSXMgY2FuIGJlIHNldCBpZiB0 aGV5IGRvIG5vdCB2aW9sYXRlIHRoZSBwYWdlXCdzIHBvbGljeS4nKTsKKworICAgICAgICBzaG91 bGRCZUVxdWFsVG9TdHJpbmcoJ2RvY3VtZW50LmJhc2VVUkknLCAnaHR0cDovL2V4YW1wbGUuY29t LycpOworICAgIDwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJodHRwOi8vbG9jYWxob3N0Ojgw MDAvanMtdGVzdC1yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvaGVhZD4K Kzxib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1 cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvMS4xL2Jhc2UtdXJpLWRlbnktZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kv MS4xL2Jhc2UtdXJpLWRlbnktZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjFkNWU4NjFhYWVhMjlm MDliMWNhNzdhNmMxMGNmMzkwZWJmZmQyMTMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS8xLjEvYmFzZS11cmkt ZGVueS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyMSBAQAorQ09OU09MRSBNRVNTQUdFOiBSZWZ1 c2VkIHRvIHNldCB0aGUgZG9jdW1lbnQncyBiYXNlIFVSSSB0byAnaHR0cDovL2V4YW1wbGUuY29t LycgYmVjYXVzZSBpdCB2aW9sYXRlcyB0aGUgZm9sbG93aW5nIENvbnRlbnQgU2VjdXJpdHkgUG9s aWN5IGRpcmVjdGl2ZTogImJhc2UtdXJpICdzZWxmJyIuCisKK0NoZWNrIHRoYXQgYmFzZSBVUklz IGNhbm5vdCBiZSBzZXQgaWYgdGhleSB2aW9sYXRlIHRoZSBwYWdlJ3MgcG9saWN5LgorCitPbiBz dWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dl ZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworS2lja2luZyBvZmYgdGhlIHRlc3RzOgorUEFTUyBk b2N1bWVudC5iYXNlVVJJIGlzIGRvY3VtZW50LmxvY2F0aW9uLmhyZWYKK1BBU1Mgd2luZG93LmUu ZG9jdW1lbnRVUkkgaXMgImh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9zZWN1cml0eS9jb250ZW50U2Vj dXJpdHlQb2xpY3kvMS4xL2Jhc2UtdXJpLWRlbnkuaHRtbCIKK1BBU1Mgd2luZG93LmUucmVmZXJy ZXIgaXMgIiIKK1BBU1Mgd2luZG93LmUuYmxvY2tlZFVSSSBpcyAiaHR0cDovL2V4YW1wbGUuY29t IgorUEFTUyB3aW5kb3cuZS52aW9sYXRlZERpcmVjdGl2ZSBpcyAiYmFzZS11cmkgJ3NlbGYnIgor UEFTUyB3aW5kb3cuZS5lZmZlY3RpdmVEaXJlY3RpdmUgaXMgImJhc2UtdXJpIgorUEFTUyB3aW5k b3cuZS5vcmlnaW5hbFBvbGljeSBpcyAiYmFzZS11cmkgJ3NlbGYnIgorUEFTUyB3aW5kb3cuZS5z b3VyY2VGaWxlIGlzICJodHRwOi8vMTI3LjAuMC4xOjgwMDAvc2VjdXJpdHkvY29udGVudFNlY3Vy aXR5UG9saWN5LzEuMS9iYXNlLXVyaS1kZW55Lmh0bWwiCitQQVNTIHdpbmRvdy5lLmxpbmVOdW1i ZXIgaXMgMjQKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVU RQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRT ZWN1cml0eVBvbGljeS8xLjEvYmFzZS11cmktZGVueS5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvMS4xL2Jhc2UtdXJpLWRlbnkuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5lNjYwYjc1MmVkZDNkMjZlMjZkZjU1MGVlMzY1ZjliZWQ4MDQzZDJjCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50 U2VjdXJpdHlQb2xpY3kvMS4xL2Jhc2UtdXJpLWRlbnkuaHRtbApAQCAtMCwwICsxLDMzIEBACis8 IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPG1ldGEgaHR0cC1lcXVpdj0iQ29u dGVudC1TZWN1cml0eS1Qb2xpY3kiIGNvbnRlbnQ9ImJhc2UtdXJpICdzZWxmJyI+CisgICAgPHNj cmlwdCBzcmM9Imh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9qcy10ZXN0LXJlc291cmNlcy9qcy10ZXN0 LXByZS5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9Imh0dHA6Ly9sb2NhbGhvc3Q6ODAw MC9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVzb3VyY2VzL3NlY3VyaXR5cG9saWN5 dmlvbGF0aW9uLXRlc3QuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQ+CisgICAgICAgIGRlc2Ny aXB0aW9uKCdDaGVjayB0aGF0IGJhc2UgVVJJcyBjYW5ub3QgYmUgc2V0IGlmIHRoZXkgdmlvbGF0 ZSB0aGUgcGFnZVwncyBwb2xpY3kuJyk7CisKKyAgICAgICAgdmFyIGV4cGVjdGF0aW9ucyA9IHsK KyAgICAgICAgICAgICdkb2N1bWVudFVSSSc6IGRvY3VtZW50LmxvY2F0aW9uLnRvU3RyaW5nKCks CisgICAgICAgICAgICAncmVmZXJyZXInOiBkb2N1bWVudC5yZWZlcnJlciwKKyAgICAgICAgICAg ICdibG9ja2VkVVJJJzogJ2h0dHA6Ly9leGFtcGxlLmNvbScsCisgICAgICAgICAgICAndmlvbGF0 ZWREaXJlY3RpdmUnOiAnYmFzZS11cmkgXCdzZWxmXCcnLAorICAgICAgICAgICAgJ2VmZmVjdGl2 ZURpcmVjdGl2ZSc6ICdiYXNlLXVyaScsCisgICAgICAgICAgICAnb3JpZ2luYWxQb2xpY3knOiAn YmFzZS11cmkgXCdzZWxmXCcnLAorICAgICAgICAgICAgJ3NvdXJjZUZpbGUnOiBkb2N1bWVudC5s b2NhdGlvbi50b1N0cmluZygpLAorICAgICAgICAgICAgJ2xpbmVOdW1iZXInOiAyNAorICAgICAg ICB9OworCisgICAgICAgIGZ1bmN0aW9uIHJ1bigpIHsKKyAgICAgICAgICAgIHZhciBiYXNlID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnYmFzZScpOworICAgICAgICAgICAgYmFzZS5ocmVmID0g J2h0dHA6Ly9leGFtcGxlLmNvbS8nOworICAgICAgICAgICAgZG9jdW1lbnQuaGVhZC5hcHBlbmRD aGlsZChiYXNlKTsKKworICAgICAgICAgICAgc2hvdWxkQmUoJ2RvY3VtZW50LmJhc2VVUkknLCAn ZG9jdW1lbnQubG9jYXRpb24uaHJlZicpOworICAgICAgICB9CisgICAgPC9zY3JpcHQ+CisgICAg PHNjcmlwdCBzcmM9Imh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9qcy10ZXN0LXJlc291cmNlcy9qcy10 ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8L2JvZHk+Cis8L2h0bWw+ Cg==