alpha 1.02b

mikeNickaloff · mikeNickaloff · commit b3a0f611205e · 2018-07-24T08:54:08.000-07:00
diff --git a/res_defaults/cert.pem b/res_defaults/cert.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDYTCCAkmgAwIBAgIJAO6v6mS6kZwgMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJDQTEQMA4GA1UEBwwHb2FrbGFuZDEZMBcGA1UECgwQ
+ZGF0YWFmYXVsdCAuIG5ldDAeFw0xODA2MTExNjE4MDdaFw0xOTA2MTExNjE4MDda
+MEcxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEQMA4GA1UEBwwHb2FrbGFuZDEZ
+MBcGA1UECgwQZGF0YWFmYXVsdCAuIG5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANa36sR1jhfLYl5ZHHRftUnNNTxMLS8DgeWNUNi/5wXhe20e+LOg
+0wjC8LKmSPItqYoEv75vho1rwjx2I6PfMx/3AD7YNx4l3RYxQVQpISeJkMnYspgS
+jTBqeF7jOtlo8JTAT+bojfSyfSVF+vmCTY7z84rIpU87QF2b1Qn1kQ29xAs730fU
+VfD5LJ6RWeHLVLwpIsMem69a9wIHN7qakVc/0H7egKfRxXmIdKXw9c53JNhE7SS6
+MynFzRK7cVsAfwotTpPZXqU55hHrV4h4njSpTSwe/ssD2RQgj02RLcBB5TPx7ymC
+yXENHuhiYy0rCsW3sOSa2NH/r/cYzfhFVkcCAwEAAaNQME4wHQYDVR0OBBYEFOM4
+wu+T7aO5vWiEnIoQc0Y56qbnMB8GA1UdIwQYMBaAFOM4wu+T7aO5vWiEnIoQc0Y5
+6qbnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAB/vy3unz/pkDBn7
+K46CHcEeemmErfZd4ugGPd2osyo8N9NWvISEYnimcNQ/w8hHiNkRkqMAilIJfyP1
+okVsdwtQXMteFrdGfE5lBc9LtXHzI8krvdvJzNwtieH/uF993QSbdbnyzrb3noiJ
+HOjBFFrNnLnG5vAVWU8CF+X7uNOziMVWnDLdqWr0V/J8DBWrjnfytDZeHm+33JAq
+goWkEBeSIA1wp3fsUNHUxqDCq06LHGzj90xvDPNcVcYkgqFllNW56ncCMxh/VWGm
+hhGFV5S36NBnmOSw6q0Zy0wod7Rku9UTJZUOJ0ztUZhbAKFpKBMe1G0WbL+aTBop
+XxsIK/U=
+-----END CERTIFICATE-----
diff --git a/res_defaults/key.pem b/res_defaults/key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDWt+rEdY4Xy2Je
+WRx0X7VJzTU8TC0vA4HljVDYv+cF4XttHvizoNMIwvCypkjyLamKBL++b4aNa8I8
+diOj3zMf9wA+2DceJd0WMUFUKSEniZDJ2LKYEo0wanhe4zrZaPCUwE/m6I30sn0l
+Rfr5gk2O8/OKyKVPO0Bdm9UJ9ZENvcQLO99H1FXw+SyekVnhy1S8KSLDHpuvWvcC
+Bze6mpFXP9B+3oCn0cV5iHSl8PXOdyTYRO0kujMpxc0Su3FbAH8KLU6T2V6lOeYR
+61eIeJ40qU0sHv7LA9kUII9NkS3AQeUz8e8pgslxDR7oYmMtKwrFt7DkmtjR/6/3
+GM34RVZHAgMBAAECggEAIPCaHYWDRPc4ogy9psTABRBsKFHvZJT/Kn4hdv8JrAdJ
+bhYgRT5Y4bE2R9HmwvBqX/gWilqFo9ByPeBJ22v0ZeT4rqtw2Tkpz6vCv+yHX49l
+HPIXg+jkrBbJXJUzhALrVYajO2NV08JGHJ+9vuVUjKe0JwhdA+itGS884YhAtoCs
+URAMXZlB0KHUH5iNOJlKUrqK0COC14nccXvOGF/TFiPH/li/JKgvErjvpo9edlsP
+ocpOrsh8RJYE5OZIkW8CMTTwIekfq+DgRQ2jHLJgCGE57bncqOq5eZ0I2wF3ZiGt
+UBhAxXFLCpN+aVQdTg/XIMWHSs4wlvJQRSI4Aoe+kQKBgQDrJMa1040bO87Oa9WW
+rm1+2q/G8viXQtYAZk4eNagSS7yyDfB3UJrCO3jDx0WiB+kYspLNAeu5apoRfXI3
+RpLUHZeVTTJCWxz6ka05bUaPEVxSgNkNHKFTqZSxjGYVvFcG1U6C6058ZQwHSN/B
+cJM9tT09XtoDHVF6wfiAOUx4YwKBgQDpw1xtS5lI0RTbvjMpLJSbeCOc07R7AGNA
+XUhcyWR668OJIDHhr28jjoXGx8coPeJhK5rKMp1OYd5xG36PFLGcdLrDVmhUo1HT
+xY3Pn07dNlCJPBv41387ngTAEHNLj8fyvtjFKnGaM5w8Ua74qUNjVBcLRT6Vgudd
+mumu10UFzQKBgBhAP7oq6kefwHFrj6itrp9BoJVNI7Q98WIzKuVUtVPFud1HMMCt
+cHiNt6PBXn4agMDKUfeQtiX2R5N8M5Zd0fDMaIC+aGuNiAyTj6D3kypYKQRdQ4Vl
+qYG+YJZ7G2Asf3E1+JXp/Ls5lKb/rgv+N0FK+tjkemmN0YRuktluj2NvAoGBAL2F
+5JPALSC6UxztkfEZ8coylzz472SiJdXzS03fAhYeu8ObVJXTdFnxnUhShId91OJP
+RgoVCzCXbI9raSp77pwYj6r7jU7Bsv/tNVJVqMz00krRbyRLIx6kuNk2/SMQCV4n
+mPwRs1T/7vWAjEmSgc4wSRacJ2d0YDyl8jwM0CspAoGBALzu6Lp1p6IqCN+RZlGo
+6VelCklsT/oDxOWuRnEjvz/StpHU9LDIjmsQJLSmP+K+WOIkoN9rRplKlYi0oeL8
+c767sAhq3+ZVDYowJT53nsyuylNijZKXdhyvLYZQgOlHYvK39mazFzy4pISb7a5h
+0d/hLq1WUkKQuq1t8iqvQQLD
+-----END PRIVATE KEY-----
diff --git a/res_defaults/wpdaemon.conf b/res_defaults/wpdaemon.conf
@@ -0,0 +1,4 @@
+[General]
+enable_ssl=true
+ssl_certificate=cert.pem
+ssl_key_file=key.pem
diff --git a/res_html/index.html b/res_html/index.html
@@ -10,7 +10,7 @@
     <link rel="stylesheet" type="text/css" href="https://www.jeasyui.com/easyui/themes/icon.css" />
     <link rel="stylesheet" type="text/css" href="https://www.jeasyui.com/easyui/demo/demo.css" /> -->
     <link rel="stylesheet" href="w3.css">
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway">
+    <!--<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway"> -->
     <link rel="stylesheeet" href="fajs.min.css">
     <script src="fontawesome-all.min.js"></script>
     <script src="jquery-1.9.1.js"></script>
@@ -100,18 +100,18 @@ <h5>Dashboard</h5>
 
   <!-- Header -->
   <header class="w3-container" style="padding-top:22px">
-    <h5><b><i class="fa fa-dashboard"></i> My Dashboard</b></h5>
+    <h5><b><i class="fa fa-dashboard"></i> <span id="dashboard_site_name"></span></b></h5>
   </header>
 
   <div class="w3-row-padding w3-margin-bottom">
     <div class="w3-quarter">
       <div class="w3-container w3-red w3-padding-16">
 	<div class="w3-left"><i class="fa fa-comment w3-xxxlarge"></i></div>
 	<div class="w3-right">
-	  <h3>52</h3>
+        <h3><span class="dashboard_comment_count"></span></h3>
 	</div>
 	<div class="w3-clear"></div>
-	<h4>Messages</h4>
+      <h4>Comments</h4>
       </div>
     </div>
     <div class="w3-quarter">
diff --git a/res_html/main.js b/res_html/main.js
@@ -137,7 +137,8 @@ function set_command(i_command) {
 function open_site_dashboard(i_site) {
     channel.objects.clientInteraction.set_current_site(i_site, function(args) {
         if (args === true) {
-
+            var sn = document.querySelector("#dashboard_site_name");
+            sn.innerHTML = i_site;
         } else {
             alert("Could not Access Site.\n Make sure the wp-config file is readable by the WPDaemon user.");
         }
diff --git a/resources.qrc b/resources.qrc
@@ -15,5 +15,8 @@
         <file>res_html/font-awesome.min.css</file>
         <file>res_html/fajs.css</file>
         <file>res_html/fontawesome-all.min.js</file>
+        <file>res_defaults/cert.pem</file>
+        <file>res_defaults/key.pem</file>
+        <file>res_defaults/wpdaemon.conf</file>
     </qresource>
 </RCC>
diff --git a/src_assets/assetunpacker.cpp b/src_assets/assetunpacker.cpp
@@ -2,12 +2,18 @@
 #include <QCoreApplication>
 #include <QDir>
 #include <iostream>
+#include <QtDebug>
 
 AssetUnpacker::AssetUnpacker(QObject *parent) : QObject(parent)
 {
 unpack("res_scripts", "scripts");
 unpack("res_html", "public");
 unpack("res_python", "python");
+QFile confFile(qApp->applicationDirPath().append(QDir::separator()).append("wpdaemon.conf"));
+if (!confFile.exists()) {
+     qDebug() << "WELCOME TO WPDAEMON\n" << "-------------\n" << "A new file called wpdaemon.conf  has been created in the directory containing the WPDaemon Binary\n" << qApp->applicationDirPath().append(QDir::separator()).append("wpdaemon.conf") << "\n" << "\n" << "You must now do one of the following actions to properly setup WPDaemon:\n\n" << "1)  Modify WPDaemon.conf and change the ssl_certificate_file  and ssl_key_file settings to point to a valid SSL certificate / key pair\n" << "- OR -" << "Place a valid SSL Certificate in the WPDaemon folder with the name 'cert.pem'  and the corosponding key in the same folder with the name 'key.pem'" << "\n\n" << "*  NOTE: If you choose (option 1) , you must also create a symbolic/hard link or hard copy the certificate and key to match the names provided in (option 2).  This process will not be required at all starting with the first beta release, and will be replaced with an interactive prompt. ";
+unpack("res_defaults", ".");
+  }
 
 }
 
diff --git a/src_interfaces/clientinteraction.cpp b/src_interfaces/clientinteraction.cpp
@@ -126,7 +126,7 @@ QVariant ClientInteraction::set_current_submodule(QString i_module)
               QStringList descList = desc.split("\n", QString::SkipEmptyParts);
               /*QString syn = currentSubmodule->get_command_dump("synopsis").toString();
                QStringList synList = syn.split("\n", QString::KeepEmptyParts); */
-
+              qDebug() << names;
               QString rv = "{\"commands\":[";
               //if (synList.count() != descList.count()) {  // qDebug() << "Synopsis Size Mismatch"; } else {
 
diff --git a/src_interfaces/configcontroller.cpp b/src_interfaces/configcontroller.cpp
@@ -2,6 +2,7 @@
 #include <QCoreApplication>
 #include <QSettings>
 #include <QDir>
+#include <QtDebug>
 
 ConfigController::ConfigController(QObject *parent) : QObject(parent)
 {
@@ -10,9 +11,6 @@ ConfigController::ConfigController(QObject *parent) : QObject(parent)
 
 QSettings* ConfigController::settings()
 {
- QSettings* _settings = new QSettings(qApp->applicationDirPath().append(QDir::separator()).append("config").append(QDir::separator()).append("wpdaemon.conf"), QSettings::IniFormat);
- _settings->setValue("enable_ssl", "true");
- _settings->setValue("ssl_certificate_file", qApp->applicationDirPath().append(QDir::separator()).append("cert.pem"));
- _settings->setValue("ssl_key_file", qApp->applicationDirPath().append(QDir::separator()).append("key.pem"));
+ QSettings* _settings = new QSettings(qApp->applicationDirPath().append(QDir::separator()).append("wpdaemon.conf"), QSettings::IniFormat);
  return _settings;
 }
diff --git a/src_interfaces/logincontroller.cpp b/src_interfaces/logincontroller.cpp
@@ -6,6 +6,7 @@
 #include <QSqlQuery>
 #include <QSqlDatabase>
 #include <QVariant>
+#include <QDateTime>
 LoginController::LoginController(QObject *parent, DatabaseController* i_db) : QObject(parent), m_db(i_db)
 {
   this->hello_str = "hello, world!";
@@ -28,7 +29,7 @@ bool LoginController::check_login(QString username, QString password)
       // it wastes about 2kb of total memory to store and is only requested
       // once on login so i think its okay to keep
 
-      QVector<QVector<QString> > rv(m_db->executeSelectQuery("USERS", (QStringList() << "USERS.ID" << "USERNAME" << "ASSIGNMENTS.PERMISSION" << "ASSIGNMENTS.ASSIGNED" << "PERMSTATES.DESCRIPTION" << "PERMSTATES.NAME"), "inner join ASSIGNMENTS ON UID=USERS.ID inner join PERMSTATES on ASSIGNMENTS.PERMISSION=PERMSTATES.PERMISSION"));
+      QVector<QVector<QString> > rv(m_db->executeSelectQuery("USERS", (QStringList() << "USERS.ID" << "USERNAME" << "ASSIGNMENTS.PERMISSION" << "ASSIGNMENTS.ASSIGNED" << "PERMSTATES.DESCRIPTION" << "PERMSTATES.NAME"), QString("inner join ASSIGNMENTS ON UID=USERS.ID inner join PERMSTATES on ASSIGNMENTS.PERMISSION=PERMSTATES.PERMISSION where USERNAME like '%1'").arg(m_db->toHex(username))));
       QVectorIterator<QVector<QString > > i(rv);
       while (i.hasNext()) {
           QVector<QString> rowData(i.next());
@@ -49,11 +50,44 @@ bool LoginController::check_login(QString username, QString password)
 
 bool LoginController::check_token(QString token)
 {
-  if (m_db->executeSelectQuery("SESSIONS", (QStringList() << "UID" << "TOKEN"), QString("where TOKEN like '%1'").arg(m_db->toHex(token))).count() > 0) {
-      loggedIn = true;
-      QSqlQuery query = m_db->db.exec(QString("delete from SESSIONS where TOKEN like '%1'").arg(m_db->toHex(token)));
-      query.finish();
+  QVector<QVector<QString> > queryResult(m_db->executeSelectQuery("SESSIONS", (QStringList() << "UID" << "TOKEN" << "SESSIONDATA"), QString("where TOKEN like '%1'").arg(m_db->toHex(token))));
+  if (queryResult.count() > 0) {
+      if (queryResult.first().length() > 2) {
+
+          qint64 expireTime = queryResult.first().at(2).toInt();
+          qint64 currentTime = QDateTime::currentSecsSinceEpoch();
+          if (expireTime > currentTime) {
+              loggedIn = true;
+              QSqlQuery query = m_db->db.exec(QString("delete from SESSIONS where TOKEN like '%1'").arg(m_db->toHex(token)));
+              query.finish();
+
+              //populate permissions, descriptions, etc on a per user basis
+              // this will allow for future extending of the code if the need
+              // arises to have language support etc then the descriptions can
+              // be populated based on the selected language or the descriptions
+              // can be more specific for administrators than for operators etc
+              // it wastes about 2kb of total memory to store and is only requested
+              // once on login so i think its okay to keep
 
+              QVector<QVector<QString> > rv(m_db->executeSelectQuery("USERS", (QStringList() << "USERS.ID" << "USERNAME" << "ASSIGNMENTS.PERMISSION" << "ASSIGNMENTS.ASSIGNED" << "PERMSTATES.DESCRIPTION" << "PERMSTATES.NAME"), "inner join ASSIGNMENTS ON UID=USERS.ID inner join PERMSTATES on ASSIGNMENTS.PERMISSION=PERMSTATES.PERMISSION"));
+              QVectorIterator<QVector<QString > > i(rv);
+              while (i.hasNext()) {
+                  QVector<QString> rowData(i.next());
+                  this->assignments[rowData.at(2).toInt()] = static_cast<bool>(rowData.at(3).toInt());
+                  this->assignment_names[rowData.at(2).toInt()] = rowData.at(5);
+                  this->assignment_id_names[rowData.at(5)] = rowData.at(2).toInt();
+                  this->assignment_descriptions[rowData.at(2).toInt()] = rowData.at(4);
+                  this->m_uid = rowData.at(0).toInt();
+                  this->m_username = m_db->fromHex(rowData.at(1));
+                }
+              //end of permission assignment population
+
+            } else {
+              loggedIn = false;
+            }
+        } else {
+          loggedIn = false;
+        }
     } else {
       loggedIn = false;
     }
@@ -67,10 +101,14 @@ QString LoginController::new_token(QString oldToken)
   QVariantList v;
   QUuid newTokenUUid;
   QString newToken = newTokenUUid.createUuid().toString();
+  qint64 expireTime;
+  expireTime = QDateTime::currentSecsSinceEpoch();
+  expireTime += 240;
   int newid = m_db->executeSelectQuery("SESSIONS", (QStringList() << "UID" << "TOKEN"), QString("")).count();
   v.append(QVariant::fromValue(newid));
   v.append(QVariant::fromValue(m_uid));
   v.append(QVariant::fromValue(newToken));
+  v.append(QVariant::fromValue(expireTime));
 
   m_db->executeInsert("SESSIONS", v);
   return newToken;

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`#include <QCoreApplication>`
`3`	`3`	`#include <QSettings>`
`4`	`4`	`#include <QDir>`
	`5`	`+#include <QtDebug>`
`5`	`6`
`6`	`7`	`ConfigController::ConfigController(QObject *parent) : QObject(parent)`
`7`	`8`	`{`
`@@ -10,9 +11,6 @@ ConfigController::ConfigController(QObject *parent) : QObject(parent)`
`10`	`11`
`11`	`12`	`QSettings* ConfigController::settings()`
`12`	`13`	`{`
`13`		`- QSettings* _settings = new QSettings(qApp->applicationDirPath().append(QDir::separator()).append("config").append(QDir::separator()).append("wpdaemon.conf"), QSettings::IniFormat);`
`14`		`- _settings->setValue("enable_ssl", "true");`
`15`		`- _settings->setValue("ssl_certificate_file", qApp->applicationDirPath().append(QDir::separator()).append("cert.pem"));`
`16`		`- _settings->setValue("ssl_key_file", qApp->applicationDirPath().append(QDir::separator()).append("key.pem"));`
	`14`	`+ QSettings* _settings = new QSettings(qApp->applicationDirPath().append(QDir::separator()).append("wpdaemon.conf"), QSettings::IniFormat);`
`17`	`15`	`return _settings;`
`18`	`16`	`}`