First parameter to MessagePort / DedicatedWorkerGlobalScope.postMessage() should be mandatory
https://bugs.webkit.org/show_bug.cgi?id=158540
Reviewed by Geoffrey Garen.
Source/WebCore:
First parameter to MessagePort / DedicatedWorkerGlobalScope.postMessage() should be mandatory:
- https://html.spec.whatwg.org/multipage/comms.html#messageport
- https://html.spec.whatwg.org/multipage/workers.html#dedicated-workers-and-the-dedicatedworkerglobalscope-interface
Previously, WebKit send a bogus MessageEvent whose data attribute is undefined. This would
cause a testharness error when running the following W3C test:
- http://w3c-test.org/workers/interfaces.worker
Firefox and Chrome already correctly throw in this case. Our Window.postMessage() API is also
already throwing in this case.
Test: fast/workers/postMessage-missing-parameter.html
* bindings/js/JSMessagePortCustom.h:
(WebCore::handlePostMessage):
LayoutTests:
Add test coverage.
* fast/files/workers/inline-worker-via-blob-url.html:
* fast/workers/postMessage-missing-parameter-expected.txt: Added.
* fast/workers/postMessage-missing-parameter.html: Added.
* fast/workers/worker-messageport-expected.txt:
* fast/workers/worker-messageport.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@201835 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2dd0010..6630a56 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2016-06-08 Chris Dumez <cdumez@apple.com>
+
+ First parameter to MessagePort / DedicatedWorkerGlobalScope.postMessage() should be mandatory
+ https://bugs.webkit.org/show_bug.cgi?id=158540
+
+ Reviewed by Geoffrey Garen.
+
+ Add test coverage.
+
+ * fast/files/workers/inline-worker-via-blob-url.html:
+ * fast/workers/postMessage-missing-parameter-expected.txt: Added.
+ * fast/workers/postMessage-missing-parameter.html: Added.
+ * fast/workers/worker-messageport-expected.txt:
+ * fast/workers/worker-messageport.html:
+
2016-06-08 Nan Wang <n_wang@apple.com>
For keyboard users, activating a fragment URL should transfer focus and caret to the destination
diff --git a/LayoutTests/fast/files/workers/inline-worker-via-blob-url.html b/LayoutTests/fast/files/workers/inline-worker-via-blob-url.html
index ef1e80d..dbebd85 100644
--- a/LayoutTests/fast/files/workers/inline-worker-via-blob-url.html
+++ b/LayoutTests/fast/files/workers/inline-worker-via-blob-url.html
@@ -23,7 +23,7 @@
if (testRunner.notifyDone)
testRunner.notifyDone();
};
- worker.postMessage();
+ worker.postMessage("message");
}
if (window.testRunner) {
diff --git a/LayoutTests/fast/workers/postMessage-missing-parameter-expected.txt b/LayoutTests/fast/workers/postMessage-missing-parameter-expected.txt
new file mode 100644
index 0000000..4fc1fbd
--- /dev/null
+++ b/LayoutTests/fast/workers/postMessage-missing-parameter-expected.txt
@@ -0,0 +1,10 @@
+Tests that calling DedicatedWorkerGlobalScope.postMessage() without parameter throws an exception
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+postMessage(): TypeError: Not enough arguments
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/workers/postMessage-missing-parameter.html b/LayoutTests/fast/workers/postMessage-missing-parameter.html
new file mode 100644
index 0000000..bc55848
--- /dev/null
+++ b/LayoutTests/fast/workers/postMessage-missing-parameter.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="resources/worker-create-common.js"></script>
+<script>
+
+var jsTestIsAsync = true;
+
+description('Tests that calling DedicatedWorkerGlobalScope.postMessage() without parameter throws an exception');
+
+var worker = createWorker();
+worker.postMessage("eval postMessage()");
+worker.postMessage("eval DONE");
+
+worker.onmessage = function(evt) {
+ if (!/DONE/.test(evt.data))
+ debug(evt.data.replace(new RegExp("/.*LayoutTests"), "<...>"));
+ else
+ finishJSTest();
+};
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/workers/worker-messageport-expected.txt b/LayoutTests/fast/workers/worker-messageport-expected.txt
index 906b6b8..b3a313f 100644
--- a/LayoutTests/fast/workers/worker-messageport-expected.txt
+++ b/LayoutTests/fast/workers/worker-messageport-expected.txt
@@ -4,6 +4,7 @@
PASS: Received message port
PASS: Received response from Worker via MessagePort
PASS: Got port from worker
+PASS: Calling MessagePort.postMessage() without parameter threw exception: TypeError: Not enough arguments
PASS: Received final response from worker
PASS: Got 1000 messages
DONE
diff --git a/LayoutTests/fast/workers/worker-messageport.html b/LayoutTests/fast/workers/worker-messageport.html
index aa81d7c..5cf9403 100644
--- a/LayoutTests/fast/workers/worker-messageport.html
+++ b/LayoutTests/fast/workers/worker-messageport.html
@@ -51,6 +51,13 @@
log("FAIL: Got the wrong number of ports from worker: " + evt.ports.length);
} else {
log("PASS: Got port from worker");
+ try {
+ // Missing parameter, should throw.
+ evt.ports[0].postMessage();
+ log("FAIL: Calling MessagePort.postMessage() without parameter did not throw.");
+ } catch (e) {
+ log("PASS: Calling MessagePort.postMessage() without parameter threw exception: " + e);
+ }
evt.ports[0].postMessage("ping");
evt.ports[0].onmessage = function(evt) {
if (evt.data == "pong") {
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ada880c..29913b9 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2016-06-08 Chris Dumez <cdumez@apple.com>
+
+ First parameter to MessagePort / DedicatedWorkerGlobalScope.postMessage() should be mandatory
+ https://bugs.webkit.org/show_bug.cgi?id=158540
+
+ Reviewed by Geoffrey Garen.
+
+ First parameter to MessagePort / DedicatedWorkerGlobalScope.postMessage() should be mandatory:
+ - https://html.spec.whatwg.org/multipage/comms.html#messageport
+ - https://html.spec.whatwg.org/multipage/workers.html#dedicated-workers-and-the-dedicatedworkerglobalscope-interface
+
+ Previously, WebKit send a bogus MessageEvent whose data attribute is undefined. This would
+ cause a testharness error when running the following W3C test:
+ - http://w3c-test.org/workers/interfaces.worker
+
+ Firefox and Chrome already correctly throw in this case. Our Window.postMessage() API is also
+ already throwing in this case.
+
+ Test: fast/workers/postMessage-missing-parameter.html
+
+ * bindings/js/JSMessagePortCustom.h:
+ (WebCore::handlePostMessage):
+
2016-06-08 Gavin Barraclough <barraclough@apple.com>
Remove removeDirect
diff --git a/Source/WebCore/bindings/js/JSMessagePortCustom.h b/Source/WebCore/bindings/js/JSMessagePortCustom.h
index 7bd9df3..fca7a40 100644
--- a/Source/WebCore/bindings/js/JSMessagePortCustom.h
+++ b/Source/WebCore/bindings/js/JSMessagePortCustom.h
@@ -32,6 +32,7 @@
#define JSMessagePortCustom_h
#include "MessagePort.h"
+#include <runtime/Error.h>
#include <runtime/JSCInlines.h>
#include <runtime/JSCJSValue.h>
#include <wtf/Forward.h>
@@ -49,10 +50,13 @@
template <typename T>
inline JSC::JSValue handlePostMessage(JSC::ExecState& state, T* impl)
{
+ if (UNLIKELY(state.argumentCount() < 1))
+ return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
+
MessagePortArray portArray;
ArrayBufferArray arrayBufferArray;
fillMessagePortArray(state, state.argument(1), portArray, arrayBufferArray);
- RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(&state, state.argument(0), &portArray, &arrayBufferArray);
+ RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(&state, state.uncheckedArgument(0), &portArray, &arrayBufferArray);
if (state.hadException())
return JSC::jsUndefined();
