diff --git a/src/server/SslServer.h b/src/server/SslServer.h index fbe5917..021d4ec 100644 --- a/src/server/SslServer.h +++ b/src/server/SslServer.h @@ -8,12 +8,7 @@ #ifndef _PCBSD_REST_WEB_SSL_SERVER_H #define _PCBSD_REST_WEB_SSL_SERVER_H -#include -#include -#include -#include -#include -#include +#include "globals-qt.h" class SslServer : public QTcpServer{ Q_OBJECT @@ -38,9 +33,9 @@ protected: qDebug() << "New Ssl Connection:"; //setup any supported encruption types here serverSocket->setSslConfiguration(QSslConfiguration::defaultConfiguration()); - serverSocket->setProtocol(QSsl::TlsV1_2); - serverSocket->setPrivateKey("/usr/local/etc/sysadm/restserver.key"); - serverSocket->setLocalCertificate("/usr/local/etc/sysadm/restserver.crt"); + serverSocket->setProtocol(SSLVERSION); + serverSocket->setPrivateKey(SSLKEYFILE); + serverSocket->setLocalCertificate(SSLCERTFILE); //qDebug() << " - Supported Protocols:" << serverSocket->sslConfiguration().protocol(); if (serverSocket->setSocketDescriptor(socketDescriptor)) { diff --git a/src/server/WebServer.cpp b/src/server/WebServer.cpp index 69436d5..7a09dcf 100644 --- a/src/server/WebServer.cpp +++ b/src/server/WebServer.cpp @@ -55,7 +55,7 @@ bool WebServer::setupWebSocket(quint16 port){ WSServer = new QWebSocketServer("sysadm-server", QWebSocketServer::SecureMode, this); //SSL Configuration QSslConfiguration config = QSslConfiguration::defaultConfiguration(); - QFile CF( QStringLiteral("/usr/local/etc/sysadm/wsserver.crt") ); + QFile CF( QStringLiteral(SSLCERTFILE) ); if(CF.open(QIODevice::ReadOnly) ){ QSslCertificate CERT(&CF,QSsl::Pem); config.setLocalCertificate( CERT ); @@ -63,7 +63,7 @@ bool WebServer::setupWebSocket(quint16 port){ }else{ qWarning() << "Could not read WS certificate file:" << CF.fileName(); } - QFile KF( QStringLiteral("/usr/local/etc/sysadm/wsserver.key")); + QFile KF( QStringLiteral(SSLKEYFILE)); if(KF.open(QIODevice::ReadOnly) ){ QSslKey KEY(&KF, QSsl::Rsa, QSsl::Pem); config.setPrivateKey( KEY ); @@ -72,7 +72,7 @@ bool WebServer::setupWebSocket(quint16 port){ qWarning() << "Could not read WS key file:" << KF.fileName(); } config.setPeerVerifyMode(QSslSocket::VerifyNone); - config.setProtocol(QSsl::TlsV1_0); + config.setProtocol(SSLVERSION); WSServer->setSslConfiguration(config); //Setup Connections connect(WSServer, SIGNAL(newConnection()), this, SLOT(NewSocketConnection()) ); diff --git a/src/server/globals-qt.h b/src/server/globals-qt.h index c3ad760..6323e6e 100644 --- a/src/server/globals-qt.h +++ b/src/server/globals-qt.h @@ -25,16 +25,20 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include +#include +#include #include #include #include @@ -42,6 +46,10 @@ #include #include +#define SSLVERSION QSsl::TlsV1_0 +#define SSLCERTFILE "/usr/local/etc/sysadm/restserver.crt" +#define SSLKEYFILE "/usr/local/etc/sysadm/restserver.key" + inline QString DisplayPriority(int pri){ //ensure bounds if(pri<0){ pri = 0; }