Changeset 52812 in webkit

Timestamp:

Jan 5, 2010 11:06:29 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-01-05 Nate Chapin <Nate Chapin>

Reviewed by Adam Barth.

Move allowSetting{Frame}SrcToJavascriptUrl from V8Custom to BindingSecurity and
remove the v8-specific pieces.

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

• bindings/BindingSecurity.h: (WebCore::::allowSettingFrameSrcToJavascriptUrl): Moved from V8CustomBinding.cpp. (WebCore::::allowSettingSrcToJavascriptURL): Moved from V8CustomBinding.cpp.
• bindings/v8/custom/V8AttrCustom.cpp: (WebCore::V8Attr::valueAccessorSetter):
• bindings/v8/custom/V8CustomBinding.cpp:
• bindings/v8/custom/V8CustomBinding.h:
• bindings/v8/custom/V8ElementCustom.cpp: (WebCore::V8Element::setAttributeCallback): (WebCore::V8Element::setAttributeNodeCallback): (WebCore::V8Element::setAttributeNSCallback): (WebCore::V8Element::setAttributeNodeNSCallback):
• bindings/v8/custom/V8HTMLFrameElementCustom.cpp: (WebCore::V8HTMLFrameElement::srcAccessorSetter): (WebCore::V8HTMLFrameElement::locationAccessorSetter):
• bindings/v8/custom/V8HTMLIFrameElementCustom.cpp: (WebCore::V8HTMLIFrameElement::srcAccessorSetter):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/generic/BindingSecurity.h (modified) (3 diffs)
• bindings/v8/custom/V8AttrCustom.cpp (modified) (2 diffs)
• bindings/v8/custom/V8CustomBinding.cpp (modified) (1 diff)
• bindings/v8/custom/V8CustomBinding.h (modified) (1 diff)
• bindings/v8/custom/V8ElementCustom.cpp (modified) (5 diffs)
• bindings/v8/custom/V8HTMLFrameElementCustom.cpp (modified) (3 diffs)
• bindings/v8/custom/V8HTMLIFrameElementCustom.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-05  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Move allowSetting{Frame}SrcToJavascriptUrl from V8Custom to BindingSecurity and
+        remove the v8-specific pieces.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33182
+
+        * bindings/BindingSecurity.h:
+        (WebCore::::allowSettingFrameSrcToJavascriptUrl): Moved from V8CustomBinding.cpp.
+        (WebCore::::allowSettingSrcToJavascriptURL): Moved from V8CustomBinding.cpp.
+        * bindings/v8/custom/V8AttrCustom.cpp:
+        (WebCore::V8Attr::valueAccessorSetter):
+        * bindings/v8/custom/V8CustomBinding.cpp:
+        * bindings/v8/custom/V8CustomBinding.h:
+        * bindings/v8/custom/V8ElementCustom.cpp:
+        (WebCore::V8Element::setAttributeCallback):
+        (WebCore::V8Element::setAttributeNodeCallback):
+        (WebCore::V8Element::setAttributeNSCallback):
+        (WebCore::V8Element::setAttributeNodeNSCallback):
+        * bindings/v8/custom/V8HTMLFrameElementCustom.cpp:
+        (WebCore::V8HTMLFrameElement::srcAccessorSetter):
+        (WebCore::V8HTMLFrameElement::locationAccessorSetter):
+        * bindings/v8/custom/V8HTMLIFrameElementCustom.cpp:
+        (WebCore::V8HTMLIFrameElement::srcAccessorSetter):
+
 2010-01-05  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/bindings/generic/BindingSecurity.h

@@ -33 +33 @@
 
 #include "BindingSecurityBase.h"
+#include "CSSHelper.h"
+#include "Element.h"
 #include "GenericBinding.h"
+#include "HTMLFrameElementBase.h"
 
 namespace WebCore {
@@ -51 +54 @@
     // current security context.
     static bool checkNodeSecurity(State<Binding>*, Node* target);
+
+    static bool allowSettingFrameSrcToJavascriptUrl(State<Binding>*, HTMLFrameElementBase*, String value);
+    static bool allowSettingSrcToJavascriptURL(State<Binding>*, Element*, String name, String value);
 
 private:
@@ -103 +109 @@
 }
 
+template <class Binding>
+bool BindingSecurity<Binding>::allowSettingFrameSrcToJavascriptUrl(State<Binding>* state, HTMLFrameElementBase* frame, String value)
+{
+    if (protocolIsJavaScript(deprecatedParseURL(value))) {
+        Node* contentDoc = frame->contentDocument();
+        if (contentDoc && !checkNodeSecurity(state, contentDoc))
+            return false;
+    }
+    return true;
+}
+
+template <class Binding>
+bool BindingSecurity<Binding>::allowSettingSrcToJavascriptURL(State<Binding>* state, Element* element, String name, String value)
+{
+    if ((element->hasTagName(HTMLNames::iframeTag) || element->hasTagName(HTMLNames::frameTag)) && equalIgnoringCase(name, "src"))
+        return allowSettingFrameSrcToJavascriptUrl(state, static_cast<HTMLFrameElementBase*>(element), value);
+    return true;
+}
+
 }
 

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

@@ -36 +36 @@
 #include "ExceptionCode.h"
 #include "V8Binding.h"
+#include "V8BindingState.h"
 #include "V8CustomBinding.h"
 #include "V8Proxy.h"
@@ -47 +48 @@
     Element* ownerElement = imp->ownerElement();
 
-    if (ownerElement && !allowSettingSrcToJavascriptURL(ownerElement, imp->name(), attrValue))
+    if (ownerElement && !V8BindingSecurity::allowSettingSrcToJavascriptURL(V8BindingState::Only(), ownerElement, imp->name(), attrValue))
         return;
 

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

@@ -49 +49 @@
 
 namespace WebCore {
-
-bool allowSettingFrameSrcToJavascriptUrl(HTMLFrameElementBase* frame, String value)
-{
-    if (protocolIs(deprecatedParseURL(value), "javascript")) {
-        Node* contentDoc = frame->contentDocument();
-        if (contentDoc && !V8BindingSecurity::checkNodeSecurity(V8BindingState::Only(), contentDoc))
-            return false;
-    }
-    return true;
-}
-
-bool allowSettingSrcToJavascriptURL(Element* element, String name, String value)
-{
-    if ((element->hasTagName(HTMLNames::iframeTag) || element->hasTagName(HTMLNames::frameTag)) && equalIgnoringCase(name, "src"))
-        return allowSettingFrameSrcToJavascriptUrl(static_cast<HTMLFrameElementBase*>(element), value);
-    return true;
-}
 
 // --------------- Security Checks -------------------------

trunk/WebCore/bindings/v8/custom/V8CustomBinding.h

@@ -79 +79 @@
     class V8Proxy;
 
-    bool allowSettingFrameSrcToJavascriptUrl(HTMLFrameElementBase*, String value);
-    bool allowSettingSrcToJavascriptURL(Element*, String name, String value);
-
     class V8Custom {
     public:

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

@@ -43 +43 @@
 #include "V8Attr.h"
 #include "V8Binding.h"
+#include "V8BindingState.h"
 #include "V8CustomBinding.h"
 #include "V8Proxy.h"
@@ -57 +58 @@
     String value = toWebCoreString(args[1]);
 
-    if (!allowSettingSrcToJavascriptURL(element, name, value))
+    if (!V8BindingSecurity::allowSettingSrcToJavascriptURL(V8BindingState::Only(), element, name, value))
         return v8::Undefined();
 
@@ -77 +78 @@
     Element* element = V8DOMWrapper::convertDOMWrapperToNode<Element>(args.Holder());
 
-    if (!allowSettingSrcToJavascriptURL(element, newAttr->name(), newAttr->value()))
+    if (!V8BindingSecurity::allowSettingSrcToJavascriptURL(V8BindingState::Only(), element, newAttr->name(), newAttr->value()))
         return v8::Undefined();
 
@@ -96 +97 @@
     String value = toWebCoreString(args[2]);
 
-    if (!allowSettingSrcToJavascriptURL(element, qualifiedName, value))
+    if (!V8BindingSecurity::allowSettingSrcToJavascriptURL(V8BindingState::Only(), element, qualifiedName, value))
         return v8::Undefined();
 
@@ -116 +117 @@
     Element* element = V8DOMWrapper::convertDOMWrapperToNode<Element>(args.Holder());
 
-    if (!allowSettingSrcToJavascriptURL(element, newAttr->name(), newAttr->value()))
+    if (!V8BindingSecurity::allowSettingSrcToJavascriptURL(V8BindingState::Only(), element, newAttr->name(), newAttr->value()))
         return v8::Undefined();
 

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

@@ -35 +35 @@
 #include "HTMLNames.h"
 #include "V8Binding.h"
+#include "V8BindingState.h"
 #include "V8CustomBinding.h"
 #include "V8Proxy.h"
@@ -47 +48 @@
     String srcValue = toWebCoreStringWithNullCheck(value);
 
-    if (!allowSettingFrameSrcToJavascriptUrl(frame, srcValue))
+    if (!V8BindingSecurity::allowSettingFrameSrcToJavascriptUrl(V8BindingState::Only(), frame, srcValue))
         return;
 
@@ -58 +59 @@
     String locationValue = toWebCoreStringWithNullCheck(value);
 
-    if (!allowSettingFrameSrcToJavascriptUrl(frame, locationValue))
+    if (!V8BindingSecurity::allowSettingFrameSrcToJavascriptUrl(V8BindingState::Only(), frame, locationValue))
         return;
 

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

@@ -35 +35 @@
 #include "HTMLNames.h" 
 #include "V8Binding.h"
+#include "V8BindingState.h"
 #include "V8CustomBinding.h"
 #include "V8Proxy.h"
@@ -47 +48 @@
     String v = toWebCoreStringWithNullCheck(value);
 
-    if (!allowSettingFrameSrcToJavascriptUrl(iframe, v))
+    if (!V8BindingSecurity::allowSettingFrameSrcToJavascriptUrl(V8BindingState::Only(), iframe, v))
         return;