github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 10:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

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).

Browse Source
This commit is contained in:
Ken Moore
2016-06-21 15:14:29 -04:00
parent 5da15e8f0f
commit bcaf188dc1
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/bridge/AuthorizationManager.cpp
View File

@@ -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);

2
src/bridge/BridgeServer.cpp
View File

@@ -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();

4
src/server/AuthorizationManager.cpp
View File

@@ -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

14
src/sysadm.pro
View File

@@ -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