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

Get the encryption systems setup with a temporary base64 encoding instead of full SSL encryption (for testing the encode/decode routines)

Browse Source
This commit is contained in:
Ken Moore
2016-05-25 09:01:38 -04:00
parent 90eeee0469
commit 68a4bb29c7
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/AuthorizationManager.cpp
View File

@@ -339,11 +339,11 @@ QString AuthorizationManager::LoginUC(QHostAddress host, QString encstring){
}
QString AuthorizationManager::encryptString(QString str, QByteArray key){
return str; //TEMPORARY BYPASS
bool pub=true;
if(key.contains("--BEGIN 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
qDebug() << "Encrypt String:" << str << pub;//<< key;
//Reset/Load some SSL stuff
//OpenSSL_add_all_algorithms();
@@ -391,7 +391,10 @@ QString AuthorizationManager::encryptString(QString str, QByteArray key){
}
QString AuthorizationManager::decryptString(QString str, QByteArray key){
return str; //TEMPORARY BYPASS
QByteArray bytes; bytes.append(str);
bytes = QByteArray::fromBase64(bytes);
qDebug() << "Decode String:" << bytes;
return QString(bytes); //TEMPORARY BYPASS
bool pub=true;
if(key.contains("--BEGIN PUBLIC KEY--")){ pub=true; }
else if(key.contains(" PRIVATE KEY--")){ pub=false; }

2
src/server/WebSocket.cpp
View File

@@ -145,7 +145,7 @@ bool WebSocket::isActive(){
// PRIVATE
//=======================
void WebSocket::sendReply(QString msg){
//qDebug() << "Sending Socket Reply:" << msg;
qDebug() << "Sending Socket Reply:" << msg;
if(SOCKET!=0 && SOCKET->isValid()){ SOCKET->sendTextMessage(msg); } //Websocket connection
else if(TSOCKET!=0 && TSOCKET->isValid()){
//TCP Socket connection