153170 2016-01-15 18:11:10 -0800 CSP: Fix parsing of 'host/path' source expressions 2016-02-16 13:18:20 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build All All RESOLVED FIXED BlinkMergeCandidate, InRadar P2 Normal --- 153168 1 dbates dbates bfulgham webkit-bug-importer oldest_to_newest 1156066 0 dbates 2016-01-15 18:11:10 -0800 We should merge <https://src.chromium.org/viewvc/blink?view=rev&revision=154875>. CSP: Fix parsing of 'host/path' source expressions. We currently accept 'host:port/path' source expressions in CSP directive source lists, but fail to properly parse 'host/path' as a valid source. This patch corrects the tiny logic error in path parsing. 1159625 1 webkit-bug-importer 2016-01-27 21:05:14 -0800 <rdar://problem/24383407> 1165248 2 271463 dbates 2016-02-16 12:14:51 -0800 Created attachment 271463 Patch 1165251 3 271463 bfulgham 2016-02-16 12:17:08 -0800 Comment on attachment 271463 Patch r=me, but why does the patch not apply to trunk? Please make sure test pass before landing, since EWS is not happy here. 1165259 4 dbates 2016-02-16 12:27:00 -0800 (In reply to comment #3) > Comment on attachment 271463 [details] > Patch > > r=me, but why does the patch not apply to trunk? Please make sure test pass > before landing, since EWS is not happy here. Notice that EWS bots fail to apply the changes to file LayoutTests/TestExpectations, included in this patch: <https://webkit-queues.webkit.org/results/841475>. These changes fail to apply because the LayoutTests/TestExpectations diff depends on the changes to the file LayoutTests/TestExpectations made in the patch for bug #153168. I verified locally that all tests pass with this patch (attachment #271463). 1165287 5 271463 dbates 2016-02-16 13:18:17 -0800 Comment on attachment 271463 Patch Clearing flags on attachment: 271463 Committed r196655: <http://trac.webkit.org/changeset/196655> 1165288 6 dbates 2016-02-16 13:18:20 -0800 All reviewed patches have been landed. Closing bug. 271463 2016-02-16 12:14:51 -0800 2016-02-16 13:18:17 -0800 Patch bug-153170-20160216121431.patch text/plain 4097 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2NjE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjhkNWZlYjYyZTdhMTU2 MDY3MWQ4NDhlMmEzMjdhNWMyNWMzYTUxMS4uNjFmNmM0ZjdjYzJlNDQ4Yzg5NjFmMTBiNDc3MDc1 YWMzNGRkY2UzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE2LTAyLTE2ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAgICAgICBDU1A6IEZpeCBwYXJzaW5n IG9mICdob3N0L3BhdGgnIHNvdXJjZSBleHByZXNzaW9ucworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUzMTcwCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8yNDM4MzQwNz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBNZXJnZWQgZnJvbSBCbGluayAocGF0Y2ggYnkgTWlrZSBXZXN0KToKKyAgICAgICAgPGh0 dHBzOi8vc3JjLmNocm9taXVtLm9yZy92aWV3dmMvYmxpbms/cmV2aXNpb249MTU0ODc1JnZpZXc9 cmV2aXNpb24+CisKKyAgICAgICAgRml4ZXMgYW4gaXNzdWUgd2hlcmUgYSBzb3VyY2Ugb2YgdGhl IGZvcm0gZXhhbXBsZS5jb20vQS8gd2FzIGluY29ycmVjdGx5IGNvbnNpZGVyZWQKKyAgICAgICAg aW52YWxpZCBhbmQgaGVuY2Ugc3VjaCBhIHJlcXVlc3RlZCByZXNvdXJjZSB3b3VsZCBiZSBibG9j a2VkLiBBIHNvdXJjZSBvZiB0aGlzIGZvcm0KKyAgICAgICAgaXMgdmFsaWQgYnkgdGhlIGRlZmlu aXRpb24gb2YgaG9zdC1zb3VyY2UgaW4gc2VjdGlvbiBTb3VyY2UgTGlzdCBTeW50YXggb2YgdGhl IENvbnRlbnQKKyAgICAgICAgU2VjdXJpdHkgUG9saWN5IDIuMCBzcGVjLiwgPGh0dHA6Ly93d3cu dzMub3JnL1RSLzIwMTUvQ1ItQ1NQMi0yMDE1MDcyMS8+LgorCisgICAgICAgICogcGFnZS9jc3Av Q29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD b250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0OjpwYXJzZVNvdXJjZSk6CisKKzIwMTYtMDIt MTYgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCiAgICAgICAgIERpc2FsbG93 IGFuIGVtcHR5IGhvc3QgaW4gYSBDU1AgaG9zdC1zb3VyY2UgZGlyZWN0aXZlCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTMxNjgKICAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzI0MzgzMzY2PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9j c3AvQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0LmNwcAppbmRleCBiYTViMzQx N2MwZTQyNzQ0NWZiNWI5MjU2NmM2NDJlMjZmNzhjY2YxLi5mM2RhYzdiZDU5ZmNjMTViODU5MGQz NTM0YzY3OTY1MzdmNTViNDJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9D b250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0LmNwcApAQCAtMTk4LDExICsx OTgsNyBAQCBib29sIENvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3Q6OnBhcnNlU291cmNl KGNvbnN0IFVDaGFyKiBiZWdpbiwgY29uc3QgVUNoYQogICAgIGlmIChwb3NpdGlvbiA8IGVuZCAm JiAqcG9zaXRpb24gPT0gJy8nKSB7CiAgICAgICAgIC8vIGhvc3QvcGF0aCB8fCBob3N0LyB8fCAv CiAgICAgICAgIC8vICAgICBeICAgICAgICAgICAgXiAgICBeCi0gICAgICAgIGlmICghcGFyc2VI b3N0KGJlZ2luSG9zdCwgcG9zaXRpb24sIGhvc3QsIGhvc3RIYXNXaWxkY2FyZCkKLSAgICAgICAg ICAgIHx8ICFwYXJzZVBhdGgocG9zaXRpb24sIGVuZCwgcGF0aCkKLSAgICAgICAgICAgIHx8IHBv c2l0aW9uICE9IGVuZCkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgcmV0dXJu IHRydWU7CisgICAgICAgIHJldHVybiBwYXJzZUhvc3QoYmVnaW5Ib3N0LCBwb3NpdGlvbiwgaG9z dCwgaG9zdEhhc1dpbGRjYXJkKSAmJiBwYXJzZVBhdGgocG9zaXRpb24sIGVuZCwgcGF0aCk7CiAg ICAgfQogCiAgICAgaWYgKHBvc2l0aW9uIDwgZW5kICYmICpwb3NpdGlvbiA9PSAnOicpIHsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCBiOGQ4YjlmYjAyNGMzNTJmNDljNTVhNjBjMmNlYWEwYzk4YzJhODVhLi4zMjM1YzY0ZWY5 YzdmMzBhMzQyMTllODliZGU3ZGVhYzM0ODQ2ZjBjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIw MTYtMDItMTYgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCisgICAgICAgIENT UDogRml4IHBhcnNpbmcgb2YgJ2hvc3QvcGF0aCcgc291cmNlIGV4cHJlc3Npb25zCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTMxNzAKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzI0MzgzNDA3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJlbW92ZSBlbnRyeSBmb3IgdGVzdCBodHRwL3Rlc3RzL3NlY3Vy aXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9zb3VyY2UtbGlzdC1wYXJzaW5nLXBhdGhzLTAzLmh0 bWwKKyAgICAgICAgYXMgaXQgbm93IHBhc3Nlcy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlv bnM6CisKKzIwMTYtMDItMTYgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCiAg ICAgICAgIERpc2FsbG93IGFuIGVtcHR5IGhvc3QgaW4gYSBDU1AgaG9zdC1zb3VyY2UgZGlyZWN0 aXZlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTMx NjgKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI0MzgzMzY2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5k ZXggNDRhYjJjYjEzOTU0OGE0YmVjZWViNmVjMTk0NTMzZTU0NDAzYzJhOC4uMjI3Zjc0NzRmOGRk MWMyN2RmNTAyZjQ4MzIxYWE2NzVmZDdkNjIwZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVz dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC04MzMs NyArODMzLDYgQEAgd2Via2l0Lm9yZy9iLzE1MzE2NiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRl bnRTZWN1cml0eVBvbGljeS9yZXBvcnQtdXJpLWZyb20tamEKIHdlYmtpdC5vcmcvYi8xNTMxNjYg aHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVwb3J0LXVyaS5odG1s IFsgRmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTUzMTY2IHdlYmtpdC5vcmcvYi8xNTMyNDIgaHR0 cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVwb3J0LWFuZC1lbmZvcmNl Lmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xNTMxNjYgd2Via2l0Lm9yZy9iLzE1MzI0 MiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXBvcnQtYmxvY2tl ZC1kYXRhLXVyaS5odG1sIFsgRmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMTUzMTcwIGh0dHAvdGVz dHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3NvdXJjZS1saXN0LXBhcnNpbmctcGF0 aHMtMDMuaHRtbCBbIEZhaWx1cmUgXQogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJp dHlQb2xpY3kvc2NyaXB0LXNyYy1ibG9ja2VkLWVycm9yLWV2ZW50Lmh0bWwgWyBQYXNzIEZhaWx1 cmUgXQogCiAjIFRoZXNlIHN0YXRlIG9iamVjdCB0ZXN0cyBwdXJwb3NlZnVsbHkgc3RyZXNzIGEg cmVzb3VyY2UgbGltaXQsIGFuZCB0YWtlIG11bHRpcGxlIHNlY29uZHMgdG8gcnVuLgo=