b41d5f6293
To retain backwards compatibility with some QNetworkReply usage, namely connecting solely to finished-signal and allocating a buffer to read into, but without storing the entire decompressed file in memory until read, we may decompress the file twice. With this patch users can now avoid this double decompression if the amount of buffered data stays below 10 MiB. This means any file smaller than 10 MiB will never need to be decompressed twice to know the size of it. On top of that, if the data is handled as it arrives (e.g. in readyRead) and the buffer is kept below 10 MiB it won't need to decompress twice either. This is active as long as "countDecompressed" is true, though it currently always is in QNetworkAccessManger, with a future goal to make it possible to control with public API. Since it requires the user to potentially adapt their usage of QNetworkReply. In this patch we also stop tracking the amount of unhandled uncompressed bytes (uncompressedBytes) in favor of tracking the total amount of bytes which has been read() by the user of QDecompressHelper (totalBytesRead), since we can more intuitively work out the total amount of unread bytes using this value. Change-Id: Ie3d8d6e39a18343fcf9b610f45c7fe7e4cd4e474 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
471 lines
15 KiB
C++
471 lines
15 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2020 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 <QTest>
|
|
|
|
#include <QtNetwork/private/qdecompresshelper_p.h>
|
|
|
|
#include <QtCore/qbytearray.h>
|
|
|
|
const QString srcDir = QStringLiteral(QT_STRINGIFY(SRC_DIR));
|
|
|
|
class tst_QDecompressHelper : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
private:
|
|
void sharedDecompress_data();
|
|
|
|
private Q_SLOTS:
|
|
void initTestCase();
|
|
void cleanupTestCase();
|
|
|
|
void encodingSupported();
|
|
|
|
void decompress_data();
|
|
void decompress();
|
|
|
|
void partialDecompress_data();
|
|
void partialDecompress();
|
|
|
|
void countAhead_data();
|
|
void countAhead();
|
|
void countAheadByteDataBuffer_data();
|
|
void countAheadByteDataBuffer();
|
|
|
|
void countAheadPartialRead_data();
|
|
void countAheadPartialRead();
|
|
|
|
void decompressBigData_data();
|
|
void decompressBigData();
|
|
|
|
void archiveBomb_data();
|
|
void archiveBomb();
|
|
|
|
void bigZlib();
|
|
};
|
|
|
|
void tst_QDecompressHelper::initTestCase()
|
|
{
|
|
Q_INIT_RESOURCE(gzip);
|
|
Q_INIT_RESOURCE(inflate);
|
|
#if QT_CONFIG(zstd)
|
|
Q_INIT_RESOURCE(zstandard);
|
|
#endif
|
|
}
|
|
void tst_QDecompressHelper::cleanupTestCase()
|
|
{
|
|
#if QT_CONFIG(zstd)
|
|
Q_CLEANUP_RESOURCE(zstandard);
|
|
#endif
|
|
Q_CLEANUP_RESOURCE(inflate);
|
|
Q_CLEANUP_RESOURCE(gzip);
|
|
}
|
|
|
|
void tst_QDecompressHelper::encodingSupported()
|
|
{
|
|
const QByteArrayList &accepted = QDecompressHelper::acceptedEncoding();
|
|
|
|
QVERIFY(QDecompressHelper::isSupportedEncoding("deflate"));
|
|
QVERIFY(accepted.contains("deflate"));
|
|
QVERIFY(QDecompressHelper::isSupportedEncoding("gzip"));
|
|
QVERIFY(accepted.contains("gzip"));
|
|
int expected = 2;
|
|
|
|
QVERIFY(accepted.indexOf("gzip") < accepted.indexOf("deflate"));
|
|
|
|
#if QT_CONFIG(brotli)
|
|
QVERIFY(QDecompressHelper::isSupportedEncoding("br"));
|
|
QVERIFY(accepted.contains("br"));
|
|
++expected;
|
|
#endif
|
|
|
|
#if QT_CONFIG(zstd)
|
|
QVERIFY(QDecompressHelper::isSupportedEncoding("zstd"));
|
|
QVERIFY(accepted.contains("zstd"));
|
|
++expected;
|
|
#endif
|
|
QCOMPARE(expected, accepted.size());
|
|
}
|
|
|
|
void tst_QDecompressHelper::sharedDecompress_data()
|
|
{
|
|
QTest::addColumn<QByteArray>("encoding");
|
|
QTest::addColumn<QByteArray>("data");
|
|
QTest::addColumn<QByteArray>("expected");
|
|
|
|
QTest::newRow("gzip-hello-world")
|
|
<< QByteArray("gzip")
|
|
<< QByteArray::fromBase64("H4sIAAAAAAAAA8tIzcnJVyjPL8pJAQCFEUoNCwAAAA==")
|
|
<< QByteArray("hello world");
|
|
|
|
// Has two streams. ZLib reports end of stream after the first one, but we need to decompress
|
|
// all of the streams to get the full file.
|
|
QTest::newRow("gzip-multistream-hello-world")
|
|
<< QByteArray("gzip")
|
|
<< QByteArray::fromBase64(
|
|
"H4sIAAAAAAAAA8tIzcnJBwCGphA2BQAAAB+LCAAAAAAAAANTKM8vykkBAMtCO0oGAAAA")
|
|
<< QByteArray("hello world");
|
|
|
|
QTest::newRow("deflate-hello-world")
|
|
<< QByteArray("deflate") << QByteArray::fromBase64("eJzLSM3JyVcozy/KSQEAGgsEXQ==")
|
|
<< QByteArray("hello world");
|
|
|
|
#if QT_CONFIG(brotli)
|
|
QTest::newRow("brotli-hello-world")
|
|
<< QByteArray("br") << QByteArray::fromBase64("DwWAaGVsbG8gd29ybGQD")
|
|
<< QByteArray("hello world");
|
|
#endif
|
|
|
|
#if QT_CONFIG(zstd)
|
|
QTest::newRow("zstandard-hello-world")
|
|
<< QByteArray("zstd") << QByteArray::fromBase64("KLUv/QRYWQAAaGVsbG8gd29ybGRoaR6y")
|
|
<< QByteArray("hello world");
|
|
#endif
|
|
}
|
|
|
|
void tst_QDecompressHelper::decompress_data()
|
|
{
|
|
sharedDecompress_data();
|
|
}
|
|
|
|
void tst_QDecompressHelper::decompress()
|
|
{
|
|
QDecompressHelper helper;
|
|
|
|
QFETCH(QByteArray, encoding);
|
|
QVERIFY(helper.setEncoding(encoding));
|
|
|
|
QFETCH(QByteArray, data);
|
|
helper.feed(data);
|
|
|
|
QFETCH(QByteArray, expected);
|
|
QByteArray actual(expected.size(), Qt::Uninitialized);
|
|
qsizetype read = helper.read(actual.data(), actual.size());
|
|
|
|
QCOMPARE(read, expected.size());
|
|
QCOMPARE(actual, expected);
|
|
}
|
|
|
|
void tst_QDecompressHelper::partialDecompress_data()
|
|
{
|
|
sharedDecompress_data();
|
|
}
|
|
|
|
// Test that even though we read 1 byte at a time we
|
|
// don't lose data from the decoder's internal storage
|
|
void tst_QDecompressHelper::partialDecompress()
|
|
{
|
|
QDecompressHelper helper;
|
|
|
|
QFETCH(QByteArray, encoding);
|
|
QVERIFY(helper.setEncoding(encoding));
|
|
|
|
QFETCH(QByteArray, data);
|
|
helper.feed(data);
|
|
|
|
QFETCH(QByteArray, expected);
|
|
QByteArray actual(expected.size(), Qt::Uninitialized);
|
|
qsizetype readTotal = 0;
|
|
while (helper.hasData()) {
|
|
qsizetype read = helper.read(actual.data() + readTotal, 1);
|
|
if (read != 0) // last read might return 0
|
|
QCOMPARE(read, 1); // Make sure we don't suddenly read too much
|
|
readTotal += read;
|
|
}
|
|
|
|
QCOMPARE(readTotal, expected.size());
|
|
QCOMPARE(actual, expected);
|
|
}
|
|
|
|
void tst_QDecompressHelper::countAhead_data()
|
|
{
|
|
sharedDecompress_data();
|
|
}
|
|
|
|
// Test the double-decompress / count uncompressed size feature.
|
|
// We expect that after it has been fed data it will be able to
|
|
// tell us the full size of the data when uncompressed.
|
|
void tst_QDecompressHelper::countAhead()
|
|
{
|
|
QDecompressHelper helper;
|
|
helper.setCountingBytesEnabled(true);
|
|
|
|
QFETCH(QByteArray, encoding);
|
|
QVERIFY(helper.setEncoding(encoding));
|
|
|
|
QFETCH(QByteArray, data);
|
|
QByteArray firstPart = data.left(data.size() - data.size() / 6);
|
|
QVERIFY(firstPart.size() < data.size()); // sanity check
|
|
QByteArray secondPart = data.mid(firstPart.size());
|
|
helper.feed(firstPart); // feed by copy
|
|
|
|
// it's a reasonable assumption that after feeding it the first part
|
|
// should have decompressed something
|
|
QVERIFY(helper.uncompressedSize() > 0);
|
|
|
|
helper.feed(std::move(secondPart)); // feed by move
|
|
|
|
QFETCH(QByteArray, expected);
|
|
QCOMPARE(helper.uncompressedSize(), expected.size());
|
|
|
|
QByteArray actual(helper.uncompressedSize(), Qt::Uninitialized);
|
|
qsizetype read = helper.read(actual.data(), actual.size());
|
|
|
|
QCOMPARE(read, expected.size());
|
|
QCOMPARE(actual, expected);
|
|
}
|
|
|
|
void tst_QDecompressHelper::countAheadByteDataBuffer_data()
|
|
{
|
|
sharedDecompress_data();
|
|
}
|
|
|
|
void tst_QDecompressHelper::countAheadByteDataBuffer()
|
|
{
|
|
QFETCH(QByteArray, encoding);
|
|
QFETCH(QByteArray, data);
|
|
QFETCH(QByteArray, expected);
|
|
{ // feed buffer by const-ref
|
|
QDecompressHelper helper;
|
|
helper.setCountingBytesEnabled(true);
|
|
QVERIFY(helper.setEncoding(encoding));
|
|
|
|
QByteArray firstPart = data.left(data.size() - data.size() / 6);
|
|
QVERIFY(firstPart.size() < data.size()); // sanity check
|
|
QByteArray secondPart = data.mid(firstPart.size());
|
|
|
|
QByteDataBuffer buffer;
|
|
buffer.append(firstPart);
|
|
buffer.append(secondPart);
|
|
|
|
helper.feed(buffer);
|
|
|
|
QCOMPARE(helper.uncompressedSize(), expected.size());
|
|
|
|
QByteArray actual(helper.uncompressedSize(), Qt::Uninitialized);
|
|
qsizetype read = helper.read(actual.data(), actual.size());
|
|
|
|
QCOMPARE(read, expected.size());
|
|
QCOMPARE(actual, expected);
|
|
}
|
|
{ // Feed buffer by move
|
|
QDecompressHelper helper;
|
|
helper.setCountingBytesEnabled(true);
|
|
QVERIFY(helper.setEncoding(encoding));
|
|
|
|
QByteArray firstPart = data.left(data.size() - data.size() / 6);
|
|
QVERIFY(firstPart.size() < data.size()); // sanity check
|
|
QByteArray secondPart = data.mid(firstPart.size());
|
|
|
|
QByteDataBuffer buffer;
|
|
buffer.append(firstPart);
|
|
buffer.append(secondPart);
|
|
|
|
helper.feed(std::move(buffer));
|
|
|
|
QCOMPARE(helper.uncompressedSize(), expected.size());
|
|
|
|
QByteArray actual(helper.uncompressedSize(), Qt::Uninitialized);
|
|
qsizetype read = helper.read(actual.data(), actual.size());
|
|
|
|
QCOMPARE(read, expected.size());
|
|
QCOMPARE(actual, expected);
|
|
}
|
|
}
|
|
|
|
void tst_QDecompressHelper::countAheadPartialRead_data()
|
|
{
|
|
sharedDecompress_data();
|
|
}
|
|
|
|
// Make sure that the size is adjusted as we read data
|
|
void tst_QDecompressHelper::countAheadPartialRead()
|
|
{
|
|
QDecompressHelper helper;
|
|
helper.setCountingBytesEnabled(true);
|
|
|
|
QFETCH(QByteArray, encoding);
|
|
QVERIFY(helper.setEncoding(encoding));
|
|
|
|
QFETCH(QByteArray, data);
|
|
QByteArray firstPart = data.left(data.size() - data.size() / 6);
|
|
QVERIFY(firstPart.size() < data.size()); // sanity check
|
|
QByteArray secondPart = data.mid(firstPart.size());
|
|
helper.feed(firstPart);
|
|
|
|
// it's a reasonable assumption that after feeding it half the data it
|
|
// should have decompressed something
|
|
QVERIFY(helper.uncompressedSize() > 0);
|
|
|
|
helper.feed(secondPart);
|
|
|
|
QFETCH(QByteArray, expected);
|
|
QCOMPARE(helper.uncompressedSize(), expected.size());
|
|
|
|
QByteArray actual(helper.uncompressedSize(), Qt::Uninitialized);
|
|
qsizetype read = helper.read(actual.data(), 5);
|
|
QCOMPARE(read, 5);
|
|
QCOMPARE(helper.uncompressedSize(), expected.size() - read);
|
|
read += helper.read(actual.data() + read, 1);
|
|
QCOMPARE(read, 6);
|
|
QCOMPARE(helper.uncompressedSize(), expected.size() - read);
|
|
|
|
read += helper.read(actual.data() + read, expected.size() - read);
|
|
|
|
QCOMPARE(read, expected.size());
|
|
QCOMPARE(actual, expected);
|
|
}
|
|
|
|
void tst_QDecompressHelper::decompressBigData_data()
|
|
{
|
|
QTest::addColumn<QByteArray>("encoding");
|
|
QTest::addColumn<QString>("path");
|
|
QTest::addColumn<qint64>("size");
|
|
QTest::addColumn<bool>("countAhead");
|
|
|
|
qint64 fourGiB = 4ll * 1024ll * 1024ll * 1024ll;
|
|
qint64 fiveGiB = 5ll * 1024ll * 1024ll * 1024ll;
|
|
|
|
// Only use countAhead on one of these since they share codepath anyway
|
|
QTest::newRow("gzip-counted-4G") << QByteArray("gzip") << QString(":/4G.gz") << fourGiB << true;
|
|
QTest::newRow("deflate-5G") << QByteArray("deflate") << QString(":/5GiB.txt.inflate")
|
|
<< fiveGiB << false;
|
|
|
|
#if QT_CONFIG(brotli)
|
|
QTest::newRow("brotli-4G") << QByteArray("br") << (srcDir + "/4G.br") << fourGiB << false;
|
|
QTest::newRow("brotli-counted-4G") << QByteArray("br") << (srcDir + "/4G.br") << fourGiB << true;
|
|
#endif
|
|
|
|
#if QT_CONFIG(zstd)
|
|
QTest::newRow("zstandard-4G") << QByteArray("zstd") << (":/4G.zst") << fourGiB << false;
|
|
QTest::newRow("zstandard-counted-4G") << QByteArray("zstd") << (":/4G.zst") << fourGiB << true;
|
|
#endif
|
|
}
|
|
|
|
void tst_QDecompressHelper::decompressBigData()
|
|
{
|
|
QFETCH(QString, path);
|
|
QFile file(path);
|
|
QVERIFY(file.open(QIODevice::ReadOnly));
|
|
|
|
const qint64 third = file.bytesAvailable() / 3;
|
|
|
|
QDecompressHelper helper;
|
|
QFETCH(bool, countAhead);
|
|
helper.setCountingBytesEnabled(countAhead);
|
|
helper.setDecompressedSafetyCheckThreshold(-1);
|
|
QFETCH(QByteArray, encoding);
|
|
helper.setEncoding(encoding);
|
|
|
|
// The size of 'output' should be at least QDecompressHelper::MaxDecompressedDataBufferSize + 1
|
|
QByteArray output(10 * 1024 * 1024 + 1, Qt::Uninitialized);
|
|
qint64 totalSize = 0;
|
|
while (!file.atEnd()) {
|
|
helper.feed(file.read(third));
|
|
while (helper.hasData()) {
|
|
qsizetype bytesRead = helper.read(output.data(), output.size());
|
|
QVERIFY(bytesRead >= 0);
|
|
QVERIFY(bytesRead <= output.size());
|
|
totalSize += bytesRead;
|
|
const auto isZero = [](char c) { return c == '\0'; };
|
|
bool allZero = std::all_of(output.cbegin(), output.cbegin() + bytesRead, isZero);
|
|
QVERIFY(allZero);
|
|
}
|
|
}
|
|
QTEST(totalSize, "size");
|
|
}
|
|
|
|
void tst_QDecompressHelper::archiveBomb_data()
|
|
{
|
|
QTest::addColumn<QByteArray>("encoding");
|
|
QTest::addColumn<QString>("path");
|
|
QTest::addColumn<bool>("shouldFail");
|
|
|
|
QTest::newRow("gzip-10K") << QByteArray("gzip") << (srcDir + "/10K.gz") << false;
|
|
QTest::newRow("gzip-4G") << QByteArray("gzip") << QString(":/4G.gz") << true;
|
|
}
|
|
|
|
void tst_QDecompressHelper::archiveBomb()
|
|
{
|
|
QFETCH(bool, shouldFail);
|
|
QFETCH(QString, path);
|
|
QFile file(path);
|
|
QVERIFY(file.open(QIODevice::ReadOnly));
|
|
|
|
QDecompressHelper helper;
|
|
QFETCH(QByteArray, encoding);
|
|
helper.setEncoding(encoding);
|
|
QVERIFY(helper.isValid());
|
|
|
|
constexpr qint64 SafeSizeLimit = 10 * 1024 * 1024;
|
|
constexpr qint64 RatioLimit = 40;
|
|
qint64 bytesToRead = std::min(SafeSizeLimit / RatioLimit, file.bytesAvailable());
|
|
QByteArray output(1 + bytesToRead * RatioLimit, Qt::Uninitialized);
|
|
helper.feed(file.read(bytesToRead));
|
|
qsizetype bytesRead = helper.read(output.data(), output.size());
|
|
QVERIFY(bytesRead <= output.size());
|
|
QVERIFY(helper.isValid());
|
|
|
|
if (shouldFail)
|
|
QCOMPARE(bytesRead, -1);
|
|
else
|
|
QVERIFY(bytesRead > 0);
|
|
}
|
|
|
|
void tst_QDecompressHelper::bigZlib()
|
|
{
|
|
#if QT_POINTER_SIZE < 8
|
|
QSKIP("This cannot be tested on 32-bit systems");
|
|
#else
|
|
// ZLib uses unsigned integers as their size type internally which creates some special
|
|
// cases in the internal code that should be tested!
|
|
QFile file(":/5GiB.txt.inflate");
|
|
QVERIFY(file.open(QIODevice::ReadOnly));
|
|
QByteArray compressedData = file.readAll();
|
|
|
|
QDecompressHelper helper;
|
|
helper.setDecompressedSafetyCheckThreshold(-1);
|
|
helper.setEncoding("deflate");
|
|
auto firstHalf = compressedData.left(compressedData.size() - 2);
|
|
helper.feed(firstHalf);
|
|
helper.feed(compressedData.mid(firstHalf.size()));
|
|
|
|
// We need the whole thing in one go... which is why this test is not available for 32-bit
|
|
const qint64 expected = 5ll * 1024ll * 1024ll * 1024ll;
|
|
// Request a few more byte than what is available, to verify exact size
|
|
QByteArray output(expected + 42, Qt::Uninitialized);
|
|
const qsizetype size = helper.read(output.data(), output.size());
|
|
QCOMPARE(size, expected);
|
|
#endif
|
|
}
|
|
|
|
QTEST_MAIN(tst_QDecompressHelper)
|
|
|
|
#include "tst_qdecompresshelper.moc"
|