From 3fb9d56d85f043dda677139c78f99849621752fc Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Mon, 13 Nov 2017 01:17:55 +0100
Subject: [PATCH] HttpServer: use settings structures in place of QSettings (2)

---
 httpserver/httpsessionstore.cpp | 31 ++++++++++++++++++++++---------
 httpserver/httpsessionstore.h   |  7 +++++++
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/httpserver/httpsessionstore.cpp b/httpserver/httpsessionstore.cpp
index 0f8a47e50..fd665c3b7 100644
--- a/httpserver/httpsessionstore.cpp
+++ b/httpserver/httpsessionstore.cpp
@@ -4,13 +4,15 @@
 */
 
 #include "httpsessionstore.h"
+#include "httpsessionssettings.h"
+
 #include <QDateTime>
 #include <QUuid>
 
 using namespace qtwebapp;
 
 HttpSessionStore::HttpSessionStore(QSettings* settings, QObject* parent)
-    :QObject(parent)
+    :QObject(parent), sessionsSettings(0), useQtSettings(true)
 {
     this->settings=settings;
     connect(&cleanupTimer,SIGNAL(timeout()),this,SLOT(sessionTimerEvent()));
@@ -20,6 +22,17 @@ HttpSessionStore::HttpSessionStore(QSettings* settings, QObject* parent)
     qDebug("HttpSessionStore: Sessions expire after %i milliseconds",expirationTime);
 }
 
+HttpSessionStore::HttpSessionStore(HttpSessionsSettings* settings, QObject* parent)
+    :QObject(parent), settings(0), useQtSettings(false)
+{
+    this->sessionsSettings=settings;
+    connect(&cleanupTimer,SIGNAL(timeout()),this,SLOT(sessionTimerEvent()));
+    cleanupTimer.start(60000);
+    cookieName=QByteArray(qPrintable(settings->cookieName));
+    expirationTime=settings->expirationTime;
+    qDebug("HttpSessionStore: Sessions expire after %i milliseconds",expirationTime);
+}
+
 HttpSessionStore::~HttpSessionStore()
 {
     cleanupTimer.stop();
@@ -60,10 +73,10 @@ HttpSession HttpSessionStore::getSession(HttpRequest& request, HttpResponse& res
         {
             mutex.unlock();
             // Refresh the session cookie
-            QByteArray cookieName=settings->value("cookieName","sessionid").toByteArray();
-            QByteArray cookiePath=settings->value("cookiePath").toByteArray();
-            QByteArray cookieComment=settings->value("cookieComment").toByteArray();
-            QByteArray cookieDomain=settings->value("cookieDomain").toByteArray();
+            QByteArray cookieName = useQtSettings ? settings->value("cookieName","sessionid").toByteArray() : QByteArray(qPrintable(sessionsSettings->cookieName));
+            QByteArray cookiePath = useQtSettings ? settings->value("cookiePath").toByteArray() : QByteArray(qPrintable(sessionsSettings->cookiePath));
+            QByteArray cookieComment = useQtSettings ? settings->value("cookieComment").toByteArray() : QByteArray(qPrintable(sessionsSettings->cookieComment));
+            QByteArray cookieDomain = useQtSettings ? settings->value("cookieDomain").toByteArray() : QByteArray(qPrintable(sessionsSettings->cookieDomain));
             response.setCookie(HttpCookie(cookieName,session.getId(),expirationTime/1000,cookiePath,cookieComment,cookieDomain));
             session.setLastAccess();
             return session;
@@ -72,10 +85,10 @@ HttpSession HttpSessionStore::getSession(HttpRequest& request, HttpResponse& res
     // Need to create a new session
     if (allowCreate)
     {
-        QByteArray cookieName=settings->value("cookieName","sessionid").toByteArray();
-        QByteArray cookiePath=settings->value("cookiePath").toByteArray();
-        QByteArray cookieComment=settings->value("cookieComment").toByteArray();
-        QByteArray cookieDomain=settings->value("cookieDomain").toByteArray();
+        QByteArray cookieName = useQtSettings ? settings->value("cookieName","sessionid").toByteArray() : QByteArray(qPrintable(sessionsSettings->cookieName));
+        QByteArray cookiePath = useQtSettings ? settings->value("cookiePath").toByteArray() : QByteArray(qPrintable(sessionsSettings->cookiePath));
+        QByteArray cookieComment = useQtSettings ? settings->value("cookieComment").toByteArray() : QByteArray(qPrintable(sessionsSettings->cookieComment));
+        QByteArray cookieDomain = useQtSettings ? settings->value("cookieDomain").toByteArray() : QByteArray(qPrintable(sessionsSettings->cookieDomain));
         HttpSession session(true);
         qDebug("HttpSessionStore: create new session with ID %s",session.getId().data());
         sessions.insert(session.getId(),session);
diff --git a/httpserver/httpsessionstore.h b/httpserver/httpsessionstore.h
index 814eca23d..f86322a2b 100644
--- a/httpserver/httpsessionstore.h
+++ b/httpserver/httpsessionstore.h
@@ -17,6 +17,8 @@
 
 namespace qtwebapp {
 
+class HttpSessionsSettings;
+
 /**
   Stores HTTP sessions and deletes them when they have expired.
   The following configuration settings are required in the config file:
@@ -39,6 +41,7 @@ public:
 
     /** Constructor. */
     HttpSessionStore(QSettings* settings, QObject* parent=NULL);
+    HttpSessionStore(HttpSessionsSettings* settings, QObject* parent=NULL);
 
     /** Destructor */
     virtual ~HttpSessionStore();
@@ -86,6 +89,7 @@ private:
 
     /** Configuration settings */
     QSettings* settings;
+    HttpSessionsSettings *sessionsSettings;
 
     /** Timer to remove expired sessions */
     QTimer cleanupTimer;
@@ -99,6 +103,9 @@ private:
     /** Used to synchronize threads */
     QMutex mutex;
 
+    /** Settings flag */
+    bool useQtSettings;
+
 private slots:
 
     /** Called every minute to cleanup expired sessions. */