Changeset 205404 in webkit

Timestamp:

Sep 3, 2016 7:44:59 AM (8 years ago)

Author:

Chris Dumez

Message:

Object.preventExtensions(window) should throw a TypeError
​https://bugs.webkit.org/show_bug.cgi?id=161554

Reviewed by Darin Adler.

Source/WebCore:

Object.preventExtensions(window) should throw a TypeError.

PreventExtensions? should return false for Window:

• ​https://html.spec.whatwg.org/#windowproxy-preventextensions

EcmaScript says that Object.preventExtensions() should throw a TypeError
if PreventExtension? returns false:

• ​https://tc39.github.io/ecma262/#sec-object.preventextensions

No new tests, updated existing test.

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::preventExtensions):

LayoutTests:

• http/tests/security/preventExtensions-window-location-expected.txt:
• http/tests/security/preventExtensions-window-location.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/security/preventExtensions-window-location-expected.txt (modified) (2 diffs)
• LayoutTests/http/tests/security/preventExtensions-window-location.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-03  Chris Dumez  <cdumez@apple.com>
+
+        Object.preventExtensions(window) should throw a TypeError
+        https://bugs.webkit.org/show_bug.cgi?id=161554
+
+        Reviewed by Darin Adler.
+
+        * http/tests/security/preventExtensions-window-location-expected.txt:
+        * http/tests/security/preventExtensions-window-location.html:
+
 2016-09-03  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/LayoutTests/http/tests/security/preventExtensions-window-location-expected.txt

@@ -6 +6 @@
 * Cross origin
 PASS Object.isExtensible(frames[0]) is true
-PASS Object.preventExtensions(frames[0]) threw exception SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match..
+PASS Object.preventExtensions(frames[0]) threw exception TypeError: Cannot prevent extensions on this object.
 PASS Object.isExtensible(frames[0]) is true
 PASS Object.isExtensible(frames[0].location) is true
@@ -14 +14 @@
 * Same origin
 PASS Object.isExtensible(window) is true
-FAIL Object.preventExtensions(window) should throw a TypeError. Did not throw.
+PASS Object.preventExtensions(window) threw exception TypeError: Cannot prevent extensions on this object.
 PASS Object.isExtensible(window) is true
 PASS Object.isExtensible(window.location) is true

trunk/LayoutTests/http/tests/security/preventExtensions-window-location.html

@@ -11 +11 @@
     debug ("* Cross origin");
     shouldBeTrue("Object.isExtensible(frames[0])");
-    shouldThrowErrorName("Object.preventExtensions(frames[0])", "SecurityError");
+    shouldThrowErrorName("Object.preventExtensions(frames[0])", "TypeError");
     shouldBeTrue("Object.isExtensible(frames[0])");
 
     shouldBeTrue("Object.isExtensible(frames[0].location)");
+    // FIXME: Should throw a TypeError once we start throw in the same origin case as well.
     shouldThrowErrorName("Object.preventExtensions(frames[0].location)", "SecurityError");
     shouldBeTrue("Object.isExtensible(frames[0].location)");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-03  Chris Dumez  <cdumez@apple.com>
+
+        Object.preventExtensions(window) should throw a TypeError
+        https://bugs.webkit.org/show_bug.cgi?id=161554
+
+        Reviewed by Darin Adler.
+
+        Object.preventExtensions(window) should throw a TypeError.
+
+        [[PreventExtensions]] should return false for Window:
+        - https://html.spec.whatwg.org/#windowproxy-preventextensions
+
+        EcmaScript says that Object.preventExtensions() should throw a TypeError
+        if [[PreventExtension]] returns false:
+        - https://tc39.github.io/ecma262/#sec-object.preventextensions
+
+        No new tests, updated existing test.
+
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::JSDOMWindow::preventExtensions):
+
 2016-09-03  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -343 +343 @@
 }
 
-bool JSDOMWindow::preventExtensions(JSObject* object, ExecState* exec)
-{
-    JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(object);
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped(), ThrowSecurityError))
-        return false;
+bool JSDOMWindow::preventExtensions(JSObject*, ExecState* exec)
+{
+    auto scope = DECLARE_THROW_SCOPE(exec->vm());
+
+    throwTypeError(exec, scope, ASCIILiteral("Cannot prevent extensions on this object"));
     return false;
 }