Changeset 142726 in webkit

Timestamp:

Feb 12, 2013 11:34:47 PM (11 years ago)

Author:

morrita@google.com

Message:

[Internals] setShadowDOMEnabled() shouldn't be used except a few tests.
​https://bugs.webkit.org/show_bug.cgi?id=109642

Reviewed by Kent Tamura.

Source/WebCore:

InternalSettings.setShadowDOMEnabled() shouldn't be called after
any relevant DOM bindings are touched. However for fuzzers, it
isn't trivial to regulate its behavior.

This change whitelists the URL of running test for prevent
unintended API calls. This doesn't hurt the Internals usability
since the API is called from just a couple of tests and the number
isn't expected to grow.

Test: fast/dom/shadow/shadow-dom-enabled-flag-whitelist.html

• testing/InternalSettings.cpp:

(WebCore::urlIsWhitelisted):
(WebCore):
(WebCore::InternalSettings::setShadowDOMEnabled):

LayoutTests:

• fast/dom/shadow/shadow-dom-enabled-flag-whitelist-expected.txt: Added.
• fast/dom/shadow/shadow-dom-enabled-flag-whitelist.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/shadow-dom-enabled-flag-whitelist-expected.txt (added)
• LayoutTests/fast/dom/shadow/shadow-dom-enabled-flag-whitelist.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/testing/InternalSettings.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-12  Hajime Morrita  <morrita@google.com>
+
+        [Internals] setShadowDOMEnabled() shouldn't be used except a few tests.
+        https://bugs.webkit.org/show_bug.cgi?id=109642
+
+        Reviewed by Kent Tamura.
+
+        * fast/dom/shadow/shadow-dom-enabled-flag-whitelist-expected.txt: Added.
+        * fast/dom/shadow/shadow-dom-enabled-flag-whitelist.html: Added.
+
 2013-02-12  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-12  Hajime Morrita  <morrita@google.com>
+
+        [Internals] setShadowDOMEnabled() shouldn't be used except a few tests.
+        https://bugs.webkit.org/show_bug.cgi?id=109642
+
+        Reviewed by Kent Tamura.
+
+        InternalSettings.setShadowDOMEnabled() shouldn't be called after
+        any relevant DOM bindings are touched. However for fuzzers, it
+        isn't trivial to regulate its behavior.
+
+        This change whitelists the URL of running test for prevent
+        unintended API calls. This doesn't hurt the Internals usability
+        since the API is called from just a couple of tests and the number
+        isn't expected to grow.
+
+        Test: fast/dom/shadow/shadow-dom-enabled-flag-whitelist.html
+
+        * testing/InternalSettings.cpp:
+        (WebCore::urlIsWhitelisted):
+        (WebCore):
+        (WebCore::InternalSettings::setShadowDOMEnabled):
+
 2013-02-12  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/testing/InternalSettings.cpp

@@ -196 +196 @@
 }
 
+static bool urlIsWhitelistedForSetShadowDOMEnabled(const String& url)
+{
+    // This check is just for preventing fuzzers from crashing because of unintended API calls.
+    // You can list your test if needed.
+    return notFound != url.find("fast/dom/shadow/content-shadow-unknown.html")
+        || notFound != url.find("fast/dom/shadow/insertion-points-with-shadow-disabled.html");
+}
+
 void InternalSettings::setShadowDOMEnabled(bool enabled, ExceptionCode& ec)
 {
+    if (!urlIsWhitelistedForSetShadowDOMEnabled(page()->mainFrame()->document()->url().string())) {
+        ec = INVALID_ACCESS_ERR;
+        return;
+    }
+
 #if ENABLE(SHADOW_DOM)
-    UNUSED_PARAM(ec);
     RuntimeEnabledFeatures::setShadowDOMEnabled(enabled);
 #else