opengnsys
/
ogagent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#975: OGAgent supports multiple user sessions.

remotes/github/python3
Ramón M. Gómez 2020-04-30 10:48:11 +02:00
parent 4aa86dedef
commit e298c499c9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/opengnsys/modules/server/OpenGnSys/__init__.py
View File

@ -80,7 +80,7 @@ class OpenGnSysWorker(ServerWorker):
name = 'opengnsys' # Module name name = 'opengnsys' # Module name
interface = None # Bound interface for OpenGnsys interface = None # Bound interface for OpenGnsys
REST = None # REST object REST = None # REST object
logged_in = False # User session flag user = [] # User sessions
random = None # Random string for secure connections random = None # Random string for secure connections
length = 32 # Random string length length = 32 # Random string length
@ -163,7 +163,7 @@ class OpenGnSysWorker(ServerWorker):
""" """
user, sep, language = data.partition(',') user, sep, language = data.partition(',')
logger.debug('Received login for {} with language {}'.format(user, language)) logger.debug('Received login for {} with language {}'.format(user, language))
self.logged_in = True self.user.append(user)
self.REST.sendMessage('ogagent/loggedin', {'ip': self.interface.ip, 'user': user, 'language': language, self.REST.sendMessage('ogagent/loggedin', {'ip': self.interface.ip, 'user': user, 'language': language,
'ostype': operations.os_type, 'osversion': operations.os_version}) 'ostype': operations.os_type, 'osversion': operations.os_version})
@ -172,7 +172,10 @@ class OpenGnSysWorker(ServerWorker):
Sends session logout notification to OpenGnsys server Sends session logout notification to OpenGnsys server
""" """
logger.debug('Received logout for {}'.format(user)) logger.debug('Received logout for {}'.format(user))
self.logged_in = False try:
self.user.pop()
except IndexError:
pass
self.REST.sendMessage('ogagent/loggedout', {'ip': self.interface.ip, 'user': user}) self.REST.sendMessage('ogagent/loggedout', {'ip': self.interface.ip, 'user': user})
def process_ogclient(self, path, get_params, post_params, server): def process_ogclient(self, path, get_params, post_params, server):
@ -213,11 +216,12 @@ class OpenGnSysWorker(ServerWorker):
:return: JSON object {"status": "status_code", "loggedin": boolean} :return: JSON object {"status": "status_code", "loggedin": boolean}
""" """
st = {'linux': 'LNX', 'macos': 'OSX', 'windows': 'WIN'} st = {'linux': 'LNX', 'macos': 'OSX', 'windows': 'WIN'}
res = {'loggedin': self.loggedin}
try: try:
res['status'] = st[operations.os_type.lower()] res['status'] = st[operations.os_type.lower()]
res = {'status': st[operations.os_type.lower()], 'loggedin': len(self.user) > 0}
except KeyError: except KeyError:
res['status'] = 'ERR' # Unknown operating system
res = {'status': 'UNK'}
return res return res
@check_secret @check_secret