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>
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>
Use QtPrivate::makeCallableObject() and a context object instead
of std::function() when calling setMissingHandler(). Also added
clearMissingHandler() to set the handler back to the default behavior.
The rvalue was exchanged with a reference in the callback signature
because QMetaObject::invokeMethod is not prepared to handle rvalues.
Pick-to: 6.8
Task-Id: QTBUG-128113
Change-Id: If02c67a0ee200b458d9f8051a23a9307fce6e59a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
To keep the API lean, remove the SSL confguration and listen()
methods.
Instead using listen() on a QAbstractHttpServer, a user should
create an instance of a QTcpServer or QSslServer, then call
listen() on it before calling bind() on a QAbstractHttpServer
with it as an argument.
Task-number: QTBUG-125859
Pick-to: 6.8
Change-Id: I366c0a01d8b7ee3802e0bdd63b9d84813338f478
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Added counter to ensure there are no dependent QHttpServerResponder
instances, when we are trying to delete the handler.
Fixes: QTBUG-126032
Pick-to: 6.8
Change-Id: I32eef0e08951947d9939c2bdabbf677843868090
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
The current implementation creates WebSocket connections if a user
sends a request with the upgrade header set to WebSocket and if
there is a handler.
Decouple the routes from the handlers by adding a function to
register callback functions that take a QHttpServerRequest as an
argument and return a QHttpServerWebSocketUpgradeResponse which
can have the types Allow, Deny, and PassToNext. The first Allow
or Deny returned by the callback functions decides the outcome,
while PassToNext is used to execute the next rule. If no callback
functions are registered or all return PassToNext the WebSocket
upgrade fails and missingHandler is executed. It is possible to
customize the status code and message returned when the upgrade
by the handler that has the type Deny.
[ChangeLog][QAbstractHttpServer] Add function to register
callback functions that verifies WebSocket upgrades
Fixes: QTBUG-121462
Change-Id: I5ea2a778f128b2e4212da551c4d96bf25d8576e8
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Raw pointers to QWebSocket objects are used in the websocket test,
and they are deleted manually at the end of the test, but if the
test fails the QWebSocket objects are not deleted.
Use std::unique_ptr instead to ensure the that the QWebSocket
objects are always deleted.
Change-Id: I71c65698c17bd2a86ffca23f5a6e48874519f0b4
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Added separate protocol handlers for HTTP/1.1 and HTTP/2 with a common
base class, QHttpServerStream. To set up HTTP/2 protocol for
QAbstractHttpServer, QSslConfiguration with the allowed protocol
should be set.
Task-number: QTBUG-122312
Change-Id: I31b44c4615b8a8859504deb7cf5c5d8f6c3a4105
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Introduce private QHttpServerStream class that handles connection
state. This is the only class that contains a connected QTcpSocket.
Make other classes use QHttpServerResponder to communicate
with clients. Stop processing of further requests as long as a
QHttpServerResponder object for the current request is active.
Add a regression test to tst_qhttpserver.
[ChangeLog][Potentially Source-Incompatible Changes] Most public
methods that accepted a QTcpSocket are now accepting
QHttpServerResponder instead.
Task-number: QTBUG-105202
Change-Id: Ib8db7fdc65b59077411b09277f2b1948fde4848b
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8:
auto QtContainerClass = anyOf(
expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o),
expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o));
makeRule(cxxMemberCallExpr(on(QtContainerClass),
callee(cxxMethodDecl(hasAnyName({"count", "length"),
parameterCountIs(0))))),
changeTo(cat(access(o, cat("size"), "()"))),
cat("use 'size()' instead of 'count()/length()'"))
a.k.a qt-port-to-std-compatible-api with config Scope: 'Container',
with the extended set of container classes recognized.
Change-Id: Ibb3c96e7b98fc3c5586b947e91cdc19d26e56c80
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
The test sometimes causes the CI to fail even when it is blacklisted.
It is also hard to maintain this test once new levels of abstraction
get introduced.
Change-Id: Ia829ac1aaf6fadd826631f30165b3690cb5cd442
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This ensures that there is exactly one handler. This also should make
it easier to rework the response handling.
Pick-to: 6.4
Change-Id: I5771d94a0b2436b2ff2b745335184a80f4b2cf31
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This makes the ownership transfer visible from the API.
Task-number: QTBUG-100868
Pick-to: 6.4
Change-Id: Ie07dd3fd442837c87b6612da8a094bd880b6574f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This allows to deny a websocket upgrade with e.g.
a HTTP error ServiceUnavailable instead of hard
disconnection if the application has some special
logic.
Also fire missingHandler for WebSockets for
better application integration.
Pick-to: 6.4
Change-Id: I31f4b66f9a9a7873a46d0eaba6b6121b1a9ac953
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.
Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: I657c36f679b9448ec68d411a492171bc39df1411
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
- replace with QLatin1StringView
- take by value, not by cref
- in one case, replace with a char16_t, because size() == 1
Pick-to: 6.4
Task-number: QTBUG-100868
Change-Id: Ib1d9c3058d3dc9aad560b27bda89b7dc1f897dbb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
According HTTP/1.1 specifications (RFC 7231) CONNECT is intended only
for use in requests to a proxy. That it is why http-parser sets the upgrade flag.
This patch will allow users to decide how to handle this.
Change-Id: Ic2d10ca4ab113b4cac85e14f15af7890d5773e98
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
QTcpSocket was created on heap without a parent and it never called
delete.
Change-Id: I492633f9797427e546065f9afadf19a672dc552c
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@kdab.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Which then makes it compatible with other listen() functions in Qt
in the sense that doing if (server.listen()) will behave
consistently.
Ports being listened to can then be gotten from the new serverPorts()
function, mirroring serverPort() from QTcpServer etc., except it's a
QVector.
This is a source incompatible change, but is allowed because this
module is still in tech preview.
Fixes: QTBUG-79411
Change-Id: I09764afbf8fd866af4f43ab90fcf9c2e9a373237
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@gmail.com>
When the parser received "CONNECT / HTTP/1.1\n\n", its upgrade variable
is set to 1 even though there is no "upgrade" header available.
In this case, QMap::find() returns its end.
Task-number: QTBUG-82053
Change-Id: I41cc23511459c6735a474bb7b903638dd4b1208f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
It is required to have continuous integration enabled in the
repository.
Change-Id: I71728a6e89841640e77c50a05cf59f34d697f897
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
To avoid using the deprecated QString implicit constructor
Change-Id: If6f29952b0dbec96437e0b940c3cb52a801c0d32
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
We have undefined behavior when we check server.method.
Because HttpServer::method was uninitialized.
Also start checking a return value from QTcpServer::listen.
Change-Id: Ib7c31f33be956582a6ef264743ca9e44d4de24b1
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Change-Id: I536226270db1534b0bda1a2205898c291285721a
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Small, Qt integrated framework for creating specialized http server.
Goals of the project:
- Create a framework allowing creation of a specialized web server
running in non public networks (home and company networks, stealth
or hidden services)
- Create an easy tool for developers to embed http servers in their
apps.
- Playground to narrow down problems in Qt, related to network
stack, but also to explore general usability.
- Potentially reduce code duplication in Qt.
Not goals:
- Standalone server, in particular not Apache or nginx replacement
Change-Id: I0d8b83e50992b9a95c88f4735539329279cf5425
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Timur Pocheptsov
Øystein Heskestad
Mårten Nordheim
Yuri Knigavko
Matthias Rauter
Volker Hilsheimer
Lena Biliaieva
Juha Vuolle
Ievgenii Meshcheriakov
Marc Mutz
André Klitzing
Lucie Gérard
Maurice Kalinowski
Mikhail Svetkin
Tasuku Suzuki
Jesus Fernandez
Mikhail Svetkin
Tasuku Suzuki