diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-04-27 15:48:17 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-05-16 17:14:59 +0000 |
| commit | 8476245d1a197d05f988ef87f17b7ccbbcbba878 (patch) | |
| tree | 08a0d181a56fc4079403543a807600d584f8827a /tests/auto/widgets/qwebenginescript | |
| parent | 580fdd43c23aa409880a64f7dc0ce04ec57a1bcd (diff) | |
Replace invalid characters in WebChannel messages
Turns out JavaScript's JSON.stringify is not guaranteed to produce valid UTF-16
strings. It is possible in JavaScript to produce string objects which contain
invalid code units (unmatched surrogate pairs) and JSON.stringify will simply
copy this data to it's output. However, such a string cannot be losslessly
converted to UTF-8 and this leads to fun errors in WebChannelIPCTransport.
This patch
- Adds a test for the scenario above.
- Changes WebChannelIPCTransport to replace these invalid code units with the
Unicode replacement character U+FFFD.
- Changes WebChannelIPCTransportHost to validate the data it gets from the
renderer. Not validating the data defeats the whole point of Chromium's
fancy multi-process architecture: the renderer is not to be trusted.
- Changes WebChannelIPCTransport to throw JavaScript exceptions for various
errors (missing argument, wrong type, invalid JSON). Seems like the polite
thing to do.
Task-number: QTBUG-61969
Change-Id: I83275a0eaed77109dc458b80e27217108dde9f7b
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'tests/auto/widgets/qwebenginescript')
3 files changed, 32 insertions, 0 deletions
diff --git a/tests/auto/widgets/qwebenginescript/resources/webChannelWithBadString.html b/tests/auto/widgets/qwebenginescript/resources/webChannelWithBadString.html new file mode 100644 index 000000000..af40f6a2b --- /dev/null +++ b/tests/auto/widgets/qwebenginescript/resources/webChannelWithBadString.html @@ -0,0 +1,14 @@ +<!DOCTYPE html> +<html> + <head> + <title>webChannelWithBadString</title> + </head> + <body> + <script src="/qwebchannel.js"></script> + <script type="text/javascript"> + new QWebChannel(qt.webChannelTransport, (channel) => { + channel.objects.host.text = String.fromCharCode(0xD800); + }); + </script> + </body> +</html> diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp index cb45e524e..a9efabf97 100644 --- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp +++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp @@ -42,6 +42,7 @@ private Q_SLOTS: void webChannelResettingAndUnsetting(); void webChannelWithExistingQtObject(); void navigation(); + void webChannelWithBadString(); }; void tst_QWebEngineScript::domEditing() @@ -470,6 +471,22 @@ void tst_QWebEngineScript::navigation() QCOMPARE(testObject.text(), url3); } +// Try to set TestObject::text to an invalid UTF-16 string. +// +// See QTBUG-61969. +void tst_QWebEngineScript::webChannelWithBadString() +{ + QWebEnginePage page; + TestObject host; + QSignalSpy hostSpy(&host, &TestObject::textChanged); + QWebChannel channel; + channel.registerObject(QStringLiteral("host"), &host); + page.setWebChannel(&channel); + page.setUrl(QStringLiteral("qrc:/resources/webChannelWithBadString.html")); + QVERIFY(hostSpy.wait(20000)); + QCOMPARE(host.text(), QString(QChar(QChar::ReplacementCharacter))); +} + QTEST_MAIN(tst_QWebEngineScript) #include "tst_qwebenginescript.moc" diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.qrc b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.qrc index 9960a37ba..ada06119a 100644 --- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.qrc +++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.qrc @@ -4,5 +4,6 @@ <file>resources/test_iframe_outer.html</file> <file>resources/test_iframe_inner.html</file> <file>resources/test_window_open.html</file> + <file>resources/webChannelWithBadString.html</file> </qresource> </RCC> |