Check for equality of the URL's origin in replaceState/pushState

third_party/WebKit/Source/core/frame/History.cpp

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 150 matching lines @@
 
     return KURL(document->baseURL(), urlString);
 }
 
 void History::stateObjectAdded(PassRefPtr<SerializedScriptValue> data, const String& /* title */, const String& urlString, HistoryScrollRestorationType restorationType, FrameLoadType type, ExceptionState& exceptionState)
 {
     if (!m_frame || !m_frame->page() || !m_frame->loader().documentLoader())
         return;
 
     KURL fullURL = urlForState(urlString);
-    if (!fullURL.isValid() || !m_frame->document()->securityOrigin()->canRequest(fullURL)) {
+    Document* document = m_frame->document();
+    if (!fullURL.isValid() || !document->securityOrigin()->areSamePageUrls(fullURL, document->url())) {

[Mike West, 2015/12/08 13:45:19]

If we need a special case for `pushState`/`replaceState`, I'd prefer to put it
here, rather than special-casing things in `SecurityOrigin` and `KURL`.

[robwu, 2015/12/08 14:06:39]

Will do.

         // We can safely expose the URL to JavaScript, as a) no redirection takes place: JavaScript already had this URL, b) JavaScript can only access a same-origin History object.
-        exceptionState.throwSecurityError("A history state object with URL '" + fullURL.elidedString() + "' cannot be created in a document with origin '" + m_frame->document()->securityOrigin()->toString() + "'.");
+        exceptionState.throwSecurityError("A history state object with URL '" + fullURL.elidedString() + "' cannot be created in a document with origin '" + document->securityOrigin()->toString() + "' and URL '" + document->url().elidedString() + "'.");
         return;
     }
 
     m_frame->loader().updateForSameDocumentNavigation(fullURL, SameDocumentNavigationHistoryApi, data, restorationType, type);
 }
 
 } // namespace blink