https://bugs.webkit.org/show_bug.cgi?id=69003
Patch by Sergey Glazunov <serg.glazunov@gmail.com> on 2011-09-28
Reviewed by Adam Barth.
Source/WebCore:
Test: http/tests/security/cookies/cookie-theft-with-javascript-doc.html
* dom/Document.h:
(WebCore::Document::setCookieURL):
* loader/DocumentWriter.cpp:
(WebCore::DocumentWriter::replaceDocument):
(WebCore::DocumentWriter::begin):
* loader/DocumentWriter.h:
LayoutTests:
* http/tests/security/cookies/cookie-theft-with-javascript-doc-expected.txt: Added.
* http/tests/security/cookies/cookie-theft-with-javascript-doc.html: Added.
* http/tests/security/cookies/resources/innocent-victim-with-cookies.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96260
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2011-09-28 Sergey Glazunov <serg.glazunov@gmail.com>
+
+ JavaScript generated documents don't inherit the cookie URL
+ https://bugs.webkit.org/show_bug.cgi?id=69003
+
+ Reviewed by Adam Barth.
+
+ * http/tests/security/cookies/cookie-theft-with-javascript-doc-expected.txt: Added.
+ * http/tests/security/cookies/cookie-theft-with-javascript-doc.html: Added.
+ * http/tests/security/cookies/resources/innocent-victim-with-cookies.html: Added.
+
2011-09-28 Dimitri Glazkov <dglazkov@chromium.org>
REGRESSION(r95573): Crash when loading SVG documents in a flattened frame or any SVG document in Chromium/Mac.
--- /dev/null
+<html>
+<head>
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ layoutTestController.setCanOpenWindows();
+ layoutTestController.setCloseRemainingWindowsWhenComplete(true);
+}
+
+window.onload = function()
+{
+ frame = document.body.appendChild(document.createElement("iframe"));
+ frame.src = "about:blank";
+ frame.onload = function() {
+ frame.onload = null;
+
+ wnd = frame.contentWindow.open();
+ frame.src = "http://localhost:8080/security/cookies/resources/innocent-victim-with-cookies.html";
+ window.onmessage = function(e) {
+ key = e.data;
+ wnd.location = "javascript:('bar')";
+ setTimeout(finishTest, 0);
+ }
+ }
+}
+
+function finishTest()
+{
+ document.body.textContent = wnd.document.cookie.indexOf(key) != -1 ? "FAILURE" : "SUCCESS";
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+}
+</script>
+</head>
+<body>
+</body>
+</html>
\ No newline at end of file
--- /dev/null
+<html>
+<body>
+<script>
+k = Math.floor(Math.random() * 1000000);
+document.cookie = "secretcookie=" + k + ";path=/";
+parent.postMessage(k, "*");
+</script>
+</body>
+</html>
\ No newline at end of file
+2011-09-28 Sergey Glazunov <serg.glazunov@gmail.com>
+
+ JavaScript generated documents don't inherit the cookie URL
+ https://bugs.webkit.org/show_bug.cgi?id=69003
+
+ Reviewed by Adam Barth.
+
+ Test: http/tests/security/cookies/cookie-theft-with-javascript-doc.html
+
+ * dom/Document.h:
+ (WebCore::Document::setCookieURL):
+ * loader/DocumentWriter.cpp:
+ (WebCore::DocumentWriter::replaceDocument):
+ (WebCore::DocumentWriter::begin):
+ * loader/DocumentWriter.h:
+
2011-09-27 Dimitri Glazkov <dglazkov@chromium.org>
REGRESSION(r95573): Crash when loading SVG documents in a flattened frame or any SVG document in Chromium/Mac.
// inherits its cookieURL but not its URL.
//
const KURL& cookieURL() const { return m_cookieURL; }
+ void setCookieURL(const KURL& url) { m_cookieURL = url; }
// The firstPartyForCookies is used to compute whether this document
// appears in a "third-party" context for the purpose of third-party
void DocumentWriter::replaceDocument(const String& source)
{
m_frame->loader()->stopAllLoaders();
- begin(m_frame->document()->url(), true, m_frame->document()->securityOrigin());
+ begin(m_frame->document()->url(), true, InheritSecurityOrigin);
if (!source.isNull()) {
if (!m_hasReceivedSomeData) {
return DOMImplementation::createDocument(m_mimeType, m_frame, url, m_frame->inViewSourceMode());
}
-void DocumentWriter::begin(const KURL& urlReference, bool dispatch, SecurityOrigin* origin)
+void DocumentWriter::begin(const KURL& urlReference, bool dispatch, SecurityOriginSource originSource)
{
- // We need to take a reference to the security origin because |clear|
- // might destroy the document that owns it.
- RefPtr<SecurityOrigin> forcedSecurityOrigin = origin;
+ RefPtr<Document> oldDocument = m_frame->document();
// We grab a local copy of the URL because it's easy for callers to supply
// a URL that will be deallocated during the execution of this function.
if (m_decoder)
document->setDecoder(m_decoder.get());
- if (forcedSecurityOrigin)
- document->setSecurityOrigin(forcedSecurityOrigin.get());
+ if (originSource == InheritSecurityOrigin) {
+ document->setCookieURL(oldDocument->cookieURL());
+ document->setSecurityOrigin(oldDocument->securityOrigin());
+ }
m_frame->domWindow()->setURL(document->url());
m_frame->domWindow()->setSecurityOrigin(document->securityOrigin());
// and always contains the result of evaluating a javascript: url.
void replaceDocument(const String&);
+ enum SecurityOriginSource { CreateNewSecurityOrigin, InheritSecurityOrigin };
+
void begin();
- void begin(const KURL&, bool dispatchWindowObjectAvailable = true, SecurityOrigin* forcedSecurityOrigin = 0);
+ void begin(const KURL&, bool dispatchWindowObjectAvailable = true, SecurityOriginSource = CreateNewSecurityOrigin);
void addData(const char* bytes, size_t length);
void end();
void endIfNotLoadingMainResource();
projects / profile / ivi / webkit-efl.git / commitdiff