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

Small set of general cleanup in the server sources:

Browse Source 
1) Fix a connection issue in the dispatcher
2) Always run the [T]SOCKET->isValid() check before interacting with any socket.
This commit is contained in:
Ken Moore
2016-02-25 08:49:17 -05:00
parent b18a6a1a2a
commit c064bdcfcd
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/Dispatcher.cpp
View File

@@ -91,7 +91,7 @@ void DProcess::cmdFinished(int ret, QProcess::ExitStatus status){
// Dispatcher Class
// ================================
Dispatcher::Dispatcher(){
connect(this, SIGNAL(mkprocs(Dispatcher::PROC_QUEUE, QString, QStringList)), this, SLOT(mkProcs(Dispatcher::PROC_QUEUE, QString, QStringList)) );
connect(this, SIGNAL(mkprocs(Dispatcher::PROC_QUEUE, DProcess*)), this, SLOT(mkProcs(Dispatcher::PROC_QUEUE, DProcess*)) );
}
Dispatcher::~Dispatcher(){

16
src/server/WebSocket.cpp
View File

@@ -54,11 +54,11 @@ WebSocket::WebSocket(QSslSocket *sock, QString ID, AuthorizationManager *auth){
WebSocket::~WebSocket(){
//qDebug() << "SOCKET Destroyed";
if(SOCKET!=0){
if(SOCKET!=0 && SOCKET->isValid()){
SOCKET->close();
delete SOCKET;
}
if(TSOCKET!=0){
if(TSOCKET!=0 && TSOCKET->isValid()){
TSOCKET->close();
delete TSOCKET;
}
@@ -128,8 +128,8 @@ void WebSocket::EvaluateRequest(const RestInputStruct &REQ){
RestOutputStruct out;
out.in_struct = REQ;
QHostAddress host;
if(SOCKET!=0){ host = SOCKET->peerAddress(); }
else if(TSOCKET!=0){ host = TSOCKET->peerAddress(); }
if(SOCKET!=0 && SOCKET->isValid()){ host = SOCKET->peerAddress(); }
else if(TSOCKET!=0 && TSOCKET->isValid()){ host = TSOCKET->peerAddress(); }
if(!REQ.VERB.isEmpty() && REQ.VERB != "GET" && REQ.VERB!="POST" && REQ.VERB!="PUT"){
//Non-supported request (at the moment) - return an error message
out.CODE = RestOutputStruct::BADREQUEST;
@@ -150,7 +150,7 @@ if(out.in_struct.namesp.toLower() == "rpc"){
//Now perform authentication based on type of auth given
//Note: This sets/changes the current SockAuthToken
AUTHSYSTEM->clearAuth(SockAuthToken); //new auth requested - clear any old token
if(DEBUG){ qDebug() << "Authenticate Peer:" << SOCKET->peerAddress().toString(); }
if(DEBUG){ qDebug() << "Authenticate Peer:" << host; }
//Now do the auth
if(out.in_struct.name=="auth" && out.in_struct.args.isObject() ){
//username/[password/cert] authentication
@@ -265,7 +265,7 @@ if(out.in_struct.namesp.toLower() == "rpc"){
}
//Return any information
this->sendReply(out.assembleMessage());
if(out.CODE == RestOutputStruct::FORBIDDEN && SOCKET!=0){
if(out.CODE == RestOutputStruct::FORBIDDEN && SOCKET!=0 && SOCKET->isValid()){
SOCKET->close(QWebSocketProtocol::CloseCodeNormal, "Too Many Authorization Failures - Try again later");
}
}
@@ -303,11 +303,11 @@ QStringList WebSocket::JsonArrayToStringList(QJsonArray array){
// PRIVATE SLOTS
// =====================
void WebSocket::checkIdle(){
if(SOCKET !=0){
if(SOCKET !=0 && SOCKET->isValid()){
LogManager::log(LogManager::HOST,"Connection Idle: "+SockPeerIP);
SOCKET->close(); //timeout - close the connection to make way for others
}
if(TSOCKET !=0){
else if(TSOCKET !=0 && TSOCKET->isValid() ){
LogManager::log(LogManager::HOST,"Connection Idle: "+SockPeerIP);
TSOCKET->close(); //timeout - close the connection to make way for others
}