114317 2013-04-09 16:14:13 -0700 ContentSecurityPolicy::logToConsole should include line/column number and source location 2019-04-23 13:41:05 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck hi bfulgham commit-queue dbates ews-watchlist hi inspector-bugzilla-changes joepeck mkwst timothy webkit-bug-importer wilander oldest_to_newest 872268 0 joepeck 2013-04-09 16:14:13 -0700 ContentSecurityPolicy's security ConsoleMessages should include a column number alongside the line number. If the Web Inspector wants to jump to a specific place in source code it will need both to jump to an accurate place. 872269 1 webkit-bug-importer 2013-04-09 16:14:43 -0700 <rdar://problem/13614617> 1143775 2 265985 bburg 2015-11-20 13:22:39 -0800 Created attachment 265985 test case 1176289 3 bfulgham 2016-03-18 13:24:13 -0700 Dan: Did you do anything to address this in your various CSP changes? Otherwise, John should try to attack this soon. 1176536 4 dbates 2016-03-19 16:17:15 -0700 (In reply to comment #3) > Dan: Did you do anything to address this in your various CSP changes? No. 1176806 5 wilander 2016-03-21 12:11:22 -0700 Re-assigning to Daniel Bates since he is refactoring this code any way. 1506265 6 joepeck 2019-02-14 11:18:50 -0800 TextPostition is used above this which has an m_line and m_column. Might be easy. 1506286 7 362044 hi 2019-02-14 11:56:51 -0800 Created attachment 362044 Patch 1506288 8 362044 joepeck 2019-02-14 11:58:35 -0800 Comment on attachment 362044 Patch I think this needs a test, otherwise I'd have done the same thing myself! There is a test case attached to the bugzilla bug. 1506294 9 362044 dbates 2019-02-14 12:12:30 -0800 Comment on attachment 362044 Patch I think this patch will improve some violations, but I don’t think this will improve much. The problem is that we may not have source information at all. Last I recall source information is only available during script execution and at parse time. Subresource loads tend to be scheduled outside these Windows. Prove me wrong, please! 1506297 10 dbates 2019-02-14 12:18:08 -0800 I think I have a partial, likely outdated, patch for this with a boat load of tests. That’s why this bug is assigned to me :) unassigning and please take take it! Why do I have a boat load tests: I seem to recall under testing of log messsages. I will post once I get to my computer and assuming my memory is correct :D. Worst case, I have a boat load of tests for some other bug. Definitely have a boat load of something. 1516668 11 364694 hi 2019-03-14 15:03:10 -0700 Created attachment 364694 Patch 1529733 12 364694 commit-queue 2019-04-23 13:41:03 -0700 Comment on attachment 364694 Patch Clearing flags on attachment: 364694 Committed r244563: <https://trac.webkit.org/changeset/244563> 1529734 13 commit-queue 2019-04-23 13:41:05 -0700 All reviewed patches have been landed. Closing bug. 265985 2015-11-20 13:22:39 -0800 2015-11-20 13:22:39 -0800 test case connect-src-xmlhttprequest-blocked.html text/html 552 bburg PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1T ZWN1cml0eS1Qb2xpY3kiIGNvbnRlbnQ9ImNvbm5lY3Qtc3JjIGh0dHA6Ly8xMjcuMC4wLjE6ODAw MCI+CjxzY3JpcHQ+CmlmICh3aW5kb3cudGVzdFJ1bm5lcikKICAgIHRlc3RSdW5uZXIuZHVtcEFz VGV4dCgpOwo8L3NjcmlwdD4KPC9oZWFkPgo8Ym9keT4KPHByZSBpZD0iY29uc29sZSI+PC9wcmU+ CjxzY3JpcHQ+CmZ1bmN0aW9uIGxvZyhtc2cpCnsKICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJjb25zb2xlIikuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUobXNnICsgIlxu IikpOwp9Cgp0cnkgewogICAgdmFyIHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdDsKICAgIHhoci5v cGVuKCJHRVQiLCAiaHR0cDovL2xvY2FsaG9zdDo4MDAwL3htbGh0dHByZXF1ZXN0L3Jlc291cmNl cy9nZXQudHh0IiwgdHJ1ZSk7IAogICAgbG9nKCJGYWlsIik7Cn0gY2F0Y2goZSkgewogICAgbG9n KCJQYXNzIik7Cn0KCjwvc2NyaXB0Pgo8L2JvZHk+CjwvaHRtbD4K 362044 2019-02-14 11:56:51 -0800 2019-03-14 15:03:08 -0700 Patch bug-114317-20190214115650.patch text/plain 4362 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMDEzMGNkNDUzN2ZjNGUyM2Q0YmJmNDgwM2MxNzE0OTI5MDhkOTE3Li45 YTQyOTA2OTc3OTM1MTcwMzQ4OWI3N2FhNmQxOTk5NGQ2ZmQ0MjUxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTggQEAKKzIwMTktMDItMTQgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIENvbnRlbnRTZWN1cml0eVBvbGljeTo6bG9nVG9Db25zb2xlIHNob3VsZCBp bmNsdWRlIGxpbmUvY29sdW1uIG51bWJlciBhbmQgc291cmNlIGxvY2F0aW9uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQzMTcKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzEzNjE0NjE3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICog cGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5Lmg6CisgICAgICAgICogcGFnZS9jc3AvQ29u dGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0 eVBvbGljeTo6cmVwb3J0VmlvbGF0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRl bnRTZWN1cml0eVBvbGljeTo6bG9nVG9Db25zb2xlIGNvbnN0KToKKwogMjAxOS0wMi0xMyAgUnlv c3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBDcmFzaCBpbiBET01UaW1l cjo6ZmlyZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1 cml0eVBvbGljeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQ b2xpY3kuY3BwCmluZGV4IDQwM2RjNjAyODRiM2FhZmM0NjdhZjE5MTljNjU3ODNjMzhlMDM0YjUu LjgxZWQ3ZWQyMDZkMDhjZDU3ZmM4OTNlMTM2Y2MzN2VhN2ViYzc2ZGUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcApAQCAtNjcwLDcg KzY3MCw3IEBAIHZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5OjpyZXBvcnRWaW9sYXRpb24oY29u c3QgU3RyaW5nJiBlZmZlY3RpdmVWaW9sYXRlZERpcmVjCiAKIHZvaWQgQ29udGVudFNlY3VyaXR5 UG9saWN5OjpyZXBvcnRWaW9sYXRpb24oY29uc3QgU3RyaW5nJiBlZmZlY3RpdmVWaW9sYXRlZERp cmVjdGl2ZSwgY29uc3QgU3RyaW5nJiB2aW9sYXRlZERpcmVjdGl2ZSwgY29uc3QgQ29udGVudFNl Y3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdCYgdmlvbGF0ZWREaXJlY3RpdmVMaXN0LCBjb25zdCBV UkwmIGJsb2NrZWRVUkwsIGNvbnN0IFN0cmluZyYgY29uc29sZU1lc3NhZ2UsIGNvbnN0IFN0cmlu ZyYgc291cmNlVVJMLCBjb25zdCBUZXh0UG9zaXRpb24mIHNvdXJjZVBvc2l0aW9uLCBKU0M6OkV4 ZWNTdGF0ZSogc3RhdGUpIGNvbnN0CiB7Ci0gICAgbG9nVG9Db25zb2xlKGNvbnNvbGVNZXNzYWdl LCBzb3VyY2VVUkwsIHNvdXJjZVBvc2l0aW9uLm1fbGluZSwgc3RhdGUpOworICAgIGxvZ1RvQ29u c29sZShjb25zb2xlTWVzc2FnZSwgc291cmNlVVJMLCBzb3VyY2VQb3NpdGlvbi5tX2xpbmUsIHNv dXJjZVBvc2l0aW9uLm1fY29sdW1uLCBzdGF0ZSk7CiAKICAgICBpZiAoIW1faXNSZXBvcnRpbmdF bmFibGVkKQogICAgICAgICByZXR1cm47CkBAIC04NDksMTYgKzg0OSwxNSBAQCB2b2lkIENvbnRl bnRTZWN1cml0eVBvbGljeTo6cmVwb3J0TWlzc2luZ1JlcG9ydFVSSShjb25zdCBTdHJpbmcmIHBv bGljeSkgY29uc3QKICAgICBsb2dUb0NvbnNvbGUoIlRoZSBDb250ZW50IFNlY3VyaXR5IFBvbGlj eSAnIiArIHBvbGljeSArICInIHdhcyBkZWxpdmVyZWQgaW4gcmVwb3J0LW9ubHkgbW9kZSwgYnV0 IGRvZXMgbm90IHNwZWNpZnkgYSAncmVwb3J0LXVyaSc7IHRoZSBwb2xpY3kgd2lsbCBoYXZlIG5v IGVmZmVjdC4gUGxlYXNlIGVpdGhlciBhZGQgYSAncmVwb3J0LXVyaScgZGlyZWN0aXZlLCBvciBk ZWxpdmVyIHRoZSBwb2xpY3kgdmlhIHRoZSAnQ29udGVudC1TZWN1cml0eS1Qb2xpY3knIGhlYWRl ci4iKTsKIH0KIAotdm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmxvZ1RvQ29uc29sZShjb25z dCBTdHJpbmcmIG1lc3NhZ2UsIGNvbnN0IFN0cmluZyYgY29udGV4dFVSTCwgY29uc3QgV1RGOjpP cmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSwgSlNDOjpFeGVjU3RhdGUqIHN0YXRlKSBjb25zdAor dm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmxvZ1RvQ29uc29sZShjb25zdCBTdHJpbmcmIG1l c3NhZ2UsIGNvbnN0IFN0cmluZyYgY29udGV4dFVSTCwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVy JiBjb250ZXh0TGluZSwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiBjb250ZXh0Q29sdW1uLCBK U0M6OkV4ZWNTdGF0ZSogc3RhdGUpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2lzUmVwb3J0aW5nRW5h YmxlZCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gRklYTUU6IDxodHRwOi8vd2Via2l0Lm9y Zy9iLzExNDMxNz4gQ29udGVudFNlY3VyaXR5UG9saWN5Ojpsb2dUb0NvbnNvbGUgc2hvdWxkIGlu Y2x1ZGUgYSBjb2x1bW4gbnVtYmVyCiAgICAgaWYgKG1fY2xpZW50KQogICAgICAgICBtX2NsaWVu dC0+YWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6U2VjdXJpdHksIE1lc3NhZ2VMZXZl bDo6RXJyb3IsIG1lc3NhZ2UsIDApOwogICAgIGVsc2UgaWYgKG1fc2NyaXB0RXhlY3V0aW9uQ29u dGV4dCkKLSAgICAgICAgbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LT5hZGRDb25zb2xlTWVzc2Fn ZShNZXNzYWdlU291cmNlOjpTZWN1cml0eSwgTWVzc2FnZUxldmVsOjpFcnJvciwgbWVzc2FnZSwg Y29udGV4dFVSTCwgY29udGV4dExpbmUub25lQmFzZWRJbnQoKSwgMCwgc3RhdGUpOworICAgICAg ICBtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPmFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3Vy Y2U6OlNlY3VyaXR5LCBNZXNzYWdlTGV2ZWw6OkVycm9yLCBtZXNzYWdlLCBjb250ZXh0VVJMLCBj b250ZXh0TGluZS5vbmVCYXNlZEludCgpLCBjb250ZXh0Q29sdW1uLm9uZUJhc2VkSW50KCksIHN0 YXRlKTsKIH0KIAogdm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OnJlcG9ydEJsb2NrZWRTY3Jp cHRFeGVjdXRpb25Ub0luc3BlY3Rvcihjb25zdCBTdHJpbmcmIGRpcmVjdGl2ZVRleHQpIGNvbnN0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xp Y3kuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCmlu ZGV4IDE3Zjc3YzI2YTBmZGJhOTNhZjM4MzZhYzgzOWNmOWQ3YjZmOTI4N2EuLjMxNGEzNzU5ODU3 NmVkZDE5OGM0YWM0NTE0MGU2ZmRmYjY5MmEyY2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCkBAIC0xNzMsNyArMTczLDcgQEAgcHVibGlj OgogICAgIHZvaWQgc2V0Q2xpZW50KENvbnRlbnRTZWN1cml0eVBvbGljeUNsaWVudCogY2xpZW50 KSB7IG1fY2xpZW50ID0gY2xpZW50OyB9CiAKIHByaXZhdGU6Ci0gICAgdm9pZCBsb2dUb0NvbnNv bGUoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBjb25zdCBTdHJpbmcmIGNvbnRleHRVUkwgPSBTdHJp bmcoKSwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSA9IFdURjo6T3JkaW5h bE51bWJlcjo6YmVmb3JlRmlyc3QoKSwgSlNDOjpFeGVjU3RhdGUqID0gbnVsbHB0cikgY29uc3Q7 CisgICAgdm9pZCBsb2dUb0NvbnNvbGUoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBjb25zdCBTdHJp bmcmIGNvbnRleHRVUkwgPSBTdHJpbmcoKSwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiBjb250 ZXh0TGluZSA9IFdURjo6T3JkaW5hbE51bWJlcjo6YmVmb3JlRmlyc3QoKSwgY29uc3QgV1RGOjpP cmRpbmFsTnVtYmVyJiBjb250ZXh0Q29sdW1uID0gV1RGOjpPcmRpbmFsTnVtYmVyOjpiZWZvcmVG aXJzdCgpLCBKU0M6OkV4ZWNTdGF0ZSogPSBudWxscHRyKSBjb25zdDsKICAgICB2b2lkIHVwZGF0 ZVNvdXJjZVNlbGYoY29uc3QgU2VjdXJpdHlPcmlnaW4mKTsKICAgICB2b2lkIGFwcGx5UG9saWN5 VG9TY3JpcHRFeGVjdXRpb25Db250ZXh0KCk7CiAK 364694 2019-03-14 15:03:10 -0700 2019-04-23 13:41:03 -0700 Patch bug-114317-20190314150309.patch text/plain 7205 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4YmZmNTgzZDg2ZTY3NjI2MWRlN2U4MTc5YTE1NzAwZGVjNGZhZDdjLi40 MzFkNzE0ODM0Y2VkOTNhN2EwNTRhNGQ4ZDlmOGY3ZmUwZDQ5NWZiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTggQEAKKzIwMTktMDMtMTQgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIENvbnRlbnRTZWN1cml0eVBvbGljeTo6bG9nVG9Db25zb2xlIHNob3VsZCBp bmNsdWRlIGxpbmUvY29sdW1uIG51bWJlciBhbmQgc291cmNlIGxvY2F0aW9uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQzMTcKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzEzNjE0NjE3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICog cGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5Lmg6CisgICAgICAgICogcGFnZS9jc3AvQ29u dGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0 eVBvbGljeTo6cmVwb3J0VmlvbGF0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRl bnRTZWN1cml0eVBvbGljeTo6bG9nVG9Db25zb2xlIGNvbnN0KToKKwogMjAxOS0wMy0xNCAgQ2hy aXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBXZWJzaXRlUG9saWN5 IGZvciB0aGUgY2xpZW50IHRvIHNwZWNpZnkgdGhlIGRldmljZSBvcmllbnRhdGlvbiAmIG1vdGlv biBhY2Nlc3MgcG9saWN5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250 ZW50U2VjdXJpdHlQb2xpY3kuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNl Y3VyaXR5UG9saWN5LmNwcAppbmRleCA0MDNkYzYwMjg0YjNhYWZjNDY3YWYxOTE5YzY1NzgzYzM4 ZTAzNGI1Li44MWVkN2VkMjA2ZDA4Y2Q1N2ZjODkzZTEzNmNjMzdlYTdlYmM3NmRlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKQEAg LTY3MCw3ICs2NzAsNyBAQCB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6cmVwb3J0VmlvbGF0 aW9uKGNvbnN0IFN0cmluZyYgZWZmZWN0aXZlVmlvbGF0ZWREaXJlYwogCiB2b2lkIENvbnRlbnRT ZWN1cml0eVBvbGljeTo6cmVwb3J0VmlvbGF0aW9uKGNvbnN0IFN0cmluZyYgZWZmZWN0aXZlVmlv bGF0ZWREaXJlY3RpdmUsIGNvbnN0IFN0cmluZyYgdmlvbGF0ZWREaXJlY3RpdmUsIGNvbnN0IENv bnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3QmIHZpb2xhdGVkRGlyZWN0aXZlTGlzdCwg Y29uc3QgVVJMJiBibG9ja2VkVVJMLCBjb25zdCBTdHJpbmcmIGNvbnNvbGVNZXNzYWdlLCBjb25z dCBTdHJpbmcmIHNvdXJjZVVSTCwgY29uc3QgVGV4dFBvc2l0aW9uJiBzb3VyY2VQb3NpdGlvbiwg SlNDOjpFeGVjU3RhdGUqIHN0YXRlKSBjb25zdAogewotICAgIGxvZ1RvQ29uc29sZShjb25zb2xl TWVzc2FnZSwgc291cmNlVVJMLCBzb3VyY2VQb3NpdGlvbi5tX2xpbmUsIHN0YXRlKTsKKyAgICBs b2dUb0NvbnNvbGUoY29uc29sZU1lc3NhZ2UsIHNvdXJjZVVSTCwgc291cmNlUG9zaXRpb24ubV9s aW5lLCBzb3VyY2VQb3NpdGlvbi5tX2NvbHVtbiwgc3RhdGUpOwogCiAgICAgaWYgKCFtX2lzUmVw b3J0aW5nRW5hYmxlZCkKICAgICAgICAgcmV0dXJuOwpAQCAtODQ5LDE2ICs4NDksMTUgQEAgdm9p ZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OnJlcG9ydE1pc3NpbmdSZXBvcnRVUkkoY29uc3QgU3Ry aW5nJiBwb2xpY3kpIGNvbnN0CiAgICAgbG9nVG9Db25zb2xlKCJUaGUgQ29udGVudCBTZWN1cml0 eSBQb2xpY3kgJyIgKyBwb2xpY3kgKyAiJyB3YXMgZGVsaXZlcmVkIGluIHJlcG9ydC1vbmx5IG1v ZGUsIGJ1dCBkb2VzIG5vdCBzcGVjaWZ5IGEgJ3JlcG9ydC11cmknOyB0aGUgcG9saWN5IHdpbGwg aGF2ZSBubyBlZmZlY3QuIFBsZWFzZSBlaXRoZXIgYWRkIGEgJ3JlcG9ydC11cmknIGRpcmVjdGl2 ZSwgb3IgZGVsaXZlciB0aGUgcG9saWN5IHZpYSB0aGUgJ0NvbnRlbnQtU2VjdXJpdHktUG9saWN5 JyBoZWFkZXIuIik7CiB9CiAKLXZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5Ojpsb2dUb0NvbnNv bGUoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBjb25zdCBTdHJpbmcmIGNvbnRleHRVUkwsIGNvbnN0 IFdURjo6T3JkaW5hbE51bWJlciYgY29udGV4dExpbmUsIEpTQzo6RXhlY1N0YXRlKiBzdGF0ZSkg Y29uc3QKK3ZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5Ojpsb2dUb0NvbnNvbGUoY29uc3QgU3Ry aW5nJiBtZXNzYWdlLCBjb25zdCBTdHJpbmcmIGNvbnRleHRVUkwsIGNvbnN0IFdURjo6T3JkaW5h bE51bWJlciYgY29udGV4dExpbmUsIGNvbnN0IFdURjo6T3JkaW5hbE51bWJlciYgY29udGV4dENv bHVtbiwgSlNDOjpFeGVjU3RhdGUqIHN0YXRlKSBjb25zdAogewogICAgIGlmICghbV9pc1JlcG9y dGluZ0VuYWJsZWQpCiAgICAgICAgIHJldHVybjsKIAotICAgIC8vIEZJWE1FOiA8aHR0cDovL3dl YmtpdC5vcmcvYi8xMTQzMTc+IENvbnRlbnRTZWN1cml0eVBvbGljeTo6bG9nVG9Db25zb2xlIHNo b3VsZCBpbmNsdWRlIGEgY29sdW1uIG51bWJlcgogICAgIGlmIChtX2NsaWVudCkKICAgICAgICAg bV9jbGllbnQtPmFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OlNlY3VyaXR5LCBNZXNz YWdlTGV2ZWw6OkVycm9yLCBtZXNzYWdlLCAwKTsKICAgICBlbHNlIGlmIChtX3NjcmlwdEV4ZWN1 dGlvbkNvbnRleHQpCi0gICAgICAgIG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC0+YWRkQ29uc29s ZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6U2VjdXJpdHksIE1lc3NhZ2VMZXZlbDo6RXJyb3IsIG1l c3NhZ2UsIGNvbnRleHRVUkwsIGNvbnRleHRMaW5lLm9uZUJhc2VkSW50KCksIDAsIHN0YXRlKTsK KyAgICAgICAgbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LT5hZGRDb25zb2xlTWVzc2FnZShNZXNz YWdlU291cmNlOjpTZWN1cml0eSwgTWVzc2FnZUxldmVsOjpFcnJvciwgbWVzc2FnZSwgY29udGV4 dFVSTCwgY29udGV4dExpbmUub25lQmFzZWRJbnQoKSwgY29udGV4dENvbHVtbi5vbmVCYXNlZElu dCgpLCBzdGF0ZSk7CiB9CiAKIHZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5OjpyZXBvcnRCbG9j a2VkU2NyaXB0RXhlY3V0aW9uVG9JbnNwZWN0b3IoY29uc3QgU3RyaW5nJiBkaXJlY3RpdmVUZXh0 KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3Vy aXR5UG9saWN5LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xp Y3kuaAppbmRleCAxN2Y3N2MyNmEwZmRiYTkzYWYzODM2YWM4MzljZjlkN2I2ZjkyODdhLi4zMTRh Mzc1OTg1NzZlZGQxOThjNGFjNDUxNDBlNmZkZmI2OTJhMmNhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaApAQCAtMTczLDcgKzE3Myw3IEBA IHB1YmxpYzoKICAgICB2b2lkIHNldENsaWVudChDb250ZW50U2VjdXJpdHlQb2xpY3lDbGllbnQq IGNsaWVudCkgeyBtX2NsaWVudCA9IGNsaWVudDsgfQogCiBwcml2YXRlOgotICAgIHZvaWQgbG9n VG9Db25zb2xlKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgY29uc3QgU3RyaW5nJiBjb250ZXh0VVJM ID0gU3RyaW5nKCksIGNvbnN0IFdURjo6T3JkaW5hbE51bWJlciYgY29udGV4dExpbmUgPSBXVEY6 Ok9yZGluYWxOdW1iZXI6OmJlZm9yZUZpcnN0KCksIEpTQzo6RXhlY1N0YXRlKiA9IG51bGxwdHIp IGNvbnN0OworICAgIHZvaWQgbG9nVG9Db25zb2xlKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgY29u c3QgU3RyaW5nJiBjb250ZXh0VVJMID0gU3RyaW5nKCksIGNvbnN0IFdURjo6T3JkaW5hbE51bWJl ciYgY29udGV4dExpbmUgPSBXVEY6Ok9yZGluYWxOdW1iZXI6OmJlZm9yZUZpcnN0KCksIGNvbnN0 IFdURjo6T3JkaW5hbE51bWJlciYgY29udGV4dENvbHVtbiA9IFdURjo6T3JkaW5hbE51bWJlcjo6 YmVmb3JlRmlyc3QoKSwgSlNDOjpFeGVjU3RhdGUqID0gbnVsbHB0cikgY29uc3Q7CiAgICAgdm9p ZCB1cGRhdGVTb3VyY2VTZWxmKGNvbnN0IFNlY3VyaXR5T3JpZ2luJik7CiAgICAgdm9pZCBhcHBs eVBvbGljeVRvU2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpOwogCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDdkZGZiZjY2OWU2 MzhlNDVhZWFmYmE4YjVmOWRlNGIwZTA4YWIwZC4uODMwOWQ5NzE3MjM0NmRkYTBlODJhNzMwZWE0 Yjg5YmFkOTc5M2I5MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE5LTAzLTE0ICBEZXZpbiBS b3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBDb250ZW50U2VjdXJpdHlQb2xp Y3k6OmxvZ1RvQ29uc29sZSBzaG91bGQgaW5jbHVkZSBsaW5lL2NvbHVtbiBudW1iZXIgYW5kIHNv dXJjZSBsb2NhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTE0MzE3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMzYxNDYxNz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1 Z2dlci9jc3AtZXhjZXB0aW9ucy5odG1sOgorCiAyMDE5LTAzLTE0ICBTaGF3biBSb2JlcnRzICA8 c3JvYmVydHNAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIy NDI5MzEuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvY3NwLWV4 Y2VwdGlvbnMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jc3AtZXhjZXB0 aW9ucy5odG1sCmluZGV4IDQ1YzQwZjk1MGFhN2I3OTQ5YjU0YThhOGRjYWMxMmNjYjI3YTRjNjQu LjQwYWZjNzljNWFmNmQ4YmM4ZTUwNzIyZjE0OTIxNzdkODI2ZmNkMjcgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jc3AtZXhjZXB0aW9ucy5odG1sCisrKyBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jc3AtZXhjZXB0aW9ucy5odG1sCkBAIC0zMiw4 ICszMiwxMSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgIH0pOwogCiAgICAgICAgICAg ICBXSS5jb25zb2xlTWFuYWdlci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXSS5Db25zb2xlTWFu YWdlci5FdmVudC5NZXNzYWdlQWRkZWQsIChldmVudCkgPT4gewotICAgICAgICAgICAgICAgIElu c3BlY3RvclRlc3QuYXNzZXJ0KGV2ZW50LmRhdGEubWVzc2FnZS5sZXZlbCA9PT0gV0kuQ29uc29s ZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkVycm9yKTsKLSAgICAgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LnBhc3MoIkNTUCBFeGNlcHRpb24gQ29uc29sZSBNZXNzYWdlOiAiICsgZXZlbnQuZGF0YS5t ZXNzYWdlLm1lc3NhZ2VUZXh0KTsKKyAgICAgICAgICAgICAgICBsZXQge21lc3NhZ2V9ID0gZXZl bnQuZGF0YTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChtZXNzYWdlLmxl dmVsID09PSBXSS5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuRXJyb3IpOworICAgICAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KG1lc3NhZ2UubGluZSA+IDApOworICAgICAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KG1lc3NhZ2UuY29sdW1uID4gMCk7CisgICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5wYXNzKCJDU1AgRXhjZXB0aW9uIENvbnNvbGUgTWVzc2Fn ZTogIiArIG1lc3NhZ2UubWVzc2FnZVRleHQpOwogICAgICAgICAgICAgICAgIHJlc29sdmUoKTsK ICAgICAgICAgICAgIH0pOwogICAgICAgICB9CkBAIC01Myw5ICs1NiwxMyBAQCBmdW5jdGlvbiB0 ZXN0KCkKICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgV0kuY29uc29sZU1hbmFnZXIuc2lu Z2xlRmlyZUV2ZW50TGlzdGVuZXIoV0kuQ29uc29sZU1hbmFnZXIuRXZlbnQuTWVzc2FnZUFkZGVk LCAoZXZlbnQpID0+IHsKICAgICAgICAgICAgICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIucmVtb3Zl RXZlbnRMaXN0ZW5lcihXSS5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuUGF1c2VkLCB0ZW1wUGF1c2VG YWlsTGlzdGVuZXIsIG51bGwpOwotICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0 KGV2ZW50LmRhdGEubWVzc2FnZS5sZXZlbCA9PT0gV0kuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxl dmVsLkVycm9yKTsKKworICAgICAgICAgICAgICAgIGxldCB7bWVzc2FnZX0gPSBldmVudC5kYXRh OworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KG1lc3NhZ2UubGV2ZWwgPT09 IFdJLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5FcnJvcik7CisgICAgICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5hc3NlcnQobWVzc2FnZS5saW5lID4gMCk7CisgICAgICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5hc3NlcnQobWVzc2FnZS5jb2x1bW4gPiAwKTsKICAgICAgICAgICAgICAg ICBJbnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKGRpZFBhdXNlLCAiQ1NQIEV4Y2VwdGlvbiBjYXVz ZWQgb3V0c2lkZSBvZiBzY3JpcHQgZXZhbHVhdGlvbiBzaG91bGQgbm90IHBhdXNlLiIpOwotICAg ICAgICAgICAgICAgIEluc3BlY3RvclRlc3QucGFzcygiQ1NQIEV4Y2VwdGlvbiBDb25zb2xlIE1l c3NhZ2U6ICIgKyBldmVudC5kYXRhLm1lc3NhZ2UubWVzc2FnZVRleHQpOworICAgICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QucGFzcygiQ1NQIEV4Y2VwdGlvbiBDb25zb2xlIE1lc3NhZ2U6ICIg KyBtZXNzYWdlLm1lc3NhZ2VUZXh0KTsKICAgICAgICAgICAgICAgICByZXNvbHZlKCk7CiAgICAg ICAgICAgICB9KTsKICAgICAgICAgfQo=