From bcaf188dc1558d5cf244423ba029dac7c11400e2 Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Tue, 21 Jun 2016 15:14:29 -0400
Subject: [PATCH] Disable the installation of the jobd routines, and also
 deactivate the 2nd layer SSL encryption through a bridge for the moment
 (base64 only right now).

---
 src/bridge/AuthorizationManager.cpp |  1 +
 src/bridge/BridgeServer.cpp         |  2 +-
 src/server/AuthorizationManager.cpp |  4 ++--
 src/sysadm.pro                      | 14 +++++++-------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/bridge/AuthorizationManager.cpp b/src/bridge/AuthorizationManager.cpp
index ce33122..4e33812 100644
--- a/src/bridge/AuthorizationManager.cpp
+++ b/src/bridge/AuthorizationManager.cpp
@@ -223,6 +223,7 @@ QString AuthorizationManager::DecryptSSLString(QString encstring, QString pubkey
   QByteArray enc;
     enc.append(encstring);
   enc = QByteArray::fromBase64(enc);
+  //return QString(enc); //BYPASS - only use BASE64 for now (skip 2nd layer SSL encryption)
   QByteArray pkey;
     pkey.append(pubkey);
   pkey = QByteArray::fromBase64(pkey);
diff --git a/src/bridge/BridgeServer.cpp b/src/bridge/BridgeServer.cpp
index 90ae834..485caf1 100644
--- a/src/bridge/BridgeServer.cpp
+++ b/src/bridge/BridgeServer.cpp
@@ -203,7 +203,7 @@ void BridgeServer::announceKeyChange(QString ID, bool isServer, QStringList keys
         //compare keys to look for matches
         QStringList chkkeys = OpenSockets[i ]->validKeySums();
         chkkeys.removeDuplicates();
-        //qDebug() << "Known Keys for ID:" << OpenSockets[i]->ID() << chkkeys;
+        qDebug() << "Known Keys for ID:" << OpenSockets[i]->ID() << chkkeys;
         chkkeys << keys;
         if(chkkeys.removeDuplicates() > 0){
           IDs << OpenSockets[i]->ID(); 
diff --git a/src/server/AuthorizationManager.cpp b/src/server/AuthorizationManager.cpp
index a64743c..4b68725 100644
--- a/src/server/AuthorizationManager.cpp
+++ b/src/server/AuthorizationManager.cpp
@@ -344,7 +344,7 @@ QString AuthorizationManager::encryptString(QString str, QByteArray key){
   if(key.contains("PUBLIC KEY--")){ pub=true; }
   else if(key.contains(" PRIVATE KEY--")){ pub=false; }
   else{ return str; } //unknown encryption - just return as-is
-  //return str.toLocal8Bit().toBase64(); //TEMPORARY BYPASS
+  return str.toLocal8Bit().toBase64(); //TEMPORARY BYPASS
   //qDebug() << "Start encoding String:" << pub << str.length() << str <<  key;
   //Reset/Load some SSL stuff
     //OpenSSL_add_all_algorithms();
@@ -433,7 +433,7 @@ QString AuthorizationManager::decryptString(QString str, QByteArray key){
     return str;
   }
   //qDebug() << "Decoded String:" << bytes;
-  //return QString(bytes); //TEMPORARY BYPASS
+  return QString(blocks.join()); //TEMPORARY BYPASS
 
    //qDebug() << "Start decoding String:" << pub << str;//<< key;
   //Reset/Load some SSL stuff
diff --git a/src/sysadm.pro b/src/sysadm.pro
index 0d5b6d2..1e799bd 100644
--- a/src/sysadm.pro
+++ b/src/sysadm.pro
@@ -6,16 +6,16 @@ SUBDIRS+= server bridge
 rcd.path = /usr/local/etc/rc.d/
 rcd.extra = cp rc.d/* $(INSTALL_ROOT)/usr/local/etc/rc.d/
 
-dconf.path = /usr/local/etc/job.d/
-dconf.extra = cp job.d/* $(INSTALL_ROOT)/usr/local/etc/job.d/
+#dconf.path = /usr/local/etc/job.d/
+#dconf.extra = cp job.d/* $(INSTALL_ROOT)/usr/local/etc/job.d/
 
-wsdaemon.path = /usr/local/etc/job.d/
-wsdaemon.extra = cp job.d/org.pcbsd.sysadm.json $(INSTALL_ROOT)/usr/local/etc/job.d/org.pcbsd.sysadm.json
+#wsdaemon.path = /usr/local/etc/job.d/
+#wsdaemon.extra = cp job.d/org.pcbsd.sysadm.json $(INSTALL_ROOT)/usr/local/etc/job.d/org.pcbsd.sysadm.json
 
-rstdaemon.path = /usr/local/etc/job.d/
-rstdaemon.extra = cp job.d/org.pcbsd.sysadm-rest.json $(INSTALL_ROOT)/usr/local/etc/job.d/org.pcbsd.sysadm-rest.json
+#rstdaemon.path = /usr/local/etc/job.d/
+#rstdaemon.extra = cp job.d/org.pcbsd.sysadm-rest.json $(INSTALL_ROOT)/usr/local/etc/job.d/org.pcbsd.sysadm-rest.json
 
 conf.path = /usr/local/etc/
 conf.extra = cp conf/sysadm.conf ${INSTALL_ROOT}/usr/local/etc/sysadm.conf.dist
 
-INSTALLS += rcd conf wsdaemon rstdaemon dconf
+INSTALLS += rcd conf