From 424150dc8ab9ae7507bd3b6dbbafac1718cc82fb Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Thu, 3 Aug 2017 17:31:27 +0200
Subject: [PATCH] hook up global ssl config with webserver

---
 server/servermanager.cpp | 2 +-
 server/webserver.cpp     | 5 +++--
 server/webserver.h       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/servermanager.cpp b/server/servermanager.cpp
index b0fcecf7..f1ba1893 100644
--- a/server/servermanager.cpp
+++ b/server/servermanager.cpp
@@ -106,7 +106,7 @@ ServerManager::ServerManager(GuhConfiguration* configuration, QObject *parent) :
     m_jsonServer->registerTransportInterface(m_bluetoothServer, configuration->bluetoothServerEnabled());
 
     // Register transport itnerfaces for the Webserver
-    m_webServer = new WebServer(configuration->webServerAddress(), configuration->webServerPort(), configuration->webServerPublicFolder(), this);
+    m_webServer = new WebServer(configuration->webServerAddress(), configuration->webServerPort(), configuration->webServerPublicFolder(), configuration->sslEnabled(), m_sslConfiguration, this);
     m_restServer->registerWebserver(m_webServer);
 }
 
diff --git a/server/webserver.cpp b/server/webserver.cpp
index 0d3e3349..da208938 100644
--- a/server/webserver.cpp
+++ b/server/webserver.cpp
@@ -95,13 +95,14 @@ namespace guhserver {
  *
  *  \sa ServerManager
  */
-WebServer::WebServer(const QHostAddress &host, const uint &port, const QString &publicFolder, QObject *parent) :
+WebServer::WebServer(const QHostAddress &host, const uint &port, const QString &publicFolder, bool sslEnabled, const QSslConfiguration &sslConfiguration, QObject *parent) :
     QTcpServer(parent),
     m_avahiService(NULL),
     m_host(host),
     m_port(port),
     m_webinterfaceDir(publicFolder),
-    m_useSsl(false),
+    m_sslConfiguration(sslConfiguration),
+    m_useSsl(sslEnabled),
     m_enabled(false)
 {
     if (QCoreApplication::instance()->organizationName() == "guh-test") {
diff --git a/server/webserver.h b/server/webserver.h
index c307f110..d480fb44 100644
--- a/server/webserver.h
+++ b/server/webserver.h
@@ -72,7 +72,7 @@ class WebServer : public QTcpServer
 {
     Q_OBJECT
 public:
-    explicit WebServer(const QHostAddress &host, const uint &port, const QString &publicFolder, QObject *parent = 0);
+    explicit WebServer(const QHostAddress &host, const uint &port, const QString &publicFolder, bool sslEnabled, const QSslConfiguration &sslConfiguration, QObject *parent = 0);
     ~WebServer();
 
     void sendHttpReply(HttpReply *reply);