4
0
mirror of https://github.com/QuasarApp/qthttpserver.git synced 2025-05-13 18:09:39 +00:00

72 Commits

Author SHA1 Message Date
Mårten Nordheim
bf9bb2acb6 Remove dependence on QtNetworkPrivate from QSslServer
Locally I was unable to build QSslServer due to
QAbstractSocketEnginePrivate not being exported.

Change-Id: I739b63d03d2ff378e03ef3fcd7b1ab55db24f63b
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@kdab.com>
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@gmail.com>
2020-02-07 14:19:20 +01:00
Tasuku Suzuki
10ca6d493a Allow simple example to be built without gui module
Change-Id: I173e418eb03dc471e64284f89182bbb1b2806d88
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@gmail.com>
2020-02-07 03:55:43 +09:00
Mårten Nordheim
17365af1f7 Remove unused local variables
Fixes compiler complaints

Change-Id: Ic5923a9a15d7ec9f487d3fe02ec16361eaa4838c
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@gmail.com>
2020-02-06 11:20:59 +01:00
Mikhail Svetkin
92c069d772 qhttpserver: Fix documentation for special arguments
Change-Id: Ibb373e7462220cb678330bb0cb7421407ccb37e3
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-11-21 12:00:22 +00:00
Mikhail Svetkin
7dc185f101 Refactor access to QMetaEnum for QHttpServerRequest::Method
Replace QHttpServerRequest::staticMetaObject.indexOfEnumerator("Method")
with QMetaEnum::fromType<QHttpServerRequest::Method>.

Change-Id: Idda142fd065e9ce216e2d76c09a5b19d384df1b3
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-11-10 22:41:25 +01:00
Mikhail Svetkin
dba675ed61 Refactor QHttpServerRequestPrivate::parseUrl
There are few changes:
1. Remove std::function. A lambda can be converted to a function pointer
   if it does not capture.
2. Change std::map to std::array and mark it as constexpr. It will
   eliminate run-time initialization and checking.
3. Remove unnecessary nesting

Change-Id: I5379cb11016def47aee0c57c3de39677aae072d7
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-11-10 20:10:25 +00:00
Mikhail Svetkin
5fcfbb6629 qhttpserverrequest: Change QSharedPointer to QScopedPointer
And disable copy for QHttpServerRequest since it's not intended
to be copy-able.

Change-Id: I34ba6929507cc4f020fac52bf36c816b194fd250
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-10-29 15:29:40 +00:00
Mikhail Svetkin
45e1139892 Fix compilation with gcc 4.8
GCC 4.8 doesn't like using QPointers in signal connections.
Additional to e35fdc4763a54aff3768bcd0144ae97249bd7185.

Fixes: QTBUG-79345
Change-Id: Id5677139a31affab737d11e4456f9bf8d174601f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
2019-10-29 07:28:11 +01:00
Mikhail Svetkin
43a04e17a1 Allow using QHttpServerRequest/Responder at the same time
Fixes: QTBUG-77088
Change-Id: I2208cee290d086339aba705f959c57e0f6a73a87
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-10-25 08:55:01 +02:00
Mikhail Svetkin
e35fdc4763 Fix compilation with gcc 4.8
GCC 4.8 doesn't like using QPointers in signal connections.

Fixes: QTBUG-79345
Change-Id: I7cd4d79eee3ce7f07874e13f5ecfa9925090d68d
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-10-24 14:10:01 +02:00
Mikhail Svetkin
3eebefcd27 QHttpServerRouterViewTraits: Make it simpler and testable
Currently QHttpServerRouterViewTraits contains all helpers and tools
inside itself. It is hard to read and extend.

This patch:
- Moves all helper and tools to QtPrivate namespace
- Tries to "simplify" template magic
- Adds support for unit test

Change-Id: I6aa443b286c4c896b8dbfee85fffb638328868ad
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-10-24 11:56:21 +02:00
Sylvain Garcia
52bce52413 Fix memory leak in QHttpServerRequest
Using QSharedPointer rather than raw pointer for private data

[ChangeLog][QHttpServerRequest][Fix QHttpServerRequest memory leak] Fixed: memory leak in QHttpServerRequest

Change-Id: I419ec22e56f199677d058938cee046a60a3c2450
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
2019-10-14 10:39:29 +02:00
Sylvain Garcia
f04a6809b1 HTTPS support
Added new `QAbstractHttpServer::sslSetup` which enables HTTPS usage.
Added new `QSslServer` which inherits from `QTcpServer` and configures
incoming TCP clients to use SSL.

[ChangeLog][QHttpServer][Https support] Https support added to
QAbstractHttpServer class

Change-Id: I536cf48b86b246e3f4b9d960f793b93670afe06f
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Guy Poizat <gerrit.qt@gmail.com>
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@gmail.com>
2019-10-04 17:16:09 +02:00
Mikhail Svetkin
73175545e6 QHttpServerResponse: Extend the API
Add new API for HTTP headers manipulations.
Add QHttpServerResponse::write function which will
allow to write custom response objects in a future.

Fixes: QTBUG-76933
Change-Id: I744303be1b517c07f698c4a3dd2c4296f77e3b03
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@tqcs.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-10-03 19:40:22 +02:00
Mikhail Svetkin
b838370769 QHttpServerResponse: Change text/html -> application/x-empty
It does not make sense to set "text/html" as content type for empty
responses.

Change-Id: I93f540c97cef38409f1479f1c332349155edd176
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qbc.io>
2019-08-22 06:38:26 +02:00
Mikhail Svetkin
f46cb8832f Add QHttpServerLiterals
Currently we have a lot of duplication of most common HTTP headers and their
values.
This patch moves them to one place.

Change-Id: Idf9ddc5164e81649b4cc37ed92a516eb1eedab3a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qbc.io>
2019-08-21 22:07:26 +02:00
Mikhail Svetkin
03f911fd0a QHttpServerResponse: Use rvalue more
Change-Id: I442245dc800a545142f3f28ea51a4465d6eaff84
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-08-20 20:20:52 +02:00
Mikhail Svetkin
055d36692b QHttpServerResponder: refactor and extend the API
Currently QHttpServerResponder is not flexible enough:
 - Does not allow to rewrite headers
 - Does not allow to write headers without storing them internaly first
 - Does not provide API to make your own HTTP response

This patch will help to implement QHttpServerResponse
setHeaders/addHeaders

Change-Id: If9e21f7f7a58629bfedad0f10cab67d67fce0a89
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-08-20 18:40:26 +02:00
Mikhail Svetkin
b63b0862c9 QHttpServerResponse: add ctor for QJsonArray
Task-number: QTBUG-76619
Change-Id: Ibce12e33754e950f467c8fb291d447cfc0694062
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qbc.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-11 21:56:24 +02:00
Mikhail Svetkin
a8777eb51e QHttpServerResponse: use compact mode for json objects
Change-Id: Ia01f2f9a1483b326bc92eda20045f9764616cf66
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qbc.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-11 20:10:31 +02:00
Tasuku Suzuki
b025906bf7 Add remoteAddress() to QHttpServerRequest
Change-Id: If72ff6f96a645e86f718d61e57e1f8549f8806da
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-10 16:20:50 +09:00
Mikhail Svetkin
fb551f9845 QAbstractHttpServer: Simplify handleNewConection/handleReadyRead
Remove usage of QObjectUserData.
Remove usage of QHash of QHttpServerRequest.

Change-Id: I8a6c44bcfefc12c841ae67562e9bbec10f6ab9bf
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-09 20:33:56 +02:00
Mårten Nordheim
ec8a569b68 Example: add 'cmdline' to CONFIG
So it doesn't detach from command line on Windows,
and doesn't generate app bundles on macOS.

Change-Id: I0449b1224b9c01f2f040ac98508732f9d280ee3b
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qbc.io>
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@gmail.com>
2019-07-08 09:54:03 +00:00
Tasuku Suzuki
fc7908e628 Introduce QHttpServerResponse::fromFile()
This is a shortcut for static file contents.

Change-Id: I54d97c60822e661c1405f27ea8d4598f0363b144
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-06-14 15:19:29 +09:00
Jesus Fernandez
c88c462ac7 Silent -Wdeprecated-declarations warning
warning: ‘QString::QString(const QByteArray&)’ is deprecated: Use fromUtf8, QStringLiteral, or QLatin1String [-Wdeprecated-declarations]
 #  define qPrintable(string) QtPrivate::asString(string).toLocal8Bit().constData()

Change-Id: I24fb34c6ed4dd5ebddf92b988e31a01322fc0a57
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qbc.io>
2019-05-21 13:29:18 +02:00
Mikhail Svetkin
e2c63563d5 Fix crash for passing lambda with captures to QHttpServer::route
QHttpServer::route accepted the lambda by universal reference, but did
not pass it to QHttpServerRouter::addRule by std::forward.

We can not initialize lambda captures with C++11.
So we always need to copy the lambda by value.

Task-number: QTBUG-74882
Change-Id: I3e2dc6003624414d0ff45ba2e2f1af472e219ff1
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-05-15 12:41:43 +00:00
Mikhail Svetkin
3a811fc0cc Use Qt5TestMacros for run cmake tests
Change-Id: I54486c20d047b5aa73e6012d43c9ca5019f9a51f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-05-15 11:32:34 +00:00
Mikhail Svetkin
6ac5d57697 Remove unused signal
Change-Id: I28fb6f9f45e43d21cace1978c03acd330a9e6faa
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qbc.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-05-09 17:36:53 +00:00
Tasuku Suzuki
26b4df2582 Change QString for headers in QHttpServerRequest to QByteArray
This is because QHttpServerResponder uses QByteArray for headers' key/
value.

Change-Id: I21b5af4d08e43ee58a1edc95b714c6da0ae10790
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
2019-05-09 15:14:33 +00:00
Tasuku Suzuki
9f7bf6654b Remove a member variable unused
Change-Id: Iacb3259742ca1d3e352624d953b5f5581cb72102
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-05-09 14:27:21 +00:00
Tasuku Suzuki
f72ced1671 Fix tests failure introduced by the mime type detection
Commit 4f64330b39bd528a84241e976baa464c6dc89de1 changes some mime types
of responses to text/plain.
The commit also FIXED the "No newline at end of file" warning in a test
data for QHttpServerResponder.

Change-Id: I9b6b1878a2b61bf80db1e39b81ae75c4cedce615
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-05-09 13:57:18 +00:00
Jesus Fernandez
d542f7e13d Add a fork() test
Change-Id: Ic7c797f9757ad14803154f6125298bfc8fe03baa
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-04-29 13:00:23 +00:00
Tasuku Suzuki
4f64330b39 Find proper mime type for QByteArray data
QByteArray can be used for any data that QMimeDatabase understands

Change-Id: I17d8f0060065c0a93fc4a8cf6450bdd11aed49d0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
2019-04-26 16:41:53 +00:00
Mikhail Svetkin
5147076e5e Fix support for keep-alive connection
QAbstractHttpServer did not clear a request's internal properties (headers,
url, body).
If a request has a keep-alive header, QAbstractHttpServer should clear the
request's internal properties.

Change-Id: I2dfd0565369bd3291cd8d9900045c5a7f9d43ca3
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-04-08 13:49:38 +00:00
Mikhail Svetkin
be06bd66b8 Accept a string as request method in QHttpServer::route()
Allow writing simpler source code.

For example:

httpserver.route("/", "GET|POST", [] () { return ""; })

Instead of:

httpserver.route("/", QHttpServerRequest::Method::Post | QHttpServerRequest::Method::Get, [] () { return ""; })

Change-Id: Id0a754eccaba6b5f9f3be6a3b975383eb94840a0
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-04-04 20:50:09 +00:00
Mikhail Svetkin
6f7e8d28b4 Fix HTTP chunked request body handling
Task: QTBUG-74843
Change-Id: I4978c80195246c99a5e6d1e608b3980f56b39207
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
2019-04-03 15:26:38 +00:00
Mikhail Svetkin
5ad0dd4050 Reuse HTTP status codes from nodejs http-parser
Change-Id: Id5f224ff797a56e379ec37c6f57ccd422b098f16
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-04-02 14:40:22 +00:00
Jesus Fernandez
71b37f8588 Use multi-arg version of QString::arg
Change-Id: Ib16a2c3feee10bbd9c784c5303fc0e4e97e5ef5b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-03-19 10:52:18 +00:00
Mikhail Svetkin
2459725682 Allow use of custom data structures as router callback arguments
Change-Id: I6dcc66a95b72bb461f237cade0352a0177065227
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-03-06 09:41:39 +00:00
Maurice Kalinowski
572e0b1f6c Fix build on Windows
Change-Id: I7bb287dedfc146ba717a69170cec529d7ef7fadb
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-02-28 10:08:19 +00:00
Jesus Fernandez
11fb154a84 Fix several build issues and fix the unit tests
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>
2019-02-28 09:47:48 +00:00
Jesus Fernandez
db45e5a9fa Use QStringLiteral
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>
2019-02-12 08:42:09 +00:00
Jesus Fernandez
21eb76d94a Update http-parser submodule to version 2.9.0
Change-Id: I965ecc876213e91ebd57faae676334a1fb14efc2
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
2019-02-08 10:53:53 +00:00
Jesus Fernandez
fe96330ca0 Fix license headers
Change-Id: Ie15244adb917e2938fe7897c30d4616218d26ac0
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-01-31 11:31:21 +00:00
Jesus Fernandez
b317105242 Fix -Wmismatched-tags warnings
The forward declaration and the definition was not matching. Some
were forward declared as class and defined as struct.

Change-Id: I8912e6373e24126befba52df0bef8795299e50f7
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-01-30 14:56:20 +00:00
Jesus Fernandez
e5e1edc718 Fix build
Change-Id: I9a4e3f9c3bea160af4affbda600ee292cb131a13
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-01-30 14:16:55 +00:00
Mikhail Svetkin
540daf882f Introduce QHttpServer
QHttpServer provides a simplified interface to QAbstractHttpServer and
QHttpServerRouter.

Change-Id: I884204aa8140bbab4c0d6a8ab4c798e0b2470e29
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-01-25 11:49:44 +00:00
Mikhail Svetkin
a856556784 Introduce QHttpServerRouter
Provide simple API for routing, parsing, capture and call callback

Change-Id: Ibd7c37282d00bd56f96d841db92b473a65a2bf5c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
2019-01-23 10:46:43 +00:00
Mikhail Svetkin
74b22d36f8 Update .gitignore
Allow examples have subfolders for depth more than four

Change-Id: Ia85602393034f68bd9b0214be240d17d1a751e1e
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2018-12-20 14:48:56 +00:00
Mikhail Svetkin
9a41ddd648 Fix tst_QAbstractHttpServer::request
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>
2018-12-20 14:08:08 +00:00