From e1b010ff47ae81067802d9240ea990d6d9187484 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Mon, 7 Jun 2021 16:56:59 +0200 Subject: QNetworkReply: Add two new signals MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These signals allow monitoring where in the HTTP1/HTTP2 flow a request is currently in. Fixes: QTBUG-71698 Fixes: QTBUG-18766 Change-Id: Icc2fe435afc9f680fa7a76c32731e25fcdfeb4b4 Reviewed-by: Qt CI Bot Reviewed-by: Mårten Nordheim --- tests/auto/network/access/http2/tst_http2.cpp | 74 ++++++++++++++++++++++ .../access/qnetworkreply/tst_qnetworkreply.cpp | 55 ++++++++++++++++ 2 files changed, 129 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp index 25d704a06c..229e21ba03 100644 --- a/tests/auto/network/access/http2/tst_http2.cpp +++ b/tests/auto/network/access/http2/tst_http2.cpp @@ -105,6 +105,9 @@ private slots: void connectToHost(); void maxFrameSize(); + void moreActivitySignals_data(); + void moreActivitySignals(); + void contentEncoding_data(); void contentEncoding(); @@ -785,6 +788,77 @@ void tst_Http2::maxFrameSize() QVERIFY(serverGotSettingsACK); } +void tst_Http2::moreActivitySignals_data() +{ + QTest::addColumn("h2Attribute"); + QTest::addColumn("connectionType"); + + QTest::addRow("h2c-upgrade") + << QNetworkRequest::Http2AllowedAttribute << H2Type::h2c; + QTest::addRow("h2c-direct") + << QNetworkRequest::Http2DirectAttribute << H2Type::h2cDirect; + + if (!clearTextHTTP2) + QTest::addRow("h2-ALPN") + << QNetworkRequest::Http2AllowedAttribute << H2Type::h2Alpn; + +#if QT_CONFIG(ssl) + QTest::addRow("h2-direct") + << QNetworkRequest::Http2DirectAttribute << H2Type::h2Direct; +#endif +} + +void tst_Http2::moreActivitySignals() +{ + clearHTTP2State(); + +#if QT_CONFIG(securetransport) + // Normally on macOS we use plain text only for SecureTransport + // does not support ALPN on the server side. With 'direct encrytped' + // we have to use TLS sockets (== private key) and thus suppress a + // keychain UI asking for permission to use a private key. + // Our CI has this, but somebody testing locally - will have a problem. + qputenv("QT_SSL_USE_TEMPORARY_KEYCHAIN", QByteArray("1")); + auto envRollback = qScopeGuard([]() { qunsetenv("QT_SSL_USE_TEMPORARY_KEYCHAIN"); }); +#endif + + serverPort = 0; + QFETCH(H2Type, connectionType); + ServerPtr srv(newServer(defaultServerSettings, connectionType)); + QMetaObject::invokeMethod(srv.data(), "startServer", Qt::QueuedConnection); + runEventLoop(100); + QVERIFY(serverPort != 0); + auto url = requestUrl(connectionType); + url.setPath(QString("/stream1.html")); + QNetworkRequest request(url); + QFETCH(const QNetworkRequest::Attribute, h2Attribute); + request.setAttribute(h2Attribute, QVariant(true)); + request.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("text/plain")); + QSharedPointer reply(manager->get(request)); + nRequests = 1; + connect(reply.data(), &QNetworkReply::finished, this, &tst_Http2::replyFinished); + QSignalSpy spy1(reply.data(), SIGNAL(socketConnecting())); + QSignalSpy spy2(reply.data(), SIGNAL(requestSent())); + QSignalSpy spy3(reply.data(), SIGNAL(metaDataChanged())); + // Since we're using self-signed certificates, + // ignore SSL errors: + reply->ignoreSslErrors(); + + spy1.wait(); + spy2.wait(); + spy3.wait(); + + runEventLoop(); + STOP_ON_FAILURE + + QVERIFY(nRequests == 0); + QVERIFY(prefaceOK); + QVERIFY(serverGotSettingsACK); + + QVERIFY(reply->error() == QNetworkReply::NoError); + QVERIFY(reply->isFinished()); +} + void tst_Http2::contentEncoding_data() { QTest::addColumn("encoding"); diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index ccc70cfff4..308b2a70d1 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -507,6 +507,9 @@ private Q_SLOTS: void getWithTimeout(); void postWithTimeout(); + void moreActivitySignals_data(); + void moreActivitySignals(); + void contentEncoding_data(); void contentEncoding(); void contentEncodingBigPayload_data(); @@ -9370,6 +9373,58 @@ void tst_QNetworkReply::postWithTimeout() manager.setTransferTimeout(0); } +void tst_QNetworkReply::moreActivitySignals_data() +{ + QTest::addColumn("url"); + QTest::addColumn("useipv6"); + QTest::addRow("local4") << QUrl("http://127.0.0.1") << false; + QTest::addRow("local6") << QUrl("http://[::1]") << true; + if (qEnvironmentVariable("QTEST_ENVIRONMENT").split(' ').contains("ci")) { + // On CI server + QTest::addRow("localDns") << QUrl("http://localhost") << false; // will find v6 + } else { + // For manual testing + QTest::addRow("localDns4") << QUrl("http://localhost") << true; // will find both v4 and v6 + QTest::addRow("localDns6") << QUrl("http://localhost") << false; // will find both v4 and v6 + } +} + +void tst_QNetworkReply::moreActivitySignals() +{ + QFETCH(QUrl, url); + QFETCH(bool, useipv6); + MiniHttpServer server(tst_QNetworkReply::httpEmpty200Response, false, nullptr/*thread*/, useipv6); + server.doClose = false; + url.setPort(server.serverPort()); + QNetworkRequest request(url); + QNetworkReplyPtr reply(manager.get(request)); + QSignalSpy spy1(reply.data(), SIGNAL(socketConnecting())); + QSignalSpy spy2(reply.data(), SIGNAL(requestSent())); + QSignalSpy spy3(reply.data(), SIGNAL(metaDataChanged())); + QSignalSpy spy4(reply.data(), SIGNAL(finished())); + spy1.wait(); + QCOMPARE(spy1.count(), 1); + spy2.wait(); + QCOMPARE(spy2.count(), 1); + spy3.wait(); + QCOMPARE(spy3.count(), 1); + spy4.wait(); + QCOMPARE(spy4.count(), 1); + QVERIFY(reply->error() == QNetworkReply::NoError); + // Second request will not send socketConnecting because of keep-alive, so don't check it. + QNetworkReplyPtr secondreply(manager.get(request)); + QSignalSpy secondspy2(secondreply.data(), SIGNAL(requestSent())); + QSignalSpy secondspy3(secondreply.data(), SIGNAL(metaDataChanged())); + QSignalSpy secondspy4(secondreply.data(), SIGNAL(finished())); + secondspy2.wait(); + QCOMPARE(secondspy2.count(), 1); + secondspy3.wait(); + QCOMPARE(secondspy3.count(), 1); + secondspy4.wait(); + QCOMPARE(secondspy4.count(), 1); + QVERIFY(secondreply->error() == QNetworkReply::NoError); +} + void tst_QNetworkReply::contentEncoding_data() { QTest::addColumn("encoding"); -- cgit v1.2.3