Test local, secure and file redirects

Pick-to: 6.4 Task-number: QTBUG-99207 Change-Id: I28a3d06f97c0973ccc0f23bd90de58e89b19eb7a Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2022-06-03 15:49:19 +0200
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2022-06-18 20:33:06 +0200
commit: e2d3beb65653bb96342a80b436d8935e903fdd70 (patch)
tree: d3f9df2647ea27c5e092a1d53a701e2b09b8043c /tests/auto
parent: b99042fb839021a0a3d2fe0cac7ac3899c4acbba (diff)
3 files changed, 178 insertions, 30 deletions
diff --git a/tests/auto/core/origins/resources/redirect.css b/tests/auto/core/origins/resources/redirect.css
index 9c4308c07..a6a03d8f5 100644
--- a/tests/auto/core/origins/resources/redirect.css
+++ b/tests/auto/core/origins/resources/redirect.css
@@ -1,8 +1,3 @@
-@font-face {
-    font-family: 'MyWebFont';
-    src: url('redirect:redirect-secure/resources/Akronim-Regular.woff2') format('woff2');
-}
-
 body {
-    font-family: 'MyWebFont', Fallback, sans-serif;
+    font-family: serif;
 }
diff --git a/tests/auto/core/origins/resources/redirect.html b/tests/auto/core/origins/resources/redirect.html
index bc4a9b80e..603cb76f0 100644
--- a/tests/auto/core/origins/resources/redirect.html
+++ b/tests/auto/core/origins/resources/redirect.html
@@ -2,7 +2,14 @@
 <html>
     <head>
         <title>redirect</title>
-        <link rel="stylesheet" href="redirect:redirect-secure/resources/redirect.css">
+        <script>
+            function addStylesheetLink(src) {
+                let link = document.createElement('link');
+                link.rel = 'stylesheet';
+                link.href = src;
+                document.getElementsByTagName("head")[0].appendChild(link);
+             }
+        </script>
     </head>
     <body>
         Text
diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp
index 6600bbc33..dc6c57e2a 100644
--- a/tests/auto/core/origins/tst_origins.cpp
+++ b/tests/auto/core/origins/tst_origins.cpp
@@ -140,11 +140,22 @@ void registerSchemes()
     }
 
     {
+        QWebEngineUrlScheme scheme(QBAL("redirect-local"));
+        scheme.setFlags(QWebEngineUrlScheme::LocalScheme | QWebEngineUrlScheme::LocalAccessAllowed);
+        QWebEngineUrlScheme::registerScheme(scheme);
+    }
+
+    {
         QWebEngineUrlScheme scheme(QBAL("cors"));
         scheme.setFlags(QWebEngineUrlScheme::CorsEnabled);
         QWebEngineUrlScheme::registerScheme(scheme);
     }
     {
+        QWebEngineUrlScheme scheme(QBAL("secure-cors"));
+        scheme.setFlags(QWebEngineUrlScheme::SecureScheme | QWebEngineUrlScheme::CorsEnabled);
+        QWebEngineUrlScheme::registerScheme(scheme);
+    }
+    {
         QWebEngineUrlScheme scheme(QBAL("localaccess"));
         scheme.setFlags(QWebEngineUrlScheme::LocalAccessAllowed);
         QWebEngineUrlScheme::registerScheme(scheme);
@@ -190,7 +201,9 @@ public:
         profile->installUrlSchemeHandler(QBAL("HostPortAndUserInformationSyntax"), this);
         profile->installUrlSchemeHandler(QBAL("redirect"), this);
         profile->installUrlSchemeHandler(QBAL("redirect-secure"), this);
+        profile->installUrlSchemeHandler(QBAL("redirect-local"), this);
         profile->installUrlSchemeHandler(QBAL("cors"), this);
+        profile->installUrlSchemeHandler(QBAL("secure-cors"), this);
         profile->installUrlSchemeHandler(QBAL("localaccess"), this);
         profile->installUrlSchemeHandler(QBAL("local"), this);
         profile->installUrlSchemeHandler(QBAL("local-localaccess"), this);
@@ -310,7 +323,13 @@ private Q_SLOTS:
     void viewSource();
     void createObjectURL();
     void redirectScheme();
+    void redirectSchemeLocal();
+    void redirectSchemeSecure();
     void redirectInterceptor();
+    void redirectInterceptorLocal();
+    void redirectInterceptorSecure();
+    void redirectInterceptorFile();
+    void redirectInterceptorHttp();
 
 private:
     bool verifyLoad(const QUrl &url)
@@ -1264,15 +1283,39 @@ void tst_Origins::createObjectURL()
 
 void tst_Origins::redirectScheme()
 {
-    QVERIFY(verifyLoad(QSL("redirect:redirect-secure/resources/redirect.html")));
-    QTRY_COMPARE(m_handler->requests().size(), 7);
-    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("redirect:redirect-secure/resources/redirect.html")));
-    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("redirect-secure:/resources/redirect.html")));
-    QCOMPARE(m_handler->requests()[2], QUrl(QStringLiteral("redirect:redirect-secure/resources/redirect.css")));
-    QCOMPARE(m_handler->requests()[3], QUrl(QStringLiteral("redirect-secure:/resources/redirect.css")));
-    QCOMPARE(m_handler->requests()[4], QUrl(QStringLiteral("redirect:redirect-secure/resources/Akronim-Regular.woff2")));
-    QCOMPARE(m_handler->requests()[5], QUrl(QStringLiteral("redirect:redirect-secure/resources/Akronim-Regular.woff2")));
-    QCOMPARE(m_handler->requests()[6], QUrl(QStringLiteral("redirect-secure:/resources/Akronim-Regular.woff2")));
+    QVERIFY(verifyLoad(QSL("redirect:cors/resources/redirect.html")));
+    eval("addStylesheetLink('redirect:cors/resources/redirect.css')");
+    QTRY_COMPARE(m_handler->requests().size(), 4);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("redirect:cors/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("cors:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[2], QUrl(QStringLiteral("redirect:cors/resources/redirect.css")));
+    QCOMPARE(m_handler->requests()[3], QUrl(QStringLiteral("cors:/resources/redirect.css")));
+
+    QVERIFY(!verifyLoad(QSL("redirect:file/resources/redirect.html")));
+    QVERIFY(!verifyLoad(QSL("redirect:local/resources/redirect.html")));
+    QVERIFY(!verifyLoad(QSL("redirect:local-cors/resources/redirect.html")));
+}
+
+void tst_Origins::redirectSchemeLocal()
+{
+    QVERIFY(verifyLoad(QSL("redirect-local:local/resources/redirect.html")));
+    eval("addStylesheetLink('redirect-local:local/resources/redirect.css')");
+    QTRY_COMPARE(m_handler->requests().size(), 4);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("redirect-local:local/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("local:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[2], QUrl(QStringLiteral("redirect-local:local/resources/redirect.css")));
+    QCOMPARE(m_handler->requests()[3], QUrl(QStringLiteral("local:/resources/redirect.css")));
+}
+
+void tst_Origins::redirectSchemeSecure()
+{
+    QVERIFY(verifyLoad(QSL("redirect-secure:secure-cors/resources/redirect.html")));
+    eval("addStylesheetLink('redirect-secure:secure-cors/resources/redirect.css')");
+    QTRY_COMPARE(m_handler->requests().size(), 4);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("redirect-secure:secure-cors/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("secure-cors:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[2], QUrl(QStringLiteral("redirect-secure:secure-cors/resources/redirect.css")));
+    QCOMPARE(m_handler->requests()[3], QUrl(QStringLiteral("secure-cors:/resources/redirect.css")));
 }
 
 void tst_Origins::redirectInterceptor()
@@ -1280,20 +1323,123 @@ void tst_Origins::redirectInterceptor()
     TestRequestInterceptor interceptor;
     m_profile.setUrlRequestInterceptor(&interceptor);
 
-    QVERIFY(verifyLoad(QSL("redirect:redirect-secure/resources/redirect.html")));
-    QTRY_COMPARE(interceptor.requests.size(), 7);
-    QTRY_COMPARE(m_handler->requests().size(), 3);
-    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("redirect-secure:/resources/redirect.html")));
-    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("redirect-secure:/resources/redirect.css")));
-    QCOMPARE(m_handler->requests()[2], QUrl(QStringLiteral("redirect-secure:/resources/Akronim-Regular.woff2")));
-
-    QCOMPARE(interceptor.requests[0], QUrl(QStringLiteral("redirect:redirect-secure/resources/redirect.html")));
-    QCOMPARE(interceptor.requests[1], QUrl(QStringLiteral("redirect-secure:/resources/redirect.html")));
-    QCOMPARE(interceptor.requests[2], QUrl(QStringLiteral("redirect:redirect-secure/resources/redirect.css")));
-    QCOMPARE(interceptor.requests[3], QUrl(QStringLiteral("redirect-secure:/resources/redirect.css")));
-    QCOMPARE(interceptor.requests[4], QUrl(QStringLiteral("redirect:redirect-secure/resources/Akronim-Regular.woff2")));
-    QCOMPARE(interceptor.requests[5], QUrl(QStringLiteral("redirect:redirect-secure/resources/Akronim-Regular.woff2")));
-    QCOMPARE(interceptor.requests[6], QUrl(QStringLiteral("redirect-secure:/resources/Akronim-Regular.woff2")));
+    QVERIFY(verifyLoad(QSL("redirect:cors/resources/redirect.html")));
+    eval("addStylesheetLink('redirect:cors/resources/redirect.css')");
+
+    QTRY_COMPARE(interceptor.requests.size(), 4);
+    QTRY_COMPARE(m_handler->requests().size(), 2);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("cors:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("cors:/resources/redirect.css")));
+
+    QCOMPARE(interceptor.requests[0], QUrl(QStringLiteral("redirect:cors/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[1], QUrl(QStringLiteral("cors:/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[2], QUrl(QStringLiteral("redirect:cors/resources/redirect.css")));
+    QCOMPARE(interceptor.requests[3], QUrl(QStringLiteral("cors:/resources/redirect.css")));
+
+    QVERIFY(!verifyLoad(QSL("redirect:file/resources/redirect.html")));
+    QVERIFY(!verifyLoad(QSL("redirect:local/resources/redirect.html")));
+    QVERIFY(!verifyLoad(QSL("redirect:local-cors/resources/redirect.html")));
+}
+
+void tst_Origins::redirectInterceptorLocal()
+{
+    TestRequestInterceptor interceptor;
+    m_profile.setUrlRequestInterceptor(&interceptor);
+
+    QVERIFY(verifyLoad(QSL("redirect-local:local/resources/redirect.html")));
+    eval("addStylesheetLink('redirect-local:local/resources/redirect.css')");
+
+    QTRY_COMPARE(interceptor.requests.size(), 4);
+    QTRY_COMPARE(m_handler->requests().size(), 2);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("local:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("local:/resources/redirect.css")));
+
+    QCOMPARE(interceptor.requests[0], QUrl(QStringLiteral("redirect-local:local/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[1], QUrl(QStringLiteral("local:/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[2], QUrl(QStringLiteral("redirect-local:local/resources/redirect.css")));
+    QCOMPARE(interceptor.requests[3], QUrl(QStringLiteral("local:/resources/redirect.css")));
+}
+
+void tst_Origins::redirectInterceptorSecure()
+{
+    TestRequestInterceptor interceptor;
+    m_profile.setUrlRequestInterceptor(&interceptor);
+
+    QVERIFY(verifyLoad(QSL("redirect-secure:secure-cors/resources/redirect.html")));
+    eval("addStylesheetLink('redirect-secure:secure-cors/resources/redirect.css')");
+
+    QTRY_COMPARE(interceptor.requests.size(), 4);
+    QTRY_COMPARE(m_handler->requests().size(), 2);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("secure-cors:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("secure-cors:/resources/redirect.css")));
+
+    QCOMPARE(interceptor.requests[0], QUrl(QStringLiteral("redirect-secure:secure-cors/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[1], QUrl(QStringLiteral("secure-cors:/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[2], QUrl(QStringLiteral("redirect-secure:secure-cors/resources/redirect.css")));
+    QCOMPARE(interceptor.requests[3], QUrl(QStringLiteral("secure-cors:/resources/redirect.css")));
+}
+
+class TestRedirectInterceptor : public QWebEngineUrlRequestInterceptor
+{
+public:
+    TestRedirectInterceptor() = default;
+    void interceptRequest(QWebEngineUrlRequestInfo &info) override
+    {
+        qCDebug(lc) << this << "Type:" << info.resourceType() << info.requestMethod() << "Navigation:" << info.navigationType()
+                    << info.requestUrl() << "Initiator:" << info.initiator();
+
+        QUrl url = info.requestUrl();
+        requests << url;
+        if (url.path().startsWith("/redirect")) {
+            QString path = url.path();
+            int idx = path.indexOf(QChar('/'), 10);
+            if (idx > 0) {
+                url.setScheme(path.mid(10, idx - 10));
+                url.setPath(path.mid(idx, -1));
+                url.setHost({});
+                info.redirect(url);
+            }
+        }
+    }
+    QList<QUrl> requests;
+};
+
+void tst_Origins::redirectInterceptorFile()
+{
+    TestRedirectInterceptor interceptor;
+    m_profile.setUrlRequestInterceptor(&interceptor);
+
+    QVERIFY(verifyLoad(QSL("file:///redirect/local-cors/resources/redirect.html")));
+    eval("addStylesheetLink('file:///redirect/local-cors/resources/redirect.css')");
+
+    QTRY_COMPARE(interceptor.requests.size(), 4);
+    QTRY_COMPARE(m_handler->requests().size(), 2);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("local-cors:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("local-cors:/resources/redirect.css")));
+
+    QCOMPARE(interceptor.requests[0], QUrl(QStringLiteral("file:///redirect/local-cors/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[1], QUrl(QStringLiteral("local-cors:/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[2], QUrl(QStringLiteral("file:///redirect/local-cors/resources/redirect.css")));
+    QCOMPARE(interceptor.requests[3], QUrl(QStringLiteral("local-cors:/resources/redirect.css")));
+}
+
+void tst_Origins::redirectInterceptorHttp()
+{
+    TestRedirectInterceptor interceptor;
+    m_profile.setUrlRequestInterceptor(&interceptor);
+
+    QVERIFY(verifyLoad(QSL("http://hallo/redirect/cors/resources/redirect.html")));
+    eval("addStylesheetLink('http://hallo/redirect/cors/resources/redirect.css')");
+
+    QTRY_COMPARE(interceptor.requests.size(), 4);
+    QTRY_COMPARE(m_handler->requests().size(), 2);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("cors:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("cors:/resources/redirect.css")));
+
+    QCOMPARE(interceptor.requests[0], QUrl(QStringLiteral("http://hallo/redirect/cors/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[1], QUrl(QStringLiteral("cors:/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[2], QUrl(QStringLiteral("http://hallo/redirect/cors/resources/redirect.css")));
+    QCOMPARE(interceptor.requests[3], QUrl(QStringLiteral("cors:/resources/redirect.css")));
 }
 
 void tst_Origins::localMediaBlock_data()
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2022-06-03 15:49:19 +0200
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2022-06-18 20:33:06 +0200
commit	e2d3beb65653bb96342a80b436d8935e903fdd70 (patch)
tree	d3f9df2647ea27c5e092a1d53a701e2b09b8043c /tests/auto
parent	b99042fb839021a0a3d2fe0cac7ac3899c4acbba (diff)