QWebEngineLoadingInfo: Add response headers

This change adds a member variable that contains the response headers
to QWebEngineLoadingInfo. It is filled when a
QWebEngineLoadingInfo instance is constructed inside
WebContentsDelegateQt::emitLoadFinished(bool).

The response headers are extracted from the navigation handle when
WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *)
is called.

The response headers are non-empty when QWebEngineLoadingInfo::status()
is equal to QWebEngineLoadingInfo::LoadSucceededStatus or
QWebEngineLoadingInfo::LoadFailedStatus.

Fixes: QTBUG-106862
Change-Id: I4d196e3cc71725ddad9a5832af72d1b4e50924c8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

4 files changed, 105 insertions, 1 deletions

diff --git a/tests/auto/core/CMakeLists.txt b/tests/auto/core/CMakeLists.txt
index 3f10e8303..6ba6ffd92 100644
--- a/tests/auto/core/CMakeLists.txt
+++ b/tests/auto/core/CMakeLists.txt
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 add_subdirectory(qwebenginecookiestore)
+add_subdirectory(qwebengineloadinginfo)
 add_subdirectory(qwebenginesettings)
 add_subdirectory(qwebengineurlrequestinterceptor)
 add_subdirectory(qwebengineurlrequestjob)
diff --git a/tests/auto/core/qwebengineloadinginfo/CMakeLists.txt b/tests/auto/core/qwebengineloadinginfo/CMakeLists.txt
new file mode 100644
index 000000000..09d9c30f5
--- /dev/null
+++ b/tests/auto/core/qwebengineloadinginfo/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+qt_internal_add_test(tst_qwebengineloadinginfo
+    SOURCES
+        tst_qwebengineloadinginfo.cpp
+    LIBRARIES
+        Qt::WebEngineCore
+        Test::HttpServer
+)
diff --git a/tests/auto/core/qwebengineloadinginfo/tst_qwebengineloadinginfo.cpp b/tests/auto/core/qwebengineloadinginfo/tst_qwebengineloadinginfo.cpp
new file mode 100644
index 000000000..064abe816
--- /dev/null
+++ b/tests/auto/core/qwebengineloadinginfo/tst_qwebengineloadinginfo.cpp
@@ -0,0 +1,91 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include <QtTest/QtTest>
+#include <QtWebEngineCore/qwebengineprofile.h>
+#include <QtWebEngineCore/qwebenginepage.h>
+#include <QtWebEngineCore/qwebengineloadinginfo.h>
+#include <QtWebEngineCore/qwebenginehttprequest.h>
+
+#include <httpserver.h>
+#include <httpreqrep.h>
+
+typedef QHash<QByteArray, QByteArray> Map;
+
+class tst_QWebEngineLoadingInfo : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QWebEngineLoadingInfo() { }
+
+public slots:
+    void loadingInfoChanged(QWebEngineLoadingInfo loadingInfo)
+    {
+        const auto responseHeaders = loadingInfo.responseHeaders();
+        QFETCH(Map, expected);
+
+        if (loadingInfo.status() == QWebEngineLoadingInfo::LoadSucceededStatus
+            || loadingInfo.status() == QWebEngineLoadingInfo::LoadFailedStatus) {
+            if (!expected.empty())
+                QCOMPARE(responseHeaders, expected);
+        } else {
+            QVERIFY(responseHeaders.size() == 0);
+        }
+    }
+
+private Q_SLOTS:
+    void responseHeaders_data()
+    {
+        QTest::addColumn<int>("responseCode");
+        QTest::addColumn<Map>("input");
+        QTest::addColumn<Map>("expected");
+
+        const Map empty;
+        const Map input {
+            std::make_pair("header1", "value1"),
+            std::make_pair("header2", "value2")
+        };
+        const Map expected {
+            std::make_pair("header1", "value1"),
+            std::make_pair("header2", "value2"),
+            std::make_pair("Connection", "close")
+        };
+
+
+        QTest::newRow("with headers HTTP 200") << 200 << input << expected;
+        QTest::newRow("with headers HTTP 500") << 500 << input << expected;
+        QTest::newRow("without headers HTTP 200") << 200 << empty << empty;
+        QTest::newRow("without headers HTTP 500") << 500 << empty << empty;
+    }
+
+    void responseHeaders()
+    {
+        HttpServer httpServer;
+
+        QFETCH(Map, input);
+        QFETCH(int, responseCode);
+        QObject::connect(&httpServer, &HttpServer::newRequest, this, [&](HttpReqRep *rr) {
+            for (auto it = input.cbegin(); it != input.cend(); ++it)
+                rr->setResponseHeader(it.key(), it.value());
+
+            rr->sendResponse(responseCode);
+        });
+        QVERIFY(httpServer.start());
+
+        QWebEngineProfile profile;
+        QWebEnginePage page(&profile);
+        QSignalSpy spy(&page, SIGNAL(loadFinished(bool)));
+        QObject::connect(&page, &QWebEnginePage::loadingChanged, this, &tst_QWebEngineLoadingInfo::loadingInfoChanged);
+
+
+        QWebEngineHttpRequest request(httpServer.url("/somepage.html"));
+        page.load(request);
+
+        QVERIFY(spy.wait());
+        QVERIFY(httpServer.stop());
+    }
+};
+
+QTEST_MAIN(tst_QWebEngineLoadingInfo)
+#include "tst_qwebengineloadinginfo.moc"
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index 0cd031940..8b366f413 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -84,7 +84,8 @@ static const QStringList hardcodedTypes = QStringList()
     << "QWebEngineCookieStore*"
     << "Qt::LayoutDirection"
     << "QQuickWebEngineScriptCollection*"
-    << "QQmlComponent*";
+    << "QQmlComponent*"
+    << "QHash<QByteArray,QByteArray>";
 
 static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineAction.text --> QString"
@@ -293,6 +294,7 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineJavaScriptDialogRequest.title --> QString"
     << "QQuickWebEngineJavaScriptDialogRequest.type --> QQuickWebEngineJavaScriptDialogRequest::DialogType"
     << "QWebEngineLoadingInfo.errorCode --> int"
+    << "QWebEngineLoadingInfo.responseHeaders --> QHash<QByteArray,QByteArray>"
     << "QWebEngineLoadingInfo.errorDomain --> QWebEngineLoadingInfo::ErrorDomain"
     << "QWebEngineLoadingInfo.errorString --> QString"
     << "QWebEngineLoadingInfo.status --> QWebEngineLoadingInfo::LoadStatus"