192076 2018-11-28 06:53:11 -0800 Remove some superfluous code in ContentSecurityPolicy::upgradeInsecureRequestIfNeeded 2018-12-28 22:49:37 -0800 1 1 1 Unclassified WebKit New Bugs Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis commit-queue dbates ews-watchlist fred.wang mkwst Sean.Roshon webkit-bug-importer oldest_to_newest 1482417 0 rbuis 2018-11-28 06:53:11 -0800 Remove some superfluous code in ContentSecurityPolicy::upgradeInsecureRequestIfNeeded. 1482421 1 355870 rbuis 2018-11-28 07:01:10 -0800 Created attachment 355870 Patch 1482654 2 355870 fred.wang 2018-11-28 14:12:14 -0800 Comment on attachment 355870 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=355870&action=review > Source/WebCore/ChangeLog:12 > + maybe mention the early return at the beginning of the function. > Source/WebCore/page/csp/ContentSecurityPolicy.cpp:885 > + unnecessary whitespace change. > Source/WebCore/page/csp/ContentSecurityPolicy.cpp:-894 > - return; I wonder if we want an ASSERT(url.protocolIs("ws")) or ASSERT_NOT_REACHED instead, to prevent potential mistakes if new protocols are added in the future. 1482862 3 355984 rbuis 2018-11-29 00:08:14 -0800 Created attachment 355984 Patch 1482918 4 355984 commit-queue 2018-11-29 04:34:34 -0800 Comment on attachment 355984 Patch Clearing flags on attachment: 355984 Committed r238666: <https://trac.webkit.org/changeset/238666> 1482919 5 commit-queue 2018-11-29 04:34:35 -0800 All reviewed patches have been landed. Closing bug. 1482920 6 webkit-bug-importer 2018-11-29 04:35:35 -0800 <rdar://problem/46339247> 355870 2018-11-28 07:01:10 -0800 2018-11-29 00:08:10 -0800 Patch bug-192076-20181128160110.patch text/plain 1830 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Q1MmVhM2Q4YWVhNmFk MTQzNzY0MTg3OTA3ZmI5ZThjN2YwNjNmNC4uYTU4NDczMDFkNjVmMmQ5ODAwZTZjYmIwNGE5MDNl MzhkYzUyOWU3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE4LTExLTI4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHNvbWUgc3VwZXJmbHVv dXMgY29kZSBpbiBDb250ZW50U2VjdXJpdHlQb2xpY3k6OnVwZ3JhZGVJbnNlY3VyZVJlcXVlc3RJ Zk5lZWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTkyMDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmVtb3ZlIG9uZSB1bm5lZWRlZCBpZiBjaGVjayBhbmQgb25lIHVucmVhY2hhYmxlIHJldHVybiBz dGF0ZW1lbnQuCisKKyAgICAgICAgKiBwYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5Ojp1cGdyYWRlSW5zZWN1 cmVSZXF1ZXN0SWZOZWVkZWQgY29uc3QpOgorCiAyMDE4LTExLTI3ICBSb2IgQnVpcyAgPHJidWlz QGlnYWxpYS5jb20+CiAKICAgICAgICAgQmxvY2sgbW9yZSBwb3J0cyAoNDI3LCA1NDgsIDY2OTcp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xp Y3kuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNw cAppbmRleCA5Yjk2NmZhMDJiOGI1N2YxMmIwODJlM2RiOTY0ZDNlNDU1MDRjNjM3Li4yYjBjNzhh MTJiNDBkODg2ZmUzNWM3ZDQ3MDk0NTNlZDU2MDZhNTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKQEAgLTg4MiwxNyArODgyLDE1 IEBAIHZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5Ojp1cGdyYWRlSW5zZWN1cmVSZXF1ZXN0SWZO ZWVkZWQoVVJMJiB1cmwsIEluc2VjdXJlUmVxCiAgICAgYm9vbCB1cGdyYWRlUmVxdWVzdCA9IG1f aW5zZWN1cmVOYXZpZ2F0aW9uUmVxdWVzdHNUb1VwZ3JhZGUuY29udGFpbnMoU2VjdXJpdHlPcmln aW5EYXRhOjpmcm9tVVJMKHVybCkpOwogICAgIGlmIChyZXF1ZXN0VHlwZSA9PSBJbnNlY3VyZVJl cXVlc3RUeXBlOjpMb2FkIHx8IHJlcXVlc3RUeXBlID09IEluc2VjdXJlUmVxdWVzdFR5cGU6OkZv cm1TdWJtaXNzaW9uKQogICAgICAgICB1cGdyYWRlUmVxdWVzdCB8PSBtX3VwZ3JhZGVJbnNlY3Vy ZVJlcXVlc3RzOwotICAgIAorCiAgICAgaWYgKCF1cGdyYWRlUmVxdWVzdCkKICAgICAgICAgcmV0 dXJuOwogCiAgICAgaWYgKHVybC5wcm90b2NvbElzKCJodHRwIikpCiAgICAgICAgIHVybC5zZXRQ cm90b2NvbCgiaHR0cHMiKTsKLSAgICBlbHNlIGlmICh1cmwucHJvdG9jb2xJcygid3MiKSkKLSAg ICAgICAgdXJsLnNldFByb3RvY29sKCJ3c3MiKTsKICAgICBlbHNlCi0gICAgICAgIHJldHVybjsK LSAgICAKKyAgICAgICAgdXJsLnNldFByb3RvY29sKCJ3c3MiKTsKKwogICAgIGlmICh1cmwucG9y dCgpICYmIHVybC5wb3J0KCkudmFsdWUoKSA9PSA4MCkKICAgICAgICAgdXJsLnNldFBvcnQoNDQz KTsKIH0K 355984 2018-11-29 00:08:14 -0800 2018-11-29 04:34:34 -0800 Patch bug-192076-20181129090813.patch text/plain 2025 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWE3OGZhOTNjMTQ5ZTUx YTg2YjNmYjAxODBmNWY3NWVmNmI3MmQ2Mi4uY2E5ZDhiZjNlMDA0MWY4OWE5ZDg0NmMwYjI5ODBh NTkyMjQ3YmY3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTExLTI4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHNvbWUgc3VwZXJmbHVv dXMgY29kZSBpbiBDb250ZW50U2VjdXJpdHlQb2xpY3k6OnVwZ3JhZGVJbnNlY3VyZVJlcXVlc3RJ Zk5lZWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTkyMDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRnLDqWTDqXJpYyBXYW5nLgorCisgICAgICAg IFNpbmNlIHdlIGRvIGFuIGVhcmx5IHJldHVybiBpZiB0aGUgcHJvdG9jb2wgaXMgbm90IGh0dHAg b3Igd3MsIHRoZSBpZiBjaGVjaworICAgICAgICBmb3Igd3MgcHJvdG9jb2wgYW5kIGVsc2Ugc3Rh dGVtZW50IGFyZSBub3QgbmVlZGVkLCBzbyB1c2UgYW4gQVNTRVJUIGluc3RlYWQuCisKKyAgICAg ICAgKiBwYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q29udGVudFNlY3VyaXR5UG9saWN5Ojp1cGdyYWRlSW5zZWN1cmVSZXF1ZXN0SWZOZWVkZWQg Y29uc3QpOgorCiAyMDE4LTExLTI4ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUu Y29tPgogCiAgICAgICAgIFtpT1NNYWNdIERyb3BwaW5nIHRleHQgc2VsZWN0aW9ucyBmcm9tIHdl YiBjb250ZW50IGludG8gZWRpdGFibGUgZWxlbWVudHMgY3Jhc2hlcyB0aGUgd2ViIHByb2Nlc3MK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGlj eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3Bw CmluZGV4IDliOTY2ZmEwMmI4YjU3ZjEyYjA4MmUzZGI5NjRkM2U0NTUwNGM2MzcuLjc1MWZkNzBk ZGJkZDlmNTUyMDY4ZmY5NTlkMGFjYzBlZjk1ZGI0MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcApAQCAtODgyLDE3ICs4ODIsMTcg QEAgdm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OnVwZ3JhZGVJbnNlY3VyZVJlcXVlc3RJZk5l ZWRlZChVUkwmIHVybCwgSW5zZWN1cmVSZXEKICAgICBib29sIHVwZ3JhZGVSZXF1ZXN0ID0gbV9p bnNlY3VyZU5hdmlnYXRpb25SZXF1ZXN0c1RvVXBncmFkZS5jb250YWlucyhTZWN1cml0eU9yaWdp bkRhdGE6OmZyb21VUkwodXJsKSk7CiAgICAgaWYgKHJlcXVlc3RUeXBlID09IEluc2VjdXJlUmVx dWVzdFR5cGU6OkxvYWQgfHwgcmVxdWVzdFR5cGUgPT0gSW5zZWN1cmVSZXF1ZXN0VHlwZTo6Rm9y bVN1Ym1pc3Npb24pCiAgICAgICAgIHVwZ3JhZGVSZXF1ZXN0IHw9IG1fdXBncmFkZUluc2VjdXJl UmVxdWVzdHM7Ci0gICAgCisKICAgICBpZiAoIXVwZ3JhZGVSZXF1ZXN0KQogICAgICAgICByZXR1 cm47CiAKICAgICBpZiAodXJsLnByb3RvY29sSXMoImh0dHAiKSkKICAgICAgICAgdXJsLnNldFBy b3RvY29sKCJodHRwcyIpOwotICAgIGVsc2UgaWYgKHVybC5wcm90b2NvbElzKCJ3cyIpKQorICAg IGVsc2UgeworICAgICAgICBBU1NFUlQodXJsLnByb3RvY29sSXMoIndzIikpOwogICAgICAgICB1 cmwuc2V0UHJvdG9jb2woIndzcyIpOwotICAgIGVsc2UKLSAgICAgICAgcmV0dXJuOwotICAgIAor ICAgIH0KKwogICAgIGlmICh1cmwucG9ydCgpICYmIHVybC5wb3J0KCkudmFsdWUoKSA9PSA4MCkK ICAgICAgICAgdXJsLnNldFBvcnQoNDQzKTsKIH0K