Changeset 56829 in webkit

Timestamp:

Mar 31, 2010 1:37:13 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-31 John Gregg <​johnnyg@google.com>

Reviewed by Darin Fisher.

[chromium] add logging of cross-frame property accesses for site isolation
​https://bugs.webkit.org/show_bug.cgi?id=35773

No new tests as no new functionality.

• bindings/scripts/CodeGeneratorV8.pm:
• bindings/v8/V8Utilities.cpp: (WebCore::logPropertyAccess):
• bindings/v8/V8Utilities.h:
• loader/FrameLoaderClient.h: (WebCore::FrameLoaderClient::logCrossFramePropertyAccess):

2010-03-31 John Gregg <​johnnyg@google.com>

Reviewed by Darin Fisher.

[chromium] add logging of cross-frame property accesses for site isolation
​https://bugs.webkit.org/show_bug.cgi?id=35773

• public/WebFrameClient.h: (WebKit::WebFrameClient::logCrossFramePropertyAccess):
• src/FrameLoaderClientImpl.cpp: (WebKit::FrameLoaderClientImpl::logCrossFramePropertyAccess):
• src/FrameLoaderClientImpl.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/scripts/CodeGeneratorV8.pm (modified) (2 diffs)
• WebCore/bindings/v8/V8Utilities.cpp (modified) (2 diffs)
• WebCore/bindings/v8/V8Utilities.h (modified) (1 diff)
• WebCore/loader/FrameLoaderClient.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebFrameClient.h (modified) (1 diff)
• WebKit/chromium/src/FrameLoaderClientImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/FrameLoaderClientImpl.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-31  John Gregg  <johnnyg@google.com>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] add logging of cross-frame property accesses for site isolation
+        https://bugs.webkit.org/show_bug.cgi?id=35773
+
+        No new tests as no new functionality.
+
+        * bindings/scripts/CodeGeneratorV8.pm:
+        * bindings/v8/V8Utilities.cpp:
+        (WebCore::logPropertyAccess):
+        * bindings/v8/V8Utilities.h:
+        * loader/FrameLoaderClient.h:
+        (WebCore::FrameLoaderClient::logCrossFramePropertyAccess):
+
 2010-03-30  Gavin Barraclough  <barraclough@apple.com>
 

trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -675 +675 @@
     } elsif ($attribute->signature->extendedAttributes->{"CheckFrameSecurity"}) {
         push(@implContentDecls, "    if (!V8BindingSecurity::checkNodeSecurity(V8BindingState::Only(), imp->contentDocument())) return v8::Handle<v8::Value>();\n\n");
+    } 
+
+    if ($attrExt->{"DoNotCheckDomainSecurity"} || 
+        $attrExt->{"DoNotCheckDomainSecurityOnGet"}) {
+        push(@implContentDecls, "    logPropertyAccess(name, info);\n");
     }
 
@@ -1447 +1452 @@
          "#include \"V8BindingState.h\"\n" .
          "#include \"V8DOMWrapper.h\"\n" .
+         "#include \"V8Utilities.h\"\n" .
          "#include \"V8IsolatedContext.h\"\n\n" .
          "#undef LOG\n\n");

trunk/WebCore/bindings/v8/V8Utilities.cpp

@@ -34 +34 @@
 #include <v8.h>
 
+#include "ChromiumBridge.h"
 #include "Document.h"
 #include "Frame.h"
+#include "FrameLoaderClient.h"
 #include "ScriptExecutionContext.h"
 #include "ScriptState.h"
 #include "V8Binding.h"
+#include "V8BindingState.h"
+#include "V8DOMWindow.h"
 #include "V8Proxy.h"
 #include "WorkerContext.h"
@@ -143 +147 @@
 }
 
+void logPropertyAccess(v8::Local<v8::String> name, const v8::AccessorInfo& info)
+{
+    Frame* target = V8DOMWindow::toNative(info.Holder())->frame();
+    Frame* active = V8BindingState::Only()->getActiveWindow()->frame();
+    if (target == active)
+        return;
+
+    bool crossSite = !V8BindingSecurity::canAccessFrame(V8BindingState::Only(), target, false);
+    String propName = toWebCoreString(name);
+
+    // For cross-site, we also want to identify the current event to record repeat accesses.
+    unsigned long long eventId = 0;
+    if (crossSite) {
+        v8::HandleScope handleScope;
+        v8::Handle<v8::Context> v8Context = V8Proxy::mainWorldContext(active);
+        if (!v8Context.IsEmpty()) {
+            v8::Context::Scope scope(v8Context);
+            v8::Handle<v8::Object> global = v8Context->Global();
+            v8::Handle<v8::Value> jsEvent = global->Get(v8::String::NewSymbol("event"));
+            if (V8DOMWrapper::isValidDOMObject(jsEvent))
+                eventId = reinterpret_cast<unsigned long long>(V8Event::toNative(v8::Handle<v8::Object>::Cast(jsEvent)));
+        }
+    }
+    active->loader()->client()->logCrossFramePropertyAccess(target, crossSite, propName, eventId);
+}
+
 } // namespace WebCore

trunk/WebCore/bindings/v8/V8Utilities.h

@@ -57 +57 @@
     ScriptExecutionContext* getScriptExecutionContext();
 
+    void logPropertyAccess(v8::Local<v8::String> name, const v8::AccessorInfo& info);
+
     class AllowAllocation {
     public:

trunk/WebCore/loader/FrameLoaderClient.h

@@ -245 +245 @@
         virtual void didDestroyScriptContextForFrame() = 0;
         virtual void didCreateIsolatedScriptContext() = 0;
+
+        virtual void logCrossFramePropertyAccess(Frame* target, bool crossOrigin, const String& name, unsigned long long eventId) { }
 #endif
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-03-31  John Gregg  <johnnyg@google.com>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] add logging of cross-frame property accesses for site isolation
+        https://bugs.webkit.org/show_bug.cgi?id=35773
+
+        * public/WebFrameClient.h:
+        (WebKit::WebFrameClient::logCrossFramePropertyAccess):
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::logCrossFramePropertyAccess):
+        * src/FrameLoaderClientImpl.h:
+
 2010-03-30  Gavin Barraclough  <barraclough@apple.com>
 

trunk/WebKit/chromium/public/WebFrameClient.h

@@ -285 +285 @@
     virtual void didCreateIsolatedScriptContext(WebFrame*) { }
 
+    // Notifies that a cross-frame access was made to a property that allows
+    // cross-origin access.
+    virtual void logCrossFramePropertyAccess(WebFrame* active, WebFrame* target, bool crossOrigin, const WebString& property, unsigned long long eventId) { }
+
 
     // Geometry notifications ----------------------------------------------

trunk/WebKit/chromium/src/FrameLoaderClientImpl.cpp

@@ -1506 +1506 @@
 }
 
+void FrameLoaderClientImpl::logCrossFramePropertyAccess(Frame* target, bool crossOrigin, const String& name, unsigned long long eventId)
+{
+    m_webFrame->client()->logCrossFramePropertyAccess(m_webFrame, WebFrameImpl::fromFrame(target), crossOrigin, name, eventId);
+}
+
 } // namespace WebKit

trunk/WebKit/chromium/src/FrameLoaderClientImpl.h

@@ -200 +200 @@
     virtual void didNotAllowPlugins();
 
+    virtual void logCrossFramePropertyAccess(
+        WebCore::Frame* target,
+        bool crossOrigin,
+        const WebCore::String& name,
+        unsigned long long eventId);
+
 private:
     void makeDocumentView();