185035 2018-04-26 10:53:18 -0700 Rename NetworkLoadChecker::returnError() to NetworkLoadChecker::accessControlErrorForValidationHandler() 2018-04-26 11:30:33 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates achristensen aestes beidson webkit-bug-importer youennf oldest_to_newest 1418128 0 dbates 2018-04-26 10:53:18 -0700 The name NetworkLoadChecker::returnError() is disingenuous as this function can either return a ResourceRequest object or an Error object. We should come up with more accurate name for this function. 1418132 1 338893 dbates 2018-04-26 10:56:42 -0700 Created attachment 338893 Patch 1418134 2 338893 dbates 2018-04-26 10:58:22 -0700 Comment on attachment 338893 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338893&action=review > Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:193 > String message = makeString("Unsafe attempt to load URL ", request.url().stringCenterEllipsizedToLength(), " from origin ", m_origin->toString(), ". Domains, protocols and ports must match.\n"); Will rename message to error before landing. 1418138 3 338893 youennf 2018-04-26 11:02:28 -0700 Comment on attachment 338893 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338893&action=review > Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:147 > +NetworkLoadChecker::RequestOrError NetworkLoadChecker::createRequestOrError(String&& error) createRequestOrError seems a bit odd. How about createValidationError? 1418142 4 dbates 2018-04-26 11:12:50 -0700 (In reply to youenn fablet from comment #3) > Comment on attachment 338893 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=338893&action=review > > > Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:147 > > +NetworkLoadChecker::RequestOrError NetworkLoadChecker::createRequestOrError(String&& error) > > createRequestOrError seems a bit odd. > How about createValidationError? From our IRC conversation, will rename to accessControlErrorForValidationHandler. 1418152 5 dbates 2018-04-26 11:21:16 -0700 (In reply to Daniel Bates from comment #2) > Comment on attachment 338893 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=338893&action=review > > > Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:193 > > String message = makeString("Unsafe attempt to load URL ", request.url().stringCenterEllipsizedToLength(), " from origin ", m_origin->toString(), ". Domains, protocols and ports must match.\n"); > > Will rename message to error before landing. Actually will keep as-is and rename argument to accessControlErrorForValidationHandler() to message to describe that its argument represents the error message for the access control error. Will change other locals named "error" to "message" when passed to accessControlErrorForValidationHandler(). 1418162 6 dbates 2018-04-26 11:29:37 -0700 Committed r231059: <https://trac.webkit.org/changeset/231059> 1418163 7 webkit-bug-importer 2018-04-26 11:30:33 -0700 <rdar://problem/39764569> 338893 2018-04-26 10:56:42 -0700 2018-04-26 11:12:23 -0700 Patch bug-185035-20180426105642.patch text/plain 5445 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxMDUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDIzMzUxNmI4M2MyOWI5Y2Uz ODAwZTVkMTk3YzNkZDc4MzkzNjAwNzMuLjY5NGJlYzkxYWRjMjE1ZTgyNDhlZDI1MGY3ZmQ3NjU3 MzRlZGY0MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTgtMDQtMjYgIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBOZXR3b3JrTG9hZENo ZWNrZXI6OnJldHVybkVycm9yKCkgYXMgaXQgaXMgZGlzaW5nZW51b3VzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODUwMzUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgbmFtZSBOZXR3b3JrTG9hZENo ZWNrZXI6OnJldHVybkVycm9yKCkgaXMgZGlzaW5nZW51b3VzIGFzIHRoaXMgZnVuY3Rpb24gY2Fu IGVpdGhlciByZXR1cm4gYQorICAgICAgICBSZXNvdXJjZVJlcXVlc3Qgb2JqZWN0IG9yIGFuIEVy cm9yIG9iamVjdC4gUmVuYW1lIHRoaXMgZnVuY3Rpb24gdG8gY3JlYXRlUmVxdWVzdE9yRXJyb3Io KSB0bworICAgICAgICBiZXR0ZXIgZGVzY3JpYmUgd2hhdCBpdCByZXR1cm5zLgorCisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRDaGVja2VyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya0xvYWRDaGVja2VyOjpjaGVja1JlZGlyZWN0aW9uKToKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya0xvYWRDaGVja2VyOjpjcmVhdGVSZXF1ZXN0T3JFcnJvcik6CisgICAgICAgIChX ZWJLaXQ6Ok5ldHdvcmtMb2FkQ2hlY2tlcjo6Y2hlY2tSZXF1ZXN0KToKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya0xvYWRDaGVja2VyOjpjb250aW51ZUNoZWNraW5nUmVxdWVzdCk6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtMb2FkQ2hlY2tlcjo6cmV0dXJuRXJyb3IpOiBEZWxldGVkLgorICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkQ2hlY2tlci5oOgorCiAyMDE4LTA0LTI2 ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBEaXNhYmxl IGNvbnRlbnQgZmlsdGVyaW5nIGluIG1pbmltYWwgc2ltdWxhdG9yIG1vZGUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRDaGVja2VyLmNwcCBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRDaGVja2VyLmNwcAppbmRleCBh Y2Q5ZjZlYjE4MTgzYWViYjJhZDFlMmQwZTRhY2IyM2EzM2Y5NmQ5Li44NjcwNjAwYjAxMTJlMzdm ZGYzMzI5ODRjNjA3YjM4ODYyOWU3M2MyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL05ldHdvcmtMb2FkQ2hlY2tlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZENoZWNrZXIuY3BwCkBAIC05Miw3ICs5Miw3IEBAIHZvaWQg TmV0d29ya0xvYWRDaGVja2VyOjpjaGVja1JlZGlyZWN0aW9uKFdlYkNvcmU6OlJlc291cmNlUmVz cG9uc2UmIHJlZGlyZWN0UmVzCiAgICAgQVNTRVJUKCFpc0NoZWNraW5nKCkpOwogCiAgICAgaWYg KG1fb3B0aW9ucy5yZWRpcmVjdCAhPSBGZXRjaE9wdGlvbnM6OlJlZGlyZWN0OjpGb2xsb3cpIHsK LSAgICAgICAgaGFuZGxlcihyZXR1cm5FcnJvcihBU0NJSUxpdGVyYWwoIlJlZGlyZWN0aW9ucyBh cmUgbm90IGFsbG93ZWQiKSkpOworICAgICAgICBoYW5kbGVyKGNyZWF0ZVJlcXVlc3RPckVycm9y KEFTQ0lJTGl0ZXJhbCgiUmVkaXJlY3Rpb25zIGFyZSBub3QgYWxsb3dlZCIpKSk7CiAgICAgICAg IHJldHVybjsKICAgICB9CiAKQEAgLTEwMCw3ICsxMDAsNyBAQCB2b2lkIE5ldHdvcmtMb2FkQ2hl Y2tlcjo6Y2hlY2tSZWRpcmVjdGlvbihXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVj dFJlcwogICAgIC8vIFNlZSBodHRwczovL2dpdGh1Yi5jb20vd2hhdHdnL2ZldGNoL2lzc3Vlcy8z OTMKIAogICAgIGlmICgrK21fcmVkaXJlY3RDb3VudCA+IDIwKSB7Ci0gICAgICAgIGhhbmRsZXIo cmV0dXJuRXJyb3IoQVNDSUlMaXRlcmFsKCJMb2FkIGNhbm5vdCBmb2xsb3cgbW9yZSB0aGFuIDIw IHJlZGlyZWN0aW9ucyIpKSk7CisgICAgICAgIGhhbmRsZXIoY3JlYXRlUmVxdWVzdE9yRXJyb3Io QVNDSUlMaXRlcmFsKCJMb2FkIGNhbm5vdCBmb2xsb3cgbW9yZSB0aGFuIDIwIHJlZGlyZWN0aW9u cyIpKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTE0NCw3ICsxNDQsNyBAQCBSZXNv dXJjZUVycm9yIE5ldHdvcmtMb2FkQ2hlY2tlcjo6dmFsaWRhdGVSZXNwb25zZShSZXNvdXJjZVJl c3BvbnNlJiByZXNwb25zZSkKICAgICByZXR1cm4geyB9OwogfQogCi1OZXR3b3JrTG9hZENoZWNr ZXI6OlJlcXVlc3RPckVycm9yIE5ldHdvcmtMb2FkQ2hlY2tlcjo6cmV0dXJuRXJyb3IoU3RyaW5n JiYgZXJyb3IpCitOZXR3b3JrTG9hZENoZWNrZXI6OlJlcXVlc3RPckVycm9yIE5ldHdvcmtMb2Fk Q2hlY2tlcjo6Y3JlYXRlUmVxdWVzdE9yRXJyb3IoU3RyaW5nJiYgZXJyb3IpCiB7CiAgICAgcmV0 dXJuIG1ha2VVbmV4cGVjdGVkKFJlc291cmNlRXJyb3IgeyBTdHJpbmcgeyB9LCAwLCBtX3VybCwg V1RGTW92ZShlcnJvciksIFJlc291cmNlRXJyb3I6OlR5cGU6OkFjY2Vzc0NvbnRyb2wgfSk7CiB9 CkBAIC0xNTQsNyArMTU0LDcgQEAgdm9pZCBOZXR3b3JrTG9hZENoZWNrZXI6OmNoZWNrUmVxdWVz dChSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBWYWxpZGF0aW9uSGFuZGwKICNpZiBFTkFCTEUo Q09OVEVOVF9FWFRFTlNJT05TKQogICAgIHByb2Nlc3NDb250ZW50RXh0ZW5zaW9uUnVsZXNGb3JM b2FkKFdURk1vdmUocmVxdWVzdCksIFt0aGlzLCBoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVyKV0o YXV0byYmIHJlcXVlc3QsIGF1dG8gc3RhdHVzKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKHN0YXR1 cy5ibG9ja2VkTG9hZCkgewotICAgICAgICAgICAgaGFuZGxlcih0aGlzLT5yZXR1cm5FcnJvcihB U0NJSUxpdGVyYWwoIkJsb2NrZWQgYnkgY29udGVudCBleHRlbnNpb24iKSkpOworICAgICAgICAg ICAgaGFuZGxlcih0aGlzLT5jcmVhdGVSZXF1ZXN0T3JFcnJvcihBU0NJSUxpdGVyYWwoIkJsb2Nr ZWQgYnkgY29udGVudCBleHRlbnNpb24iKSkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICB9CiAgICAgICAgIHRoaXMtPmNvbnRpbnVlQ2hlY2tpbmdSZXF1ZXN0KFdURk1vdmUocmVxdWVz dCksIFdURk1vdmUoaGFuZGxlcikpOwpAQCAtMTc2LDcgKzE3Niw3IEBAIHZvaWQgTmV0d29ya0xv YWRDaGVja2VyOjpjb250aW51ZUNoZWNraW5nUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmJiByZXF1 ZXN0LCBWYWxpCiAgICAgICAgIH0KICAgICAgICAgaWYgKG1fb3B0aW9ucy5kZXN0aW5hdGlvbiA9 PSBGZXRjaE9wdGlvbnM6OkRlc3RpbmF0aW9uOjpFbXB0eVN0cmluZyAmJiAhY29udGVudFNlY3Vy aXR5UG9saWN5LT5hbGxvd0Nvbm5lY3RUb1NvdXJjZShyZXF1ZXN0LnVybCgpLCBpc1JlZGlyZWN0 ZWQoKSA/IENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVkaXJlY3RSZXNwb25zZVJlY2VpdmVkOjpZ ZXMgOiBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlJlZGlyZWN0UmVzcG9uc2VSZWNlaXZlZDo6Tm8p KSB7CiAgICAgICAgICAgICBTdHJpbmcgZXJyb3IgPSAhaXNSZWRpcmVjdGVkKCkgPyBBU0NJSUxp dGVyYWwoIkJsb2NrZWQgYnkgQ29udGVudCBTZWN1cml0eSBQb2xpY3kiKSA6IG1ha2VTdHJpbmco IkJsb2NrZWQgIiwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKSwgIiBieSBDb250ZW50IFNlY3VyaXR5 IFBvbGljeSIpOwotICAgICAgICAgICAgaGFuZGxlcihyZXR1cm5FcnJvcihXVEZNb3ZlKGVycm9y KSkpOworICAgICAgICAgICAgaGFuZGxlcihjcmVhdGVSZXF1ZXN0T3JFcnJvcihXVEZNb3ZlKGVy cm9yKSkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQpAQCAtMTkxLDcg KzE5MSw3IEBAIHZvaWQgTmV0d29ya0xvYWRDaGVja2VyOjpjb250aW51ZUNoZWNraW5nUmVxdWVz dChSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBWYWxpCiAKICAgICBpZiAobV9vcHRpb25zLm1v ZGUgPT0gRmV0Y2hPcHRpb25zOjpNb2RlOjpTYW1lT3JpZ2luKSB7CiAgICAgICAgIFN0cmluZyBt ZXNzYWdlID0gbWFrZVN0cmluZygiVW5zYWZlIGF0dGVtcHQgdG8gbG9hZCBVUkwgIiwgcmVxdWVz dC51cmwoKS5zdHJpbmdDZW50ZXJFbGxpcHNpemVkVG9MZW5ndGgoKSwgIiBmcm9tIG9yaWdpbiAi LCBtX29yaWdpbi0+dG9TdHJpbmcoKSwgIi4gRG9tYWlucywgcHJvdG9jb2xzIGFuZCBwb3J0cyBt dXN0IG1hdGNoLlxuIik7Ci0gICAgICAgIGhhbmRsZXIocmV0dXJuRXJyb3IoV1RGTW92ZShtZXNz YWdlKSkpOworICAgICAgICBoYW5kbGVyKGNyZWF0ZVJlcXVlc3RPckVycm9yKFdURk1vdmUobWVz c2FnZSkpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZENoZWNrZXIuaCBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRDaGVja2VyLmgKaW5kZXggNTA0MzM4Y2M0NTEyY2Ux Mjg3ZTVjOTg3NDk4OGY4M2I2MmM4ZGEwNC4uNzYxNTUwZjczZmRkMDZhZGY1ZmVmNDVkYTkzZmY1 NjQ2YzA0OGI4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrTG9hZENoZWNrZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtMb2FkQ2hlY2tlci5oCkBAIC04NCw3ICs4NCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBjaGVj a0NPUlNSZWRpcmVjdGVkUmVxdWVzdChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgVmFsaWRh dGlvbkhhbmRsZXImJik7CiAgICAgdm9pZCBjaGVja0NPUlNSZXF1ZXN0V2l0aFByZWZsaWdodChX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgVmFsaWRhdGlvbkhhbmRsZXImJik7CiAKLSAgICBS ZXF1ZXN0T3JFcnJvciByZXR1cm5FcnJvcihTdHJpbmcmJiBlcnJvcik7CisgICAgUmVxdWVzdE9y RXJyb3IgY3JlYXRlUmVxdWVzdE9yRXJyb3IoU3RyaW5nJiYgZXJyb3IpOwogCiAjaWYgRU5BQkxF KENPTlRFTlRfRVhURU5TSU9OUykKICAgICB2b2lkIHByb2Nlc3NDb250ZW50RXh0ZW5zaW9uUnVs ZXNGb3JMb2FkKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBjb25zdCBXZWJDb3JlOjpDb250ZW50RXh0 ZW5zaW9uczo6QmxvY2tlZFN0YXR1cyYpPiYmKTsK