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

Couple changes:

Browse Source 
1) Fix the event registration detection (string/array for args, not object/array)
2) Add a 30 second connection timeout for the client to successfully authorize before the server will close the connection.
This commit is contained in:
Ken Moore
2016-03-03 11:57:45 -05:00
parent 4fa264ea4f
commit 1fc3b3fbb4
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/EventWatcher.cpp
View File

@@ -14,7 +14,6 @@ EventWatcher::EventWatcher(){
//Only put non-thread-specific stuff here
starting = true;
oldhostname = sysadm::General::RunCommand("hostname").simplified();
}
EventWatcher::~EventWatcher(){
@@ -111,12 +110,14 @@ void EventWatcher::DispatchStarting(QString ID){
QJsonObject obj;
obj.insert("process_id", ID);
obj.insert("state", "running");
LogManager::log(LogManager::EV_DISPATCH, obj);
LogManager::log(LogManager::EV_DISPATCH, obj);
qDebug() << "Got Dispatch starting: sending event...";
emit NewEvent(DISPATCHER, obj);
}
void EventWatcher::DispatchFinished(QJsonObject obj){
LogManager::log(LogManager::EV_DISPATCH, obj);
qDebug() << "Got Dispatch Finished: sending event...";
emit NewEvent(DISPATCHER, obj);
}

2
src/server/WebServer.cpp
View File

@@ -147,7 +147,7 @@ void WebServer::NewSocketConnection(){
if(sock==0){ return; } //no new connection
//qDebug() << "New Socket Connection";
connect(sock, SIGNAL(SocketClosed(QString)), this, SLOT(SocketClosed(QString)) );
connect(EVENTS, SIGNAL(NewEvent(EventWatcher::EVENT_TYPE, QJsonValue)), sock, SLOT(EventUpdate(EventWatcher::EVENT_TYPE, QJsonValue)) );
//connect(EVENTS, SIGNAL(NewEvent(EventWatcher::EVENT_TYPE, QJsonValue)), sock, SLOT(EventUpdate(EventWatcher::EVENT_TYPE, QJsonValue)) );
OpenSockets << sock;
}

22
src/server/WebSocket.cpp
View File

@@ -26,7 +26,9 @@ WebSocket::WebSocket(QWebSocket *sock, QString ID, AuthorizationManager *auth){
connect(SOCKET, SIGNAL(textMessageReceived(const QString&)), this, SLOT(EvaluateMessage(const QString&)) );
connect(SOCKET, SIGNAL(binaryMessageReceived(const QByteArray&)), this, SLOT(EvaluateMessage(const QByteArray&)) );
connect(SOCKET, SIGNAL(aboutToClose()), this, SLOT(SocketClosing()) );
connect(EVENTS, SIGNAL(NewEvent(EventWatcher::EVENT_TYPE, QJsonValue)), this, SLOT(EventUpdate(EventWatcher::EVENT_TYPE, QJsonValue)) );
idletimer->start();
QTimer::singleShot(30000, this, SLOT(checkAuth()));
}
WebSocket::WebSocket(QSslSocket *sock, QString ID, AuthorizationManager *auth){
@@ -46,10 +48,12 @@ WebSocket::WebSocket(QSslSocket *sock, QString ID, AuthorizationManager *auth){
connect(TSOCKET, SIGNAL(encrypted()), this, SLOT(nowEncrypted()) );
connect(TSOCKET, SIGNAL(peerVerifyError(const QSslError &)), this, SLOT(peerError(const QSslError &)) );
connect(TSOCKET, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(SslError(const QList<QSslError> &)) );
connect(EVENTS, SIGNAL(NewEvent(EventWatcher::EVENT_TYPE, QJsonValue)), this, SLOT(EventUpdate(EventWatcher::EVENT_TYPE, QJsonValue)) );
//qDebug() << " - Starting Server Encryption Handshake";
TSOCKET->startServerEncryption();
//qDebug() << " - Socket Encrypted:" << TSOCKET->isEncrypted();
idletimer->start();
QTimer::singleShot(30000, this, SLOT(checkAuth()));
}
WebSocket::~WebSocket(){
@@ -125,6 +129,7 @@ void WebSocket::EvaluateREST(QString msg){
}
void WebSocket::EvaluateRequest(const RestInputStruct &REQ){
//qDebug() << "Evaluate Request:" << REQ.namesp << REQ.name << REQ.args;
RestOutputStruct out;
out.in_struct = REQ;
QHostAddress host;
@@ -210,12 +215,13 @@ if(out.in_struct.namesp.toLower() == "rpc"){
}
}else if(out.in_struct.namesp.toLower() == "events"){
//qDebug() << "Got Event subsytem request" << out.in_struct.args;
if( AUTHSYSTEM->checkAuth(SockAuthToken) ){ //validate current Authentication token
//Pre-set any output fields
QJsonObject outargs;
//Assemble the list of input events
QStringList evlist;
if(out.in_struct.args.isObject()){ evlist << JsonValueToString(out.in_struct.args); }
if(out.in_struct.args.isString()){ evlist << JsonValueToString(out.in_struct.args); }
else if(out.in_struct.args.isArray()){ evlist = JsonArrayToStringList(out.in_struct.args.toArray()); }
//Now subscribe/unsubscribe to these events
int sub = -1; //bad input
@@ -225,6 +231,7 @@ if(out.in_struct.namesp.toLower() == "rpc"){
if(sub>=0 && !evlist.isEmpty() ){
for(int i=0; i<evlist.length(); i++){
EventWatcher::EVENT_TYPE type = EventWatcher::typeFromString(evlist[i]);
qDebug() << " - type:" << type;
if(type==EventWatcher::BADEVENT){ continue; }
outargs.insert(out.in_struct.name,QJsonValue(evlist[i]));
if(sub==1){
@@ -313,6 +320,13 @@ void WebSocket::checkIdle(){
}
}
void WebSocket::checkAuth(){
if(!AUTHSYSTEM->checkAuth(SockAuthToken)){
//Still not authorized - disconnect
checkIdle();
}
}
void WebSocket::SocketClosing(){
LogManager::log(LogManager::HOST,"Connection Closing: "+SockPeerIP);
if(idletimer->isActive()){
@@ -379,16 +393,16 @@ void WebSocket::SslError(const QList<QSslError> &err){ //sslErrors() signal
// PUBLIC SLOTS
// ======================
void WebSocket::EventUpdate(EventWatcher::EVENT_TYPE evtype, QJsonValue msg){
qDebug() << "Got Socket Event Update:" << msg;
if(msg.isNull()){ msg = EVENTS->lastEvent(evtype); }
//qDebug() << "Socket Status Update:" << msg;
if(!ForwardEvents.contains(evtype)){ return; }
if( !ForwardEvents.contains(evtype) ){ return; }
RestOutputStruct out;
out.CODE = RestOutputStruct::OK;
out.in_struct.namesp = "events";
out.out_args = msg;
out.Header << "Content-Type: text/json; charset=utf-8"; //REST header info
out.in_struct.name = EventWatcher::typeToString(evtype);
qDebug() << "Send Event:" << out.assembleMessage();
//Now send the message back through the socket
this->sendReply(out.assembleMessage());
}

1
src/server/WebSocket.h
View File

@@ -70,6 +70,7 @@ private:
private slots:
void checkIdle(); //see if the currently-connected client is idle
void checkAuth(); //see if the currently-connected client has authed yet
void SocketClosing();
//Currently connected socket signal/slot connections