QIODevice for request body in QWebEngineUrlRequestInterceptor

This patch implements a QIODevice subclass that gives access to the
request body inside QWebEngineUrlRequestInterceptor::interceptRequest().

Fixes: QTBUG-61320
Change-Id: Ib6010dad908c65e070d63927b619eaed2347e317
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

3 files changed, 128 insertions, 0 deletions

diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/CMakeLists.txt b/tests/auto/core/qwebengineurlrequestinterceptor/CMakeLists.txt
index 33cc7c150..c12c0c45c 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/CMakeLists.txt
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/CMakeLists.txt
@@ -9,6 +9,8 @@ qt_internal_add_test(tst_qwebengineurlrequestinterceptor
         tst_qwebengineurlrequestinterceptor.cpp
     LIBRARIES
         Qt::WebEngineCore
+        Qt::WebEngineCorePrivate
+        Qt::CorePrivate
         Test::HttpServer
         Test::Util
 )
@@ -36,6 +38,7 @@ set(tst_qwebengineurlrequestinterceptor_resource_files
     "resources/style.css"
     "resources/sw.html"
     "resources/sw.js"
+    "resources/postBodyFile.txt"
 )
 
 qt_internal_add_resource(tst_qwebengineurlrequestinterceptor "tst_qwebengineurlrequestinterceptor"
diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/resources/postBodyFile.txt b/tests/auto/core/qwebengineurlrequestinterceptor/resources/postBodyFile.txt
new file mode 100644
index 000000000..7729c4e0a
--- /dev/null
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/resources/postBodyFile.txt
@@ -0,0 +1,3 @@
+{
+"test": "1234"
+}
diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
index 73185837a..4a0d4bb8c 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
@@ -4,6 +4,7 @@
 #include <util.h>
 #include <QtTest/QtTest>
 #include <QtWebEngineCore/qwebengineurlrequestinfo.h>
+#include <QtWebEngineCore/private/qwebengineurlrequestinfo_p.h>
 #include <QtWebEngineCore/qwebengineurlrequestinterceptor.h>
 #include <QtWebEngineCore/qwebenginesettings.h>
 #include <QtWebEngineCore/qwebengineprofile.h>
@@ -48,6 +49,8 @@ private Q_SLOTS:
     void replaceInterceptor();
     void replaceOnIntercept();
     void multipleRedirects();
+    void postWithBody_data();
+    void postWithBody();
 };
 
 tst_QWebEngineUrlRequestInterceptor::tst_QWebEngineUrlRequestInterceptor()
@@ -935,5 +938,124 @@ void tst_QWebEngineUrlRequestInterceptor::multipleRedirects()
     QTRY_COMPARE(multiInterceptor.requestInfos.size(), 2);
 }
 
+class TestPostRequestInterceptor : public QWebEngineUrlRequestInterceptor
+{
+public:
+    TestPostRequestInterceptor(QString expected, bool isAppendFile, QObject *parent = nullptr)
+        : QWebEngineUrlRequestInterceptor(parent)
+        , m_expected(expected)
+        , m_isAppendFile(isAppendFile)
+    {};
+
+    void interceptRequest(QWebEngineUrlRequestInfo &info) override
+    {
+        info.block(true);
+        isCalled = true;
+
+        QIODevice *requestBodyDevice = info.requestBody();
+
+        if (m_isAppendFile) {
+            info.d_ptr->appendFileToResourceRequestBodyForTest(":/resources/postBodyFile.txt");
+        }
+
+        requestBodyDevice->open(QIODevice::ReadOnly);
+
+        const QString webKitBoundary = requestBodyDevice->read(40);
+        QVERIFY(webKitBoundary.contains("------WebKitFormBoundary"));
+
+        const QString fullBodyWithoutBoundaries = (webKitBoundary + requestBodyDevice->readAll())
+                                                          .replace(webKitBoundary, "")
+                                                          .replace("\r", "")
+                                                          .replace("\n", "")
+                                                          .replace(" ", "");
+
+        QCOMPARE(fullBodyWithoutBoundaries, m_expected);
+
+        requestBodyDevice->close();
+    }
+
+    bool isCalled = false;
+    QString m_expected;
+    bool m_isAppendFile;
+};
+
+void tst_QWebEngineUrlRequestInterceptor::postWithBody_data()
+{
+    QTest::addColumn<QString>("input");
+    QTest::addColumn<QString>("output");
+    QTest::addColumn<bool>("isAppendFile");
+    QTest::addRow("FormData append (DataElementByte)")
+            << "fd.append('userId', 1);"
+               "fd.append('title',' Test123');"
+               "fd.append('completed', false);"
+            << "Content-Disposition:form-data;name=\"userId"
+               "\"1Content-Disposition:form-data"
+               ";name=\"title\"Test123Content-Di"
+               "sposition:form-data;name=\"completed\"f"
+               "alse--"
+            << false;
+    QTest::addRow("FormData blob (DataElementPipe)")
+            << "const blob1 = new Blob(['blob1thisisablob'],"
+               "{type: 'text/plain'});"
+               "fd.append('blob1', blob1);"
+            << "Content-Disposition:form-data;name=\"blob1"
+               "\";filename=\"blob\"Content-Type:text/plai"
+               "nblob1thisisablob--"
+            << false;
+    QTest::addRow("Append file (DataElementFile)") << ""
+                                                   << "--{\"test\":\"1234\"}\"1234\"}" << true;
+    QTest::addRow("All combined") << "fd.append('userId', 1);"
+                                     "fd.append('title', 'Test123');"
+                                     "fd.append('completed', false);"
+                                     "const blob1 = new Blob(['blob1thisisablob'],"
+                                     "{type: 'text/plain'});"
+                                     "const blob2 = new Blob(['blob2thisisanotherblob'],"
+                                     "{type: 'text/plain'});"
+                                     "fd.append('blob1', blob1);"
+                                     "fd.append('userId', 2);"
+                                     "fd.append('title', 'Test456');"
+                                     "fd.append('completed', true);"
+                                     "fd.append('blob2', blob2);"
+                                  << "Content-Disposition:form-data;name=\"userId\""
+                                     "1Content-Disposition:form-data;na"
+                                     "me=\"title\"Test123Content-Disposit"
+                                     "ion:form-data;name=\"completed\"false"
+                                     "Content-Disposition:form-data;name=\"blob1\";"
+                                     "filename=\"blob\"Content-Type:text/plain"
+                                     "blob1thisisablobContent-Disposition:form-"
+                                     "data;name=\"userId\"2Content-Dispos"
+                                     "ition:form-data;name=\"title\"Test456"
+                                     "Content-Disposition:form-data;name=\"complete"
+                                     "d\"trueContent-Disposition:form-da"
+                                     "ta;name=\"blob2\";filename=\"blob\"Content-Ty"
+                                     "pe:text/plainblob2thisisanotherblob--"
+                                     "{\"test\":\"1234\"}\"1234\"}"
+                                  << true;
+}
+
+void tst_QWebEngineUrlRequestInterceptor::postWithBody()
+{
+    QFETCH(QString, input);
+    QFETCH(QString, output);
+    QFETCH(bool, isAppendFile);
+
+    QString script;
+    script.append("const fd = new FormData();");
+    script.append(input);
+    script.append("fetch('http://127.0.0.1', {method: 'POST',body: fd});");
+
+    QWebEngineProfile profile;
+    profile.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
+    TestPostRequestInterceptor interceptor(output, isAppendFile);
+    profile.setUrlRequestInterceptor(&interceptor);
+    QWebEnginePage page(&profile);
+    bool ok = false;
+
+    page.runJavaScript(script, [&ok](const QVariant result) { ok = true; });
+
+    QTRY_VERIFY(ok);
+    QVERIFY(interceptor.isCalled);
+}
+
 QTEST_MAIN(tst_QWebEngineUrlRequestInterceptor)
 #include "tst_qwebengineurlrequestinterceptor.moc"