diff options
Diffstat (limited to 'tests/auto/network/access/qhttpnetworkreply')
3 files changed, 111 insertions, 43 deletions
diff --git a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt index f9ba96cf13..b4e4a822ee 100644 --- a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt +++ b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt @@ -1,4 +1,11 @@ -# Generated from qhttpnetworkreply.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qhttpnetworkreply LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() if(NOT QT_FEATURE_private_tests) return() @@ -8,13 +15,10 @@ endif() ## tst_qhttpnetworkreply Test: ##################################################################### -qt_add_test(tst_qhttpnetworkreply +qt_internal_add_test(tst_qhttpnetworkreply SOURCES tst_qhttpnetworkreply.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::NetworkPrivate ) - -#### Keys ignored in scope 1:.:.:qhttpnetworkreply.pro:<TRUE>: -# _REQUIREMENTS = "qtConfig(private_tests)" diff --git a/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro b/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro deleted file mode 100644 index 31570e6f01..0000000000 --- a/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qhttpnetworkreply -SOURCES += tst_qhttpnetworkreply.cpp -requires(qtConfig(private_tests)) - -QT = core-private network-private testlib diff --git a/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp b/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp index d230fcad4b..e83d15fdc3 100644 --- a/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp +++ b/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp @@ -1,35 +1,11 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include <QtTest/QtTest> +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + + +#include <QTest> #include <QtCore/QBuffer> #include <QtCore/QByteArray> +#include <QtCore/QStringBuilder> #include "private/qhttpnetworkconnection_p.h" @@ -40,6 +16,9 @@ private Q_SLOTS: void parseHeader_data(); void parseHeader(); + void parseHeaderVerification_data(); + void parseHeaderVerification(); + void parseEndOfHeader_data(); void parseEndOfHeader(); }; @@ -50,6 +29,7 @@ void tst_QHttpNetworkReply::parseHeader_data() QTest::addColumn<QStringList>("fields"); QTest::addColumn<QStringList>("values"); + QTest::newRow("no-fields") << QByteArray("\r\n") << QStringList() << QStringList(); QTest::newRow("empty-field") << QByteArray("Set-Cookie: \r\n") << (QStringList() << "Set-Cookie") << (QStringList() << ""); @@ -60,6 +40,9 @@ void tst_QHttpNetworkReply::parseHeader_data() " charset=utf-8\r\n") << (QStringList() << "Content-Type") << (QStringList() << "text/html; charset=utf-8"); + QTest::newRow("single-field-on-five-lines") + << QByteArray("Name:\r\n first\r\n \r\n \r\n last\r\n") << (QStringList() << "Name") + << (QStringList() << "first last"); QTest::newRow("multi-field") << QByteArray("Content-Type: text/html; charset=utf-8\r\n" "Content-Length: 1024\r\n" @@ -94,13 +77,100 @@ void tst_QHttpNetworkReply::parseHeader() QHttpNetworkReply reply; reply.parseHeader(headers); - for (int i = 0; i < fields.count(); ++i) { + for (int i = 0; i < fields.size(); ++i) { //qDebug() << "field" << fields.at(i) << "value" << reply.headerField(fields.at(i)) << "expected" << values.at(i); QString field = reply.headerField(fields.at(i).toLatin1()); QCOMPARE(field, values.at(i)); } } +void tst_QHttpNetworkReply::parseHeaderVerification_data() +{ + QTest::addColumn<QByteArray>("headers"); + QTest::addColumn<bool>("success"); + + QTest::newRow("no-header-fields") << QByteArray("\r\n") << true; + QTest::newRow("starting-with-space") << QByteArray(" Content-Encoding: gzip\r\n") << false; + QTest::newRow("starting-with-tab") << QByteArray("\tContent-Encoding: gzip\r\n") << false; + QTest::newRow("only-colon") << QByteArray(":\r\n") << false; + QTest::newRow("colon-and-value") << QByteArray(": only-value\r\n") << false; + QTest::newRow("name-with-space") << QByteArray("Content Length: 10\r\n") << false; + QTest::newRow("missing-colon-1") << QByteArray("Content-Encoding\r\n") << false; + QTest::newRow("missing-colon-2") + << QByteArray("Content-Encoding\r\nContent-Length: 10\r\n") << false; + QTest::newRow("missing-colon-3") + << QByteArray("Content-Encoding: gzip\r\nContent-Length\r\n") << false; + QTest::newRow("header-field-too-long") + << (QByteArray("Content-Type: ") + + QByteArray(HeaderConstants::MAX_HEADER_FIELD_SIZE, 'a') + QByteArray("\r\n")) + << false; + + QByteArray name = "Content-Type: "; + QTest::newRow("max-header-field-size") + << (name + QByteArray(HeaderConstants::MAX_HEADER_FIELD_SIZE - name.size(), 'a') + + QByteArray("\r\n")) + << true; + + QByteArray tooManyHeaders = QByteArray("Content-Type: text/html; charset=utf-8\r\n") + .repeated(HeaderConstants::MAX_HEADER_FIELDS + 1); + QTest::newRow("too-many-headers") << tooManyHeaders << false; + + QByteArray maxHeaders = QByteArray("Content-Type: text/html; charset=utf-8\r\n") + .repeated(HeaderConstants::MAX_HEADER_FIELDS); + QTest::newRow("max-headers") << maxHeaders << true; + + QByteArray firstValue(HeaderConstants::MAX_HEADER_FIELD_SIZE / 2, 'a'); + constexpr int obsFold = 1; + QTest::newRow("max-continuation-size") + << (name + firstValue + QByteArray("\r\n ") + + QByteArray(HeaderConstants::MAX_HEADER_FIELD_SIZE - name.size() + - firstValue.size() - obsFold, + 'b') + + QByteArray("\r\n")) + << true; + QTest::newRow("too-long-continuation-size") + << (name + firstValue + QByteArray("\r\n ") + + QByteArray(HeaderConstants::MAX_HEADER_FIELD_SIZE - name.size() + - firstValue.size() - obsFold + 1, + 'b') + + QByteArray("\r\n")) + << false; + + auto appendLongHeaderElement = [](QByteArray &result, QByteArrayView name) { + const qsizetype size = result.size(); + result += name; + result += ": "; + result.resize(size + HeaderConstants::MAX_HEADER_FIELD_SIZE, 'a'); + }; + QByteArray longHeader; + constexpr qsizetype TrailerLength = sizeof("\r\n\r\n") - 1; // we ignore the trailing newlines + longHeader.reserve(HeaderConstants::MAX_TOTAL_HEADER_SIZE + TrailerLength + 1); + appendLongHeaderElement(longHeader, "Location"); + longHeader += "\r\n"; + appendLongHeaderElement(longHeader, "WWW-Authenticate"); + longHeader += "\r\nProxy-Authenticate: "; + longHeader.resize(HeaderConstants::MAX_TOTAL_HEADER_SIZE, 'a'); + longHeader += "\r\n\r\n"; + + // Test with headers which are just large enough to fit our MAX_TOTAL_HEADER_SIZE limit: + QTest::newRow("total-header-close-to-max-size") << longHeader << true; + // Now add another character to make the total header size exceed the limit: + longHeader.insert(HeaderConstants::MAX_TOTAL_HEADER_SIZE - TrailerLength, 'a'); + QTest::newRow("total-header-too-large") << longHeader << false; +} + +void tst_QHttpNetworkReply::parseHeaderVerification() +{ + QFETCH(QByteArray, headers); + QFETCH(bool, success); + QHttpNetworkReply reply; + reply.parseHeader(headers); + if (success && QByteArrayView(headers).trimmed().size()) + QVERIFY(reply.header().size() > 0); + else + QCOMPARE(reply.header().size(), 0); +} + class TestHeaderSocket : public QAbstractSocket { public: |