mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
510bb903ae
* Disable AVAHI * Replace SysInfo backport with Qt SysInfo * Update vscode config * Update LedDevices * Update Logger * Update hyperiond * Update hyperion-remote * Exclude avahi * Empty definition for Process * PythonInit path broken * Exclude PiBlaster and link ws2_32 * more avahi * resolve ui bug * Update Compile howto * JsonAPI QtGrabber missing * fix error * ssize_t replacement * Nope, doesn't work * Adjust compile description and verify winSDK * Update ci script * Update ci script * Update ci * Update ci script * update Logger * Update PythonInit * added Azure & GitHub Actions, Logger, PythonInit * resolve merge conflicts * revert ssize_t in FadeCandy * look at registry for QT5 & use find_package(Python) if cmake >= 3.12 * second try * another try * and yet another test * qt5 registry search undone * Package creation test * finished package creation. only fine tuning is required :-) Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * Dependencies for Windows finished Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * use 'add_definitions()' until CMake 3.12 Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * Update .github/workflows/pull-request.yml Co-Authored-By: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com> * Update cmake/Dependencies.cmake Co-Authored-By: brindosch <edeltraud70@gmx.de> * fix typo/ add VCINSTALLDIR var * fix again * Undo change again (Not working) * fix QT grabber Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * first NSIS test Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * Update NSIS package * surprise :-) Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * Update NSIS package * fix: NSIS .bmps * Add nsis templates * Force windows gui app * fix: QSysInfo required Qt5.6, now it's 5.4 again * Update: Remove platform component and adjust package name * Add macOS as system name * Update docs * fix: Allow gh actions ci also for forks with branches * Add ReadMe docs, mention windows, add vscode linux debug config * fix: readme visual * reduce/hide banner/copyright/log message Infos here: https://docs.microsoft.com/de-de/visualstudio/msbuild/msbuild-command-line-reference?view=vs-2019#switches * Fix PythonInit * vscode: Add runner task * fix(vscode): compiler path gcc ver independent * fix azure * vscode: add windows run tasks * move process detection * main: add windows process detection * Azure file shredder * Update docs Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com> Co-authored-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>
215 lines
5.7 KiB
C++
215 lines
5.7 KiB
C++
#include "webserver/WebServer.h"
|
|
#include "StaticFileServing.h"
|
|
#include "QtHttpServer.h"
|
|
|
|
#include <QFileInfo>
|
|
#include <QJsonObject>
|
|
|
|
// bonjour
|
|
#ifdef ENABLE_AVAHI
|
|
#include <bonjour/bonjourserviceregister.h>
|
|
#endif
|
|
// netUtil
|
|
#include <utils/NetUtils.h>
|
|
|
|
|
|
WebServer::WebServer(const QJsonDocument& config, const bool& useSsl, QObject * parent)
|
|
: QObject(parent)
|
|
, _config(config)
|
|
, _useSsl(useSsl)
|
|
, _log(Logger::getInstance("WEBSERVER"))
|
|
, _server()
|
|
{
|
|
|
|
}
|
|
|
|
WebServer::~WebServer()
|
|
{
|
|
stop();
|
|
}
|
|
|
|
void WebServer::initServer()
|
|
{
|
|
Debug(_log, "Initialize Webserver");
|
|
_server = new QtHttpServer (this);
|
|
_server->setServerName (QStringLiteral ("Hyperion Webserver"));
|
|
|
|
if(_useSsl)
|
|
{
|
|
_server->setUseSecure();
|
|
WEBSERVER_DEFAULT_PORT = 8092;
|
|
}
|
|
|
|
connect (_server, &QtHttpServer::started, this, &WebServer::onServerStarted);
|
|
connect (_server, &QtHttpServer::stopped, this, &WebServer::onServerStopped);
|
|
connect (_server, &QtHttpServer::error, this, &WebServer::onServerError);
|
|
|
|
// create StaticFileServing
|
|
_staticFileServing = new StaticFileServing (this);
|
|
connect(_server, &QtHttpServer::requestNeedsReply, _staticFileServing, &StaticFileServing::onRequestNeedsReply);
|
|
|
|
// init
|
|
handleSettingsUpdate(settings::WEBSERVER, _config);
|
|
}
|
|
|
|
void WebServer::onServerStarted (quint16 port)
|
|
{
|
|
_inited= true;
|
|
|
|
Info(_log, "Started on port %d name '%s'", port ,_server->getServerName().toStdString().c_str());
|
|
#ifdef ENABLE_AVAHI
|
|
if(_serviceRegister == nullptr)
|
|
{
|
|
_serviceRegister = new BonjourServiceRegister(this);
|
|
_serviceRegister->registerService("_hyperiond-http._tcp", port);
|
|
}
|
|
else if( _serviceRegister->getPort() != port)
|
|
{
|
|
delete _serviceRegister;
|
|
_serviceRegister = new BonjourServiceRegister(this);
|
|
_serviceRegister->registerService("_hyperiond-http._tcp", port);
|
|
}
|
|
#endif
|
|
emit stateChange(true);
|
|
}
|
|
|
|
void WebServer::onServerStopped ()
|
|
{
|
|
Info(_log, "Stopped %s", _server->getServerName().toStdString().c_str());
|
|
emit stateChange(false);
|
|
}
|
|
|
|
void WebServer::onServerError (QString msg)
|
|
{
|
|
Error(_log, "%s", msg.toStdString().c_str());
|
|
}
|
|
|
|
void WebServer::handleSettingsUpdate(const settings::type& type, const QJsonDocument& config)
|
|
{
|
|
if(type == settings::WEBSERVER)
|
|
{
|
|
Debug(_log, "Apply Webserver settings");
|
|
const QJsonObject& obj = config.object();
|
|
|
|
_baseUrl = obj["document_root"].toString(WEBSERVER_DEFAULT_PATH);
|
|
|
|
|
|
if ( (_baseUrl != ":/webconfig") && !_baseUrl.trimmed().isEmpty())
|
|
{
|
|
QFileInfo info(_baseUrl);
|
|
if (!info.exists() || !info.isDir())
|
|
{
|
|
Error(_log, "document_root '%s' is invalid", _baseUrl.toUtf8().constData());
|
|
_baseUrl = WEBSERVER_DEFAULT_PATH;
|
|
}
|
|
}
|
|
else
|
|
_baseUrl = WEBSERVER_DEFAULT_PATH;
|
|
|
|
Debug(_log, "Set document root to: %s", _baseUrl.toUtf8().constData());
|
|
_staticFileServing->setBaseUrl(_baseUrl);
|
|
|
|
// ssl different port
|
|
quint16 newPort = _useSsl ? obj["sslPort"].toInt(WEBSERVER_DEFAULT_PORT) : obj["port"].toInt(WEBSERVER_DEFAULT_PORT);
|
|
if(_port != newPort)
|
|
{
|
|
_port = newPort;
|
|
stop();
|
|
}
|
|
|
|
// eval if the port is available, will be incremented if not
|
|
if(!_server->isListening())
|
|
NetUtils::portAvailable(_port, _log);
|
|
|
|
// on ssl we want .key .cert and probably key password
|
|
if(_useSsl)
|
|
{
|
|
QString keyPath = obj["keyPath"].toString(WEBSERVER_DEFAULT_KEY_PATH);
|
|
QString crtPath = obj["crtPath"].toString(WEBSERVER_DEFAULT_CRT_PATH);
|
|
|
|
QSslKey currKey = _server->getPrivateKey();
|
|
QList<QSslCertificate> currCerts = _server->getCertificates();
|
|
|
|
// check keyPath
|
|
if ( (keyPath != WEBSERVER_DEFAULT_KEY_PATH) && !keyPath.trimmed().isEmpty())
|
|
{
|
|
QFileInfo kinfo(keyPath);
|
|
if (!kinfo.exists())
|
|
{
|
|
Error(_log, "No SSL key found at '%s' falling back to internal", keyPath.toUtf8().constData());
|
|
keyPath = WEBSERVER_DEFAULT_KEY_PATH;
|
|
}
|
|
}
|
|
else
|
|
keyPath = WEBSERVER_DEFAULT_KEY_PATH;
|
|
|
|
// check crtPath
|
|
if ( (crtPath != WEBSERVER_DEFAULT_CRT_PATH) && !crtPath.trimmed().isEmpty())
|
|
{
|
|
QFileInfo cinfo(crtPath);
|
|
if (!cinfo.exists())
|
|
{
|
|
Error(_log, "No SSL certificate found at '%s' falling back to internal", crtPath.toUtf8().constData());
|
|
crtPath = WEBSERVER_DEFAULT_CRT_PATH;
|
|
}
|
|
}
|
|
else
|
|
crtPath = WEBSERVER_DEFAULT_CRT_PATH;
|
|
|
|
// load and verify crt
|
|
QFile cfile(crtPath);
|
|
cfile.open(QIODevice::ReadOnly);
|
|
QList<QSslCertificate> validList;
|
|
QList<QSslCertificate> cList = QSslCertificate::fromDevice(&cfile, QSsl::Pem);
|
|
cfile.close();
|
|
|
|
// Filter for valid certs
|
|
for(const auto & entry : cList){
|
|
if(!entry.isNull() && QDateTime::currentDateTime().daysTo(entry.expiryDate()) > 0)
|
|
validList.append(entry);
|
|
else
|
|
Error(_log, "The provided SSL certificate is invalid/not supported/reached expiry date ('%s')", crtPath.toUtf8().constData());
|
|
}
|
|
|
|
if(!validList.isEmpty()){
|
|
Debug(_log,"Setup SSL certificate");
|
|
_server->setCertificates(validList);
|
|
} else {
|
|
Error(_log, "No valid SSL certificate has been found ('%s')", crtPath.toUtf8().constData());
|
|
}
|
|
|
|
// load and verify key
|
|
QFile kfile(keyPath);
|
|
kfile.open(QIODevice::ReadOnly);
|
|
// The key should be RSA enrcrypted and PEM format, optional the passPhrase
|
|
QSslKey key(&kfile, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey, obj["keyPassPhrase"].toString().toUtf8());
|
|
kfile.close();
|
|
|
|
if(key.isNull()){
|
|
Error(_log, "The provided SSL key is invalid or not supported use RSA encrypt and PEM format ('%s')", keyPath.toUtf8().constData());
|
|
} else {
|
|
Debug(_log,"Setup private SSL key");
|
|
_server->setPrivateKey(key);
|
|
}
|
|
}
|
|
|
|
start();
|
|
emit portChanged(_port);
|
|
}
|
|
}
|
|
|
|
void WebServer::start()
|
|
{
|
|
_server->start(_port);
|
|
}
|
|
|
|
void WebServer::stop()
|
|
{
|
|
_server->stop();
|
|
}
|
|
|
|
void WebServer::setSSDPDescription(const QString & desc)
|
|
{
|
|
_staticFileServing->setSSDPDescription(desc);
|
|
}
|