<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194910] branches/safari-601.1.46-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194910">194910</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-12 11:31:29 -0800 (Tue, 12 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194666">r194666</a>. rdar://problem/24101185</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreloaderDocumentLoadercpp">branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreloaderFrameLoadercpp">branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreloaderFrameLoaderh">branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestshttptestssecurityblockedonredirectexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/http/tests/security/blocked-on-redirect-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestshttptestssecurityblockedonredirecthtml">branches/safari-601.1.46-branch/LayoutTests/http/tests/security/blocked-on-redirect.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (194909 => 194910)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-12 19:31:26 UTC (rev 194909)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-12 19:31:29 UTC (rev 194910)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194666. rdar://problem/24101185
+
+ 2016-01-06 Brent Fulgham <bfulgham@apple.com>
+
+ Port blocking bypass issue using 307 redirect
+ https://bugs.webkit.org/show_bug.cgi?id=152801
+ <rdar://problem/24048554>
+
+ Reviewed by Anders Carlsson.
+
+ * http/tests/security/blocked-on-redirect-expected.txt: Added.
+ * http/tests/security/blocked-on-redirect.html: Added.
+
+2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194038. rdar://problem/24101170
</span><span class="cx">
</span><span class="cx"> 2015-12-14 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestssecurityblockedonredirectexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/http/tests/security/blocked-on-redirect-expected.txt (0 => 194910)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/security/blocked-on-redirect-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/security/blocked-on-redirect-expected.txt 2016-01-12 19:31:29 UTC (rev 194910)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+http://127.0.0.1:8000/resources/redirect.php?code=307&url=http://localhost:25/security/resources/post-done.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/resources/redirect.php?code=307&url=http://localhost:25/security/resources/post-done.html, main document URL http://127.0.0.1:8000/security/blocked-on-redirect.html, http method GET> redirectResponse (null)
+http://127.0.0.1:8000/security/blocked-on-redirect.html - didFinishLoading
+CONSOLE MESSAGE: Not allowed to use restricted network port: http://localhost:25/security/resources/post-done.html
+http://127.0.0.1:8000/resources/redirect.php?code=307&url=http://localhost:25/security/resources/post-done.html - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://localhost:25/security/resources/post-done.html">
+This test produces output in the console. Only the initial URL should be logged.
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestssecurityblockedonredirecthtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/http/tests/security/blocked-on-redirect.html (0 => 194910)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/security/blocked-on-redirect.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/security/blocked-on-redirect.html 2016-01-12 19:31:29 UTC (rev 194910)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpResourceLoadCallbacks();
+}
+</script>
+
+This test produces output in the console. Only the initial URL should be logged.
+
+<iframe src = "http://127.0.0.1:8000/resources/redirect.php?code=307&url=http://localhost:25/security/resources/post-done.html"></iframe>
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (194909 => 194910)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-12 19:31:26 UTC (rev 194909)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-12 19:31:29 UTC (rev 194910)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194666. rdar://problem/24101185
+
+ 2016-01-06 Brent Fulgham <bfulgham@apple.com>
+
+ Port blocking bypass issue using 307 redirect
+ https://bugs.webkit.org/show_bug.cgi?id=152801
+ <rdar://problem/24048554>
+
+ Reviewed by Anders Carlsson.
+
+ Tested by http/tests/security/blocked-on-redirect.html.
+
+ Make sure that 307 redirects check the requested URL via 'portAllowed'.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::willSendRequest): Confirm that the requested port
+ is valid, and block load if it is not.
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::reportBlockedPortFailed): Added.
+ (WebCore::FrameLoader::blockedError): Added.
+ * loader/FrameLoader.h:
+
+2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194038. rdar://problem/24101170
</span><span class="cx">
</span><span class="cx"> 2015-12-14 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp (194909 => 194910)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp 2016-01-12 19:31:26 UTC (rev 194909)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp 2016-01-12 19:31:29 UTC (rev 194910)
</span><span class="lines">@@ -512,6 +512,11 @@
</span><span class="cx"> cancelMainResourceLoad(frameLoader()->cancelledError(newRequest));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+ if (!portAllowed(newRequest.url())) {
+ FrameLoader::reportBlockedPortFailed(m_frame, newRequest.url().string());
+ cancelMainResourceLoad(frameLoader()->blockedError(newRequest));
+ return;
+ }
</ins><span class="cx"> timing().addRedirect(redirectResponse.url(), newRequest.url());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.cpp (194909 => 194910)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.cpp 2016-01-12 19:31:26 UTC (rev 194909)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.cpp 2016-01-12 19:31:29 UTC (rev 194910)
</span><span class="lines">@@ -1493,6 +1493,15 @@
</span><span class="cx"> frame->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Not allowed to load local resource: " + url);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void FrameLoader::reportBlockedPortFailed(Frame* frame, const String& url)
+{
+ ASSERT(!url.isEmpty());
+ if (!frame)
+ return;
+
+ frame->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Not allowed to use restricted network port: " + url);
+}
+
</ins><span class="cx"> const ResourceRequest& FrameLoader::initialRequest() const
</span><span class="cx"> {
</span><span class="cx"> return activeDocumentLoader()->originalRequest();
</span><span class="lines">@@ -3324,6 +3333,13 @@
</span><span class="cx"> return error;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ResourceError FrameLoader::blockedError(const ResourceRequest& request) const
+{
+ ResourceError error = m_client.blockedError(request);
+ error.setIsCancellation(true);
+ return error;
+}
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> RetainPtr<CFDictionaryRef> FrameLoader::connectionProperties(ResourceLoader* loader)
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.h (194909 => 194910)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.h 2016-01-12 19:31:26 UTC (rev 194909)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.h 2016-01-12 19:31:29 UTC (rev 194910)
</span><span class="lines">@@ -133,6 +133,7 @@
</span><span class="cx"> void retryAfterFailedCacheOnlyMainResourceLoad();
</span><span class="cx">
</span><span class="cx"> static void reportLocalLoadFailed(Frame*, const String& url);
</span><ins>+ static void reportBlockedPortFailed(Frame*, const String& url);
</ins><span class="cx">
</span><span class="cx"> // FIXME: These are all functions which stop loads. We have too many.
</span><span class="cx"> WEBCORE_EXPORT void stopAllLoaders(ClearProvisionalItemPolicy = ShouldClearProvisionalItem);
</span><span class="lines">@@ -170,6 +171,7 @@
</span><span class="cx"> void handleFallbackContent();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT ResourceError cancelledError(const ResourceRequest&) const;
</span><ins>+ ResourceError blockedError(const ResourceRequest&) const;
</ins><span class="cx">
</span><span class="cx"> bool isHostedByObjectElement() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>