fix replies from webserver

server/httpreply.cpp

@@ -139,7 +139,7 @@ HttpReply::HttpReply(QObject *parent) :
     setRawHeader("Access-Control-Allow-Origin","*");
     setRawHeader("Keep-Alive", "timeout=6, max=50");
     setHeader(HttpHeaderType::CacheControlHeader, "no-cache");
-    setHeader(HttpHeaderType::ConnectionHeader, "Keep-Alive");
+    setHeader(HttpHeaderType::ConnectionHeader, "keep-alive");
     packReply();
 }
 
@@ -275,6 +275,9 @@ bool HttpReply::isEmpty() const
 /*! Clears all data of this \l{HttpReply}. */
 void HttpReply::clear()
 {
+    m_closeConnection = false;
+    m_type = TypeSync;
+    m_statusCode = Ok;
     m_rawHeader.clear();
     m_payload.clear();
     m_rawHeaderList.clear();

server/rest/restresource.cpp

@@ -90,10 +90,12 @@ HttpReply *RestResource::createCorsSuccessReply()
 {
     HttpReply *reply = RestResource::createSuccessReply();
     reply->setHeader(HttpReply::ContentTypeHeader, "text/plain");
+    reply->setRawHeader("Accept","text/plain");
+    reply->setRawHeader("Allow", "PUT, POST, GET, DELETE, OPTIONS");
     reply->setRawHeader("Access-Control-Allow-Methods", "PUT, POST, GET, DELETE, OPTIONS");
     reply->setRawHeader("Access-Control-Allow-Headers", "Origin, Content-Type, Accept");
     reply->setRawHeader("Access-Control-Max-Age", "1728000");
-    reply->setCloseConnection(true);
+    //reply->setCloseConnection(true);
     return reply;
 }
 

server/rest/restserver.cpp

@@ -116,6 +116,7 @@ void RestServer::processHttpRequest(const QUuid &clientId, const HttpRequest &re
         qCDebug(dcRest) << "process options request\n" << request;
         HttpReply *reply = RestResource::createCorsSuccessReply();
         reply->setClientId(clientId);
+        qCDebug(dcRest) << reply->data();
         m_webserver->sendHttpReply(reply);
         reply->deleteLater();
         return;
@@ -142,8 +143,10 @@ void RestServer::asyncReplyFinished()
 
     qCDebug(dcWebServer) << "Async reply finished";
 
-    if (reply->timedOut())
+    if (reply->timedOut()) {
+        reply->clear();
         reply->setHttpStatusCode(HttpReply::GatewayTimeout);
+    }
 
     m_webserver->sendHttpReply(reply);
     reply->deleteLater();

server/webserver.cpp

@@ -75,6 +75,7 @@
 #include "guhsettings.h"
 #include "httpreply.h"
 #include "httprequest.h"
+#include "rest/restresource.h"
 
 #include <QJsonDocument>
 #include <QTcpServer>
@@ -130,15 +131,19 @@ WebServer::~WebServer()
  */
 void WebServer::sendHttpReply(HttpReply *reply)
 {
+    // get the right socket
     QSslSocket *socket = 0;
     socket = m_clientList.value(reply->clientId());
     if (!socket) {
-        qCDebug(dcWebServer) << "Invalid socket pointer! This should never happen!!! Missing clientId in reply?";
+        qCWarning(dcWebServer) << "Invalid socket pointer! This should never happen!!! Missing clientId in reply?";
         return;
     }
 
-    //qCDebug(dcWebServer()) << "sending header to" << socket->peerAddress().toString() << socket->peerPort() << "\n" << reply->rawHeader();
+    // send raw data
-    writeData(socket, reply->data());
+    reply->packReply();
+    socket->write(reply->data());
+
+    // close the connection if wanted
     if (reply->closeConnection())
         socket->close();
 
@@ -151,30 +156,31 @@ bool WebServer::verifyFile(QSslSocket *socket, const QString &fileName)
     // make shore the file exists
     if (!file.exists()) {
         qCWarning(dcWebServer) << "requested file" << file.filePath() << "does not exist.";
-        HttpReply reply(HttpReply::NotFound);
+        HttpReply *reply = RestResource::createErrorReply(HttpReply::NotFound);
-        reply.setPayload("404 Not found.");
+        reply->setClientId(m_clientList.key(socket));
-        reply.packReply();
+        sendHttpReply(reply);
-        writeData(socket, reply.data());
+        reply->deleteLater();
         return false;
     }
 
     // make shore the file is in the public directory
     if (!file.canonicalFilePath().startsWith(m_webinterfaceDir.path())) {
         qCWarning(dcWebServer) << "requested file" << file.fileName() << "is outside the public folder.";
-        HttpReply reply(HttpReply::Forbidden);
+        HttpReply *reply = RestResource::createErrorReply(HttpReply::Forbidden);
-        reply.setPayload("403 Forbidden.");
+        reply->setClientId(m_clientList.key(socket));
-        reply.packReply();
+        sendHttpReply(reply);
-        writeData(socket, reply.data());
+        reply->deleteLater();
         return false;
     }
 
     // make shore we can read the file
     if (!file.isReadable()) {
         qCWarning(dcWebServer) << "requested file" << file.fileName() << "is not readable.";
-        HttpReply reply(HttpReply::Forbidden);
+        HttpReply *reply = RestResource::createErrorReply(HttpReply::Forbidden);
-        reply.setPayload("403 Forbidden. Page not readable.");
+        reply->setClientId(m_clientList.key(socket));
-        reply.packReply();
+        reply->setPayload("403 Forbidden. File not readable");
-        writeData(socket, reply.data());
+        sendHttpReply(reply);
+        reply->deleteLater();
         return false;
     }
     return true;
@@ -192,11 +198,6 @@ QString WebServer::fileName(const QString &query)
     return m_webinterfaceDir.path() + fileName;
 }
 
-void WebServer::writeData(QSslSocket *socket, const QByteArray &data)
-{
-    socket->write(data + "\r\n");
-}
-
 void WebServer::incomingConnection(qintptr socketDescriptor)
 {
     if (!m_enabled)
@@ -283,25 +284,29 @@ void WebServer::readClient()
         request = HttpRequest(data);
     }
 
+    // check if the request is complete
     if (!request.isComplete()) {
         m_incompleteRequests.insert(socket, request);
         return;
     }
 
+    // check if the request is valid
     if (!request.isValid()) {
         qCWarning(dcWebServer) << "Got invalid request.";
-        HttpReply reply(HttpReply::BadRequest);
+        HttpReply *reply = RestResource::createErrorReply(HttpReply::BadRequest);
-        reply.setPayload("400 Bad Request.");
+        reply->setClientId(clientId);
-        writeData(socket, reply.data());
+        sendHttpReply(reply);
+        reply->deleteLater();
         return;
     }
 
-    // verify HTTP version
+    // check HTTP version
     if (request.httpVersion() != "HTTP/1.1") {
-        qCWarning(dcWebServer) << "HTTP version is not supported." ;
+        qCWarning(dcWebServer) << "HTTP version is not supported.";
-        HttpReply reply(HttpReply::HttpVersionNotSupported);
+        HttpReply *reply = RestResource::createErrorReply(HttpReply::HttpVersionNotSupported);
-        reply.setPayload("505 HTTP version is not supported.");
+        reply->setClientId(clientId);
-        writeData(socket, reply.data());
+        sendHttpReply(reply);
+        reply->deleteLater();
         return;
     }
 
@@ -318,10 +323,11 @@ void WebServer::readClient()
 
     // verify method
     if (request.method() == HttpRequest::Unhandled) {
-        HttpReply reply(HttpReply::MethodNotAllowed);
+        HttpReply *reply = RestResource::createErrorReply(HttpReply::MethodNotAllowed);
-        reply.setHeader(HttpReply::AllowHeader, "GET, PUT, POST, DELETE, OPTIONS");
+        reply->setClientId(clientId);
-        reply.setPayload("405 Method not allowed.");
+        reply->setHeader(HttpReply::AllowHeader, "GET, PUT, POST, DELETE, OPTIONS");
-        writeData(socket, reply.data());
+        sendHttpReply(reply);
+        reply->deleteLater();
         return;
     }
 
@@ -340,21 +346,24 @@ void WebServer::readClient()
         QFile file(path);
         if (file.open(QFile::ReadOnly | QFile::Truncate)) {
             qCDebug(dcWebServer) << "load file" << file.fileName();
-            HttpReply reply(HttpReply::Ok);
+            HttpReply *reply = RestResource::createSuccessReply();
             if (file.fileName().endsWith(".html")) {
-                reply.setHeader(HttpReply::ContentTypeHeader, "text/html; charset=\"utf-8\";");
+                reply->setHeader(HttpReply::ContentTypeHeader, "text/html; charset=\"utf-8\";");
             }
-            reply.setPayload(file.readAll());
+            reply->setPayload(file.readAll());
-            writeData(socket, reply.data());
+            reply->setClientId(clientId);
+            sendHttpReply(reply);
+            reply->deleteLater();
             return;
         }
     }
 
     // reject everything else...
-    qCWarning(dcWebServer) << "Unknown message received. Respond client with 400: Not Implemented.";
+    qCWarning(dcWebServer) << "Unknown message received. Respond client with 501: Not Implemented.";
-    HttpReply reply(HttpReply::NotFound);
+    HttpReply *reply = RestResource::createErrorReply(HttpReply::NotImplemented);
-    reply.setPayload("404 Not found.");
+    reply->setClientId(clientId);
-    writeData(socket, reply.data());
+    sendHttpReply(reply);
+    reply->deleteLater();
 }
 
 void WebServer::onDisconnected()

server/webserver.h

@@ -88,8 +88,6 @@ private:
     bool verifyFile(QSslSocket *socket, const QString &fileName);
     QString fileName(const QString &query);
 
-    void writeData(QSslSocket *socket, const QByteArray &data);
-
 protected:
     void incomingConnection(qintptr socketDescriptor) override;
 

tests/auto/restdevices/testrestdevices.cpp

@@ -419,7 +419,7 @@ void TestRestDevices::editDevices()
 
     QNetworkRequest request(QUrl(QString("http://localhost:3333/api/v1/devices")));
 
-    QNetworkReply *reply = nam->post(request, QJsonDocument::fromVariant(params).toJson(QJsonDocument::Compact));
+    QNetworkReply *reply = nam->post(request, QJsonDocument::fromVariant(params).toJson());
     clientSpy.wait();
     QCOMPARE(clientSpy.count(), 1);
 

tests/auto/webserver/testwebserver.cpp

@@ -142,11 +142,10 @@ void TestWebserver::multiPackageMessage()
     bool ok = false;
     int statusCode = firstLineTokens.at(1).toInt(&ok);
     QVERIFY2(ok, "Could not convert statuscode from response to int");
-    QCOMPARE(statusCode, 404);
+    QCOMPARE(statusCode, 501);
 
     socket->close();
     socket->deleteLater();
-
 }
 
 void TestWebserver::checkAllowedMethodCall_data()
@@ -205,7 +204,6 @@ void TestWebserver::checkAllowedMethodCall()
     printResponse(reply);
 
     QCOMPARE(clientSpy.count(), 1);
-    //QVERIFY2(clientSpy.count() == 1, "expected exactly 1 response from webserver");
 
     if (expectedStatusCode == 405){
         QCOMPARE(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), expectedStatusCode);