ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move static file reply creation to the resource

Browse Source
This commit is contained in:
Simon Stürz 2025-11-07 20:59:30 +01:00
parent 5d035677e0
commit 2a309ce596
3 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libnymea-core/servers/webserver.cpp
View File

@ -447,42 +447,12 @@ void WebServer::readClient()
if (!verifyFile(socket, path)) if (!verifyFile(socket, path))
return; return;
QFile file(path);
if (file.open(QFile::ReadOnly)) {
qCDebug(dcWebServer()) << "Load file" << file.fileName();
HttpReply *reply = HttpReply::createSuccessReply();
// Check content type HttpReply *reply = WebServerResource::createFileReply(path);
if (file.fileName().endsWith(".html")) { reply->setClientId(clientId);
reply->setHeader(HttpReply::ContentTypeHeader, "text/html; charset=\"utf-8\";"); sendHttpReply(reply);
} else if (file.fileName().endsWith(".css")) { reply->deleteLater();
reply->setHeader(HttpReply::ContentTypeHeader, "text/css; charset=\"utf-8\";");
} else if (file.fileName().endsWith(".pdf")) {
reply->setHeader(HttpReply::ContentTypeHeader, "application/pdf");
} else if (file.fileName().endsWith(".js")) {
reply->setHeader(HttpReply::ContentTypeHeader, "text/javascript; charset=\"utf-8\";");
} else if (file.fileName().endsWith(".ttf")) {
reply->setHeader(HttpReply::ContentTypeHeader, "application/x-font-ttf");
} else if (file.fileName().endsWith(".eot")) {
reply->setHeader(HttpReply::ContentTypeHeader, "application/vnd.ms-fontobject");
} else if (file.fileName().endsWith(".woff")) {
reply->setHeader(HttpReply::ContentTypeHeader, "application/x-font-woff");
} else if (file.fileName().endsWith(".jpg") || file.fileName().endsWith(".jpeg")) {
reply->setHeader(HttpReply::ContentTypeHeader, "image/jpeg");
} else if (file.fileName().endsWith(".png") || file.fileName().endsWith(".PNG")) {
reply->setHeader(HttpReply::ContentTypeHeader, "image/png");
} else if (file.fileName().endsWith(".ico")) {
reply->setHeader(HttpReply::ContentTypeHeader, "image/x-icon");
} else if (file.fileName().endsWith(".svg")) {
reply->setHeader(HttpReply::ContentTypeHeader, "image/svg+xml; charset=\"utf-8\";");
}
reply->setPayload(file.readAll());
reply->setClientId(clientId);
sendHttpReply(reply);
reply->deleteLater();
return;
}
} }
// Reject everything else... // Reject everything else...

43
libnymea/webserver/webserverresource.cpp
View File

@ -29,6 +29,9 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "webserverresource.h" #include "webserverresource.h"
#include "loggingcategories.h"
#include <QFile>
WebServerResource::WebServerResource(const QString &basePath, QObject *parent) WebServerResource::WebServerResource(const QString &basePath, QObject *parent)
: QObject{parent}, : QObject{parent},
@ -41,3 +44,43 @@ QString WebServerResource::basePath() const
{ {
return m_basePath; return m_basePath;
} }
HttpReply *WebServerResource::createFileReply(const QString fileName)
{
qCDebug(dcWebServer()) << "Create file reply for" << fileName;
HttpReply *reply = HttpReply::createSuccessReply();
QFile file(fileName);
if (!file.open(QFile::ReadOnly)) {
qCWarning(dcWebServer()) << "Unable to generate file reply. The file" << fileName << "could not be opened. Respond with 403 Forbidden.";
return HttpReply::createErrorReply(HttpReply::Forbidden);
}
// Check content type
if (file.fileName().endsWith(".html")) {
reply->setHeader(HttpReply::ContentTypeHeader, "text/html; charset=\"utf-8\";");
} else if (file.fileName().endsWith(".css")) {
reply->setHeader(HttpReply::ContentTypeHeader, "text/css; charset=\"utf-8\";");
} else if (file.fileName().endsWith(".pdf")) {
reply->setHeader(HttpReply::ContentTypeHeader, "application/pdf");
} else if (file.fileName().endsWith(".js")) {
reply->setHeader(HttpReply::ContentTypeHeader, "text/javascript; charset=\"utf-8\";");
} else if (file.fileName().endsWith(".ttf")) {
reply->setHeader(HttpReply::ContentTypeHeader, "application/x-font-ttf");
} else if (file.fileName().endsWith(".eot")) {
reply->setHeader(HttpReply::ContentTypeHeader, "application/vnd.ms-fontobject");
} else if (file.fileName().endsWith(".woff")) {
reply->setHeader(HttpReply::ContentTypeHeader, "application/x-font-woff");
} else if (file.fileName().endsWith(".jpg") || file.fileName().endsWith(".jpeg")) {
reply->setHeader(HttpReply::ContentTypeHeader, "image/jpeg");
} else if (file.fileName().endsWith(".png") || file.fileName().endsWith(".PNG")) {
reply->setHeader(HttpReply::ContentTypeHeader, "image/png");
} else if (file.fileName().endsWith(".ico")) {
reply->setHeader(HttpReply::ContentTypeHeader, "image/x-icon");
} else if (file.fileName().endsWith(".svg")) {
reply->setHeader(HttpReply::ContentTypeHeader, "image/svg+xml; charset=\"utf-8\";");
}
reply->setPayload(file.readAll());
return reply;
}

2
libnymea/webserver/webserverresource.h
View File

@ -50,6 +50,8 @@ public:
virtual HttpReply *processRequest(const HttpRequest &request) = 0; virtual HttpReply *processRequest(const HttpRequest &request) = 0;
static HttpReply *createFileReply(const QString fileName);
protected: protected:
QString m_basePath; QString m_basePath;