Skip to content

GitLab

T
tangled
Commit 5f5d4a2e authored by japhet@chromium.org's avatar japhet@chromium.org
Browse files
Options

Don't use FrameLoader::m_provisionalItem for history state if a cross-origin 

redirect happens

BUG=500554

Review URL: https://codereview.chromium.org/1175113009

git-svn-id: svn://svn.chromium.org/blink/trunk@198022 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent c54dc856
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 2 deletions
third_party/WebKit/LayoutTests/http/tests/history/cross-origin-redirect-on-back.html 0 → 100644
View file @ 5f5d4a2e
<html>
<body>
<script>
if (window.testRunner) {
testRunner.dumpAsText();
testRunner.waitUntilDone();
}
window.onload = function() {
if (location.hash == "#back") {
document.body.appendChild(document.createTextNode("We pass if we don't crash."));
if (window.testRunner)
testRunner.notifyDone();
return;
}
setTimeout(function() {
history.replaceState({}, "", "#back");
history.pushState({}, "", "http://127.0.0.1:8000/resources/redirect.php?url=http://localhost:8000/history/resources/back.html");
location = "http://127.0.0.1:8000/history/resources/back.html";
}, 0);
};
</script>
</body>
</html>
third_party/WebKit/Source/core/loader/DocumentLoader.cpp
View file @ 5f5d4a2e
......@@ -388,7 +388,7 @@ void DocumentLoader::willSendRequest(ResourceRequest& newRequest, const Resource
return;
appendRedirect(newRequest.url());
frameLoader()->client()->dispatchDidReceiveServerRedirectForProvisionalLoad();
frameLoader()->receivedMainResourceRedirect(m_request.url());
if (!shouldContinueForNavigationPolicy(newRequest, CheckContentSecurityPolicy))
cancelMainResourceLoad(ResourceError::cancelledError(m_request.url()));
}
......
third_party/WebKit/Source/core/loader/FrameLoader.cpp
View file @ 5f5d4a2e
......@@ -340,10 +340,18 @@ void FrameLoader::replaceDocumentWhileExecutingJavaScriptURL(const String& sourc
documentLoader->replaceDocumentWhileExecutingJavaScriptURL(init, source, ownerDocument);
}
void FrameLoader::receivedMainResourceRedirect(const KURL& newURL)
{
client()->dispatchDidReceiveServerRedirectForProvisionalLoad();
// If a back/forward navigation redirects cross-origin, don't reuse any state from the HistoryItem.
if (m_provisionalItem && !SecurityOrigin::create(m_provisionalItem->url())->isSameSchemeHostPort(SecurityOrigin::create(newURL).get()))
m_provisionalItem.clear();
}
void FrameLoader::setHistoryItemStateForCommit(HistoryCommitType historyCommitType, HistoryNavigationType navigationType)
{
RefPtrWillBeRawPtr<HistoryItem> oldItem = m_currentItem;
if (historyCommitType == BackForwardCommit)
if (historyCommitType == BackForwardCommit && m_provisionalItem)
m_currentItem = m_provisionalItem.release();
else
m_currentItem = HistoryItem::create();
......
third_party/WebKit/Source/core/loader/FrameLoader.h
View file @ 5f5d4a2e
......@@ -156,6 +156,8 @@ public:
void finishedParsing();
void checkCompleted();
void receivedMainResourceRedirect(const KURL& newURL);
// This prepares the FrameLoader for the next commit. It will dispatch
// unload events, abort XHR requests and detach the document. Returns true
// if the frame is ready to receive the next commit, or false otherwise.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment