Changeset 51580 in webkit

Timestamp:

Dec 1, 2009 7:44:11 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2009-12-01 Adam Barth <​abarth@webkit.org>

​https://bugs.webkit.org/show_bug.cgi?id=21288

Unreviewed port of @sandbox to V8.

• bindings/v8/ScriptController.cpp: (WebCore::ScriptController::isEnabled):
• bindings/v8/custom/V8DOMWindowCustom.cpp: (WebCore::createWindow):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/ScriptController.cpp (modified) (1 diff)
• bindings/v8/custom/V8DOMWindowCustom.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-01  Adam Barth  <abarth@webkit.org>
+
+        https://bugs.webkit.org/show_bug.cgi?id=21288
+
+        Unreviewed port of @sandbox to V8.
+
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::isEnabled):
+        * bindings/v8/custom/V8DOMWindowCustom.cpp:
+        (WebCore::createWindow):
+
 2009-12-01  Patrik Persson  <patrik.j.persson@ericsson.com>
 

trunk/WebCore/bindings/v8/ScriptController.cpp

@@ -295 +295 @@
 {
     Settings* settings = m_proxy->frame()->settings();
-    return m_proxy->frame()->loader()->client()->allowJavaScript(settings && settings->isJavaScriptEnabled());
+    return m_proxy->frame()->loader()->client()->allowJavaScript(settings && settings->settings->isJavaScriptEnabled() && !m_frame->loader()->isSandboxed(SandboxScripts));
 }
 

trunk/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp

@@ -551 +551 @@
     ASSERT(enteredFrame);
 
+    // Sandboxed iframes cannot open new auxiliary browsing contexts.
+    if (callingFrame && callingFrame->loader()->isSandboxed(SandboxNavigation))
+        return 0;
+
     ResourceRequest request;