- Added methods for setting a whitelist and a blacklist in the
QHttpServerConfiguration class.
- Implemented IP address filtering in QHttpServer based on the
configuration.
Task-number: QTBUG-75087
Change-Id: I2b630bb15e34aa2f0633f64331bcc558bd5a1809
Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
It's not needed, cf. QTBUG-128656 and
qtgraphs/6ae7164a5432bc49d7e9688dfd79c20515dd9333.
Amends c43b2f7a84.
Found in Qt 6.9 API review.
Pick-to: 6.9
Change-Id: I67de329f798b658df2c163c38773a5cb66ad7701
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Add missing include guards for localserver to make QtHttpServer compile
on VxWorks where localserver is disabled.
Fixes: QTBUG-132517
Pick-to: 6.9
Change-Id: Icc5ea506ebc2e34249d5ed6416080ad96814f332
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Lena Biliaieva <lena.biliaieva@qt.io>
This is a non-polymorphic class, so explicitly export only the
out-of-line methods.
Amends c43b2f7a84.
Found in Qt 6.9 API review.
Pick-to: 6.9
Change-Id: I028478c491513bb4b9e79c959812f7842c927043
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Lena Biliaieva <lena.biliaieva@qt.io>
Similar to httpserver test.
Task-number: QTBUG-130500
Pick-to: 6.8 6.9
Change-Id: I3597d982c523980745fb6f08659c39a17a317780
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
Similar to httpserver.
Task-number: QTBUG-130500
Pick-to: 6.9 6.8
Change-Id: Ia93c03db5ee4f7c549a37c60db639bc7f47b8c9b
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Added QHttpServerConfiguration class to pass general configuration
settings to QHttpServer.
Implemented request rate limiting per IP.
Task-number: QTBUG-75087
Change-Id: Iedd670d3cd9adddec22077fe0625fdd3fc818004
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
REUSE.toml files are read by reuse to complement or override the
copyright and licensing information found in file.
The use of REUSE.toml files was introduced in REUSE version 3.1.0a1.
This reuse version is compatible with reuse specification
version 3.2 [1].
With this commit's files,
* The SPDX document generated by reuse spdx conforms to SPDX 2.3,
* The reuse lint command reports that the Qt project is reuse compliant.
In order to be reuse compliant all the licenses present in the
LICENSES directory must be used. License files not used are removed.
[1]: https://reuse.software/spec-3.2/
Task-number: QTBUG-124453
Task-number: QTBUG-125211
Pick-to: 6.8
Change-Id: I1fde341f07c48dbfb733d7be0969462b1110312b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Our approach with a temporary keychain stopped working on macOS 15,
where we fortunately have a new option when importing a PKCS12 blob.
But it is possible to build using SDK 14 and then run on macOS 15,
where our trick would fail. In this case, skip the test/SSL usage.
Task-number: QTBUG-130500
Pick-to: 6.8
Change-Id: Iebe31d2d6affa686ccb4287cd80c2c5683cc787a
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
The parameters were inversed in the example.
Pick-to: 6.8
Change-Id: Ida84993f27d3fcfabc05a9b8f10ba1340b144d1c
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
WebSockets were successfully created but worked only from server to
client. Fix hand-over from QAbstractHttpServer to member object
QWebSocketServer. Add test to ensure that WebSockets work both
ways.
Fixes: QTBUG-129798
Pick-to: 6.8
Change-Id: If9bd2a42d398f157384added8787c009246f6c52
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Because of changes we are doing in QHttp2Connection it won't work otherwise.
Change-Id: Idf8b08a15c2b36742a6c865fc4d04054c6aaefa0
Reviewed-by: Matthias Rauter <matthias.rauter@qt.io>
Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io>
Create QTcpServer objects in stack rather than in the heap to simplify memory ownership.
Normally QTcpServer created in the heap is not leaking, because it becomes a child of QAbstractHttpServer in QAbstractHttpServer.bind(). However parenting does not happen if bind() fails. So QTcpServer objects were leaking in tests where bind() was supposed to fail.
As the simplest fix, it was decided to create those QTcpServer objects in the stack.
Change-Id: I19788dff4c55deacf242be03871512c9c86296de
Reviewed-by: Mate Barany <mate.barany@qt.io>
Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io>
Qt HTTP Server is out of technology preview in Qt 6.8.0.
Task-number: QTBUG-129773
Pick-to: 6.8
Change-Id: I2dc7ea1d4c90800f3bace9497370632bea690085
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
The sslPort variable is only used when SSL is available, which is
usually not the case on macOS builds.
Pick-to: 6.8
Change-Id: I6f8c023c2a85e5a3c74d737903cb994c690451a3
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
It's quite simple, we just download a 100MB payload from ourselves and
discard all the bytes.
The default qbytearray non-TLS case takes around 250ms to complete on my
machine, while the TLS case clocks in at around 800ms.
Some of this benchmark will measure the time it takes to read as well,
but even using an external process to perform the download we would
still have to wait for it to receive all the data.
Pick-to: 6.8
Change-Id: I0fb700b2f3ab5d73a81f673688ec9404a6749daa
Reviewed-by: Mate Barany <mate.barany@qt.io>
By looping in readFromInput() we can pass as much data as possible
to the `sink` without having to return to the event loop repeatedly.
And, in writeToOutput(), if we exhaust the buffer, just call
readFromInput() directly instead of queuing a meta call.
Because readFromInput() _also_ calls writeToOutput() when there is data
to write we now have to check for recursion before calling
readFromInput().
This cuts the time tst_bench_QHttpServer_transfer::transferPayload()
takes with the "qbuffer" data-tag from 2s to 0.5s on my machine.
Task-number: QTBUG-125717
Pick-to: 6.8
Change-Id: I5f7255ca3f68b414d2ca73dd377893b04fe13247
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
There are already mechanisms in place to try to write more when the sink
has managed to flush data into the OS buffers, so we can pace ourselves
better.
This reduces the amount of copying we do since we no longer, needlessly,
copy data into the sink's (pending) write-buffer. This brings memory
usage for transferring a large payload down to a more expected range.
Task-number: QTBUG-125717
Pick-to: 6.8
Change-Id: I38460cb5fa143dddb00c964c4da7c4b62d9628c4
Reviewed-by: Mate Barany <mate.barany@qt.io>
With a QSslSocket the bytesWritten signal is not what we are actually
interested in, so much as the encryptedBytesWritten signal.
Task-number: QTBUG-125717
Pick-to: 6.8
Change-Id: If9eba53a2c1f321048fef4554fa0e172566efdf3
Reviewed-by: Lena Biliaieva <lena.biliaieva@qt.io>
Reviewed-by: Mate Barany <mate.barany@qt.io>
Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io>
Timur Pocheptsov
Lena Biliaieva
Tasuku Suzuki
Ivan Solovev
Qt Submodule Update Bot
Volker Hilsheimer
Øystein Heskestad
Jani Heikkinen
Lucie Gérard
Tor Arne Vestbø
Carl Schwan
Mårten Nordheim
Yuri Knigavko
Topi Reinio