burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

added small comment for future to actor v3

Browse Source
This commit is contained in:
Adolfo Gómez García 2021-10-13 11:19:44 +02:00
parent fddd54fa99
commit 293b7f02ad
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/uds/REST/methods/actor_v3.py
View File

@ -424,7 +424,7 @@ class Version(ActorV3Action):
class LoginLogout(ActorV3Action): class LoginLogout(ActorV3Action):
name = 'notused' # Not really important, this is not a "leaf" class and will not be directly available name = 'notused' # Not really important, this is not a "leaf" class and will not be directly available
def notifyService(self, login: bool): def notifyService(self, isLogin: bool):
try: try:
# If unmanaged, use Service locator # If unmanaged, use Service locator
service: 'services.Service' = Service.objects.get( service: 'services.Service' = Service.objects.get(
@ -444,9 +444,11 @@ class LoginLogout(ActorV3Action):
if not validId: if not validId:
raise Exception() raise Exception()
# Recover Id Info from service and validId
# idInfo = service.recoverIdInfo(validId)
# Notify Service that someone logged in/out # Notify Service that someone logged in/out
if login: if isLogin:
# Try to guess if this is a remote session # Try to guess if this is a remote session
is_remote = self._params.get('session_type', '')[:4] in ('xrdp', 'RDP-') is_remote = self._params.get('session_type', '')[:4] in ('xrdp', 'RDP-')
service.processLogin(validId, remote_login=is_remote) service.processLogin(validId, remote_login=is_remote)
@ -518,7 +520,7 @@ class Login(LoginLogout):
except Exception: # If unamanaged host, lest do a bit more work looking for a service with the provided parameters... except Exception: # If unamanaged host, lest do a bit more work looking for a service with the provided parameters...
if isManaged: if isManaged:
raise raise
self.notifyService(login=True) self.notifyService(isLogin=True)
return ActorV3Action.actorResult( return ActorV3Action.actorResult(
{'ip': ip, 'hostname': hostname, 'dead_line': deadLine, 'max_idle': maxIdle} {'ip': ip, 'hostname': hostname, 'dead_line': deadLine, 'max_idle': maxIdle}
@ -561,7 +563,7 @@ class Logout(LoginLogout):
except Exception: # If unamanaged host, lest do a bit more work looking for a service with the provided parameters... except Exception: # If unamanaged host, lest do a bit more work looking for a service with the provided parameters...
if isManaged: if isManaged:
raise raise
self.notifyService(login=False) # Logout notification self.notifyService(isLogin=False) # Logout notification
return ActorV3Action.actorResult('ok') return ActorV3Action.actorResult('ok')
@ -639,7 +641,6 @@ class Unmanaged(ActorV3Action):
except Exception: except Exception:
return ActorV3Action.actorResult(error='Invalid token') return ActorV3Action.actorResult(error='Invalid token')
# Build the possible ids and ask service if it recognizes any of it # Build the possible ids and ask service if it recognizes any of it
# If not recognized, will generate anyway the certificate, but will not be saved # If not recognized, will generate anyway the certificate, but will not be saved
idsList = [x['ip'] for x in self._params['id']] + [ idsList = [x['ip'] for x in self._params['id']] + [