From 132e84b2b619c9b9935eeb70e95a042820e70e59 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 11 Feb 2018 21:45:44 +0100 Subject: [PATCH] HTTP server: prefix log messages with method signature --- httpserver/httpconnectionhandlerpool.cpp | 2 +- httpserver/httpcookie.cpp | 2 +- httpserver/httprequest.cpp | 64 ++++++++++++------------ httpserver/staticfilecontroller.cpp | 6 +-- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/httpserver/httpconnectionhandlerpool.cpp b/httpserver/httpconnectionhandlerpool.cpp index 70bb1506c..98f67c99b 100644 --- a/httpserver/httpconnectionhandlerpool.cpp +++ b/httpserver/httpconnectionhandlerpool.cpp @@ -112,7 +112,7 @@ void HttpConnectionHandlerPool::loadSslConfig() if (!sslKeyFileName.isEmpty() && !sslCertFileName.isEmpty()) { #ifdef QT_NO_OPENSSL - qWarning("HttpConnectionHandlerPool: SSL is not supported"); + qWarning("HttpConnectionHandlerPool::loadSslConfig: SSL is not supported"); #else // Convert relative fileNames to absolute, based on the directory of the config file. QFileInfo configFile(settings->fileName()); diff --git a/httpserver/httpcookie.cpp b/httpserver/httpcookie.cpp index 444136b9d..0bc85929c 100644 --- a/httpserver/httpcookie.cpp +++ b/httpserver/httpcookie.cpp @@ -88,7 +88,7 @@ HttpCookie::HttpCookie(const QByteArray source) } else { - qWarning("HttpCookie: Ignoring unknown %s=%s",name.data(),value.data()); + qWarning("HttpCookie::HttpCookie: Ignoring unknown %s=%s",name.data(),value.data()); } } } diff --git a/httpserver/httprequest.cpp b/httpserver/httprequest.cpp index da7453af1..ec623384e 100644 --- a/httpserver/httprequest.cpp +++ b/httpserver/httprequest.cpp @@ -40,7 +40,7 @@ HttpRequest::HttpRequest(const HttpListenerSettings* settings) : void HttpRequest::readRequest(QTcpSocket* socket) { #ifdef SUPERVERBOSE - qDebug("HttpRequest: read request"); + qDebug("HttpRequest::readRequest: read request"); #endif int toRead=maxSize-currentSize+1; // allow one byte more to be able to detect overflow lineBuffer.append(socket->readLine(toRead)); @@ -48,7 +48,7 @@ void HttpRequest::readRequest(QTcpSocket* socket) if (!lineBuffer.contains('\r') && !lineBuffer.contains('\n')) { #ifdef SUPERVERBOSE - qDebug("HttpRequest: collecting more parts until line break"); + qDebug("HttpRequest::readRequest: collecting more parts until line break"); #endif return; } @@ -59,7 +59,7 @@ void HttpRequest::readRequest(QTcpSocket* socket) QList list=newData.split(' '); if (list.count()!=3 || !list.at(2).contains("HTTP")) { - qWarning("HttpRequest: received broken HTTP request, invalid first line"); + qWarning("HttpRequest::readRequest: received broken HTTP request, invalid first line"); status=abort; } else { @@ -75,7 +75,7 @@ void HttpRequest::readRequest(QTcpSocket* socket) void HttpRequest::readHeader(QTcpSocket* socket) { #ifdef SUPERVERBOSE - qDebug("HttpRequest: read header"); + qDebug("HttpRequest::readHeader"); #endif int toRead=maxSize-currentSize+1; // allow one byte more to be able to detect overflow lineBuffer.append(socket->readLine(toRead)); @@ -83,7 +83,7 @@ void HttpRequest::readHeader(QTcpSocket* socket) if (!lineBuffer.contains('\r') && !lineBuffer.contains('\n')) { #ifdef SUPERVERBOSE - qDebug("HttpRequest: collecting more parts until line break"); + qDebug("HttpRequest::readHeader: collecting more parts until line break"); #endif return; } @@ -97,14 +97,14 @@ void HttpRequest::readHeader(QTcpSocket* socket) QByteArray value=newData.mid(colon+1).trimmed(); headers.insert(currentHeader,value); #ifdef SUPERVERBOSE - qDebug("HttpRequest: received header %s: %s",currentHeader.data(),value.data()); + qDebug("HttpRequest::readHeader: received header %s: %s",currentHeader.data(),value.data()); #endif } else if (!newData.isEmpty()) { // received another line - belongs to the previous header #ifdef SUPERVERBOSE - qDebug("HttpRequest: read additional line of header"); + qDebug("HttpRequest::readHeader: read additional line of header"); #endif // Received additional line of previous header if (headers.contains(currentHeader)) { @@ -115,7 +115,7 @@ void HttpRequest::readHeader(QTcpSocket* socket) { // received an empty line - end of headers reached #ifdef SUPERVERBOSE - qDebug("HttpRequest: headers completed"); + qDebug("HttpRequest::readHeader: headers completed"); #endif // Empty line received, that means all headers have been received // Check for multipart/form-data @@ -139,23 +139,23 @@ void HttpRequest::readHeader(QTcpSocket* socket) if (expectedBodySize==0) { #ifdef SUPERVERBOSE - qDebug("HttpRequest: expect no body"); + qDebug("HttpRequest::readHeader: expect no body"); #endif status=complete; } else if (boundary.isEmpty() && expectedBodySize+currentSize>maxSize) { - qWarning("HttpRequest: expected body is too large"); + qWarning("HttpRequest::readHeader: expected body is too large"); status=abort; } else if (!boundary.isEmpty() && expectedBodySize>maxMultiPartSize) { - qWarning("HttpRequest: expected multipart body is too large"); + qWarning("HttpRequest::readHeader: expected multipart body is too large"); status=abort; } else { #ifdef SUPERVERBOSE - qDebug("HttpRequest: expect %i bytes body",expectedBodySize); + qDebug("HttpRequest::readHeader: expect %i bytes body",expectedBodySize); #endif status=waitForBody; } @@ -169,7 +169,7 @@ void HttpRequest::readBody(QTcpSocket* socket) { // normal body, no multipart #ifdef SUPERVERBOSE - qDebug("HttpRequest: receive body"); + qDebug("HttpRequest::readBody: receive body"); #endif int toRead=expectedBodySize-bodyData.size(); QByteArray newData=socket->read(toRead); @@ -184,7 +184,7 @@ void HttpRequest::readBody(QTcpSocket* socket) { // multipart body, store into temp file #ifdef SUPERVERBOSE - qDebug("HttpRequest: receiving multipart body"); + qDebug("HttpRequest::readBody: receiving multipart body"); #endif // Create an object for the temporary file, if not already present if (tempFile == NULL) @@ -205,18 +205,18 @@ void HttpRequest::readBody(QTcpSocket* socket) fileSize+=tempFile->write(socket->read(toRead)); if (fileSize>=maxMultiPartSize) { - qWarning("HttpRequest: received too many multipart bytes"); + qWarning("HttpRequest::readBody: received too many multipart bytes"); status=abort; } else if (fileSize>=expectedBodySize) { #ifdef SUPERVERBOSE - qDebug("HttpRequest: received whole multipart body"); + qDebug("HttpRequest::readBody: received whole multipart body"); #endif tempFile->flush(); if (tempFile->error()) { - qCritical("HttpRequest: Error writing temp file for multipart body"); + qCritical("HttpRequest::readBody: Error writing temp file for multipart body"); } parseMultiPartFile(); tempFile->close(); @@ -228,7 +228,7 @@ void HttpRequest::readBody(QTcpSocket* socket) void HttpRequest::decodeRequestParams() { #ifdef SUPERVERBOSE - qDebug("HttpRequest: extract and decode request parameters"); + qDebug("HttpRequest::decodeRequestParams: extract and decode request parameters"); #endif // Get URL parameters QByteArray rawParameters; @@ -274,7 +274,7 @@ void HttpRequest::decodeRequestParams() void HttpRequest::extractCookies() { #ifdef SUPERVERBOSE - qDebug("HttpRequest: extract cookies"); + qDebug("HttpRequest::extractCookies"); #endif foreach(QByteArray cookieStr, headers.values("cookie")) { @@ -282,7 +282,7 @@ void HttpRequest::extractCookies() foreach(QByteArray part, list) { #ifdef SUPERVERBOSE - qDebug("HttpRequest: found cookie %s",part.data()); + qDebug("HttpRequest::extractCookies: found cookie %s",part.data()); #endif // Split the part into name and value QByteArray name; QByteArray value; @@ -320,7 +320,7 @@ void HttpRequest::readFromSocket(QTcpSocket* socket) } if ((boundary.isEmpty() && currentSize>maxSize) || (!boundary.isEmpty() && currentSize>maxMultiPartSize)) { - qWarning("HttpRequest: received too many bytes"); + qWarning("HttpRequest::readFromSocket: received too many bytes"); status=abort; } if (status==complete) @@ -419,13 +419,13 @@ QByteArray HttpRequest::urlDecode(const QByteArray source) void HttpRequest::parseMultiPartFile() { - qDebug("HttpRequest: parsing multipart temp file"); + qDebug("HttpRequest::parseMultiPartFile: parsing multipart temp file"); tempFile->seek(0); bool finished=false; while (!tempFile->atEnd() && !finished && !tempFile->error()) { #ifdef SUPERVERBOSE - qDebug("HttpRequest: reading multpart headers"); + qDebug("HttpRequest::parseMultiPartFile: reading multpart headers"); #endif QByteArray fieldName; QByteArray fileName; @@ -449,12 +449,12 @@ void HttpRequest::parseMultiPartFile() fileName=line.mid(start+11,end-start-11); } #ifdef SUPERVERBOSE - qDebug("HttpRequest: multipart field=%s, filename=%s",fieldName.data(),fileName.data()); + qDebug("HttpRequest::parseMultiPartFile: multipart field=%s, filename=%s",fieldName.data(),fileName.data()); #endif } else { - qDebug("HttpRequest: ignoring unsupported content part %s",line.data()); + qDebug("HttpRequest::parseMultiPartFile: ignoring unsupported content part %s",line.data()); } } else if (line.isEmpty()) @@ -464,7 +464,7 @@ void HttpRequest::parseMultiPartFile() } #ifdef SUPERVERBOSE - qDebug("HttpRequest: reading multpart data"); + qDebug("HttpRequest::parseMultiPartFile: reading multpart data"); #endif QTemporaryFile* uploadedFile=0; QByteArray fieldValue; @@ -486,15 +486,15 @@ void HttpRequest::parseMultiPartFile() { // last field was a file #ifdef SUPERVERBOSE - qDebug("HttpRequest: finishing writing to uploaded file"); + qDebug("HttpRequest::parseMultiPartFile: finishing writing to uploaded file"); #endif uploadedFile->resize(uploadedFile->size()-2); uploadedFile->flush(); uploadedFile->seek(0); parameters.insert(fieldName,fileName); - qDebug("HttpRequest: set parameter %s=%s",fieldName.data(),fileName.data()); + qDebug("HttpRequest::parseMultiPartFile: set parameter %s=%s",fieldName.data(),fileName.data()); uploadedFiles.insert(fieldName,uploadedFile); - qDebug("HttpRequest: uploaded file size is %i",(int) uploadedFile->size()); + qDebug("HttpRequest::parseMultiPartFile: uploaded file size is %i",(int) uploadedFile->size()); } if (line.contains(boundary+"--")) { @@ -521,7 +521,7 @@ void HttpRequest::parseMultiPartFile() uploadedFile->write(line); if (uploadedFile->error()) { - qCritical("HttpRequest: error writing temp file, %s",qPrintable(uploadedFile->errorString())); + qCritical("HttpRequest::parseMultiPartFile: error writing temp file, %s",qPrintable(uploadedFile->errorString())); } } } @@ -529,10 +529,10 @@ void HttpRequest::parseMultiPartFile() } if (tempFile->error()) { - qCritical("HttpRequest: cannot read temp file, %s",qPrintable(tempFile->errorString())); + qCritical("HttpRequest::parseMultiPartFile: cannot read temp file, %s",qPrintable(tempFile->errorString())); } #ifdef SUPERVERBOSE - qDebug("HttpRequest: finished parsing multipart temp file"); + qDebug("HttpRequest::parseMultiPartFile: finished parsing multipart temp file"); #endif } diff --git a/httpserver/staticfilecontroller.cpp b/httpserver/staticfilecontroller.cpp index 72fdb9aef..abf29ad55 100644 --- a/httpserver/staticfilecontroller.cpp +++ b/httpserver/staticfilecontroller.cpp @@ -90,7 +90,7 @@ void StaticFileController::service(QByteArray& path, HttpResponse& response) // Forbid access to files outside the docroot directory if (path.contains("/..")) { - qWarning("StaticFileController: detected forbidden characters in path %s",path.data()); + qWarning("StaticFileController::service: detected forbidden characters in path %s",path.data()); response.setStatus(403,"forbidden"); response.write("403 forbidden",true); return; @@ -137,13 +137,13 @@ void StaticFileController::service(QByteArray& path, HttpResponse& response) else { if (file.exists()) { - qWarning("StaticFileController: Cannot open existing file %s for reading",qPrintable(file.fileName())); + qWarning("StaticFileController::service: Cannot open existing file %s for reading",qPrintable(file.fileName())); response.setStatus(403,"forbidden"); response.write("403 forbidden",true); } else { - qWarning("StaticFileController: File %s not found",qPrintable(file.fileName())); + qWarning("StaticFileController::service: File %s not found",qPrintable(file.fileName())); response.setStatus(404,"not found"); response.write("404 not found",true); }