shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-02-08 05:57:39 +03:00
Code Issues Releases Wiki Activity

fixed actor logout persistent & x2go authorize script

Browse Source
This commit is contained in:
Adolfo Gómez García 2020-04-01 14:08:49 +02:00
parent 43fbfdab3d
commit 359857b9b3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,7 +398,9 @@ class Logout(ActorV3Action):
if osManager: if osManager:
if osManager.isRemovableOnLogout(userService): if osManager.isRemovableOnLogout(userService):
logger.debug('Removable on logout: %s', osManager) logger.debug('Removable on logout: %s', osManager)
userService.remove() userService.remove()
else:
userService.remove()
return ActorV3Action.actorResult('ok') return ActorV3Action.actorResult('ok')

6
server/src/uds/transports/X2GO/scripts/authorize.py
View File

@ -42,17 +42,17 @@ def updateAuthorizedKeys(user, pubKey):
authorizedKeys = '{}/authorized_keys'.format(sshFolder) authorizedKeys = '{}/authorized_keys'.format(sshFolder)
try: try:
with open(authorizedKeys, 'r') as f: with open(authorizedKeys, 'rb') as f:
lines = f.readlines() lines = f.readlines()
except Exception: except Exception:
lines = [] lines = []
with open(authorizedKeys, 'w') as f: with open(authorizedKeys, 'wb') as f:
for line in lines: for line in lines:
if 'UDS@X2GOCLIENT' not in line and line.strip(): if 'UDS@X2GOCLIENT' not in line and line.strip():
f.write(line) f.write(line)
# Append pubkey # Append pubkey
f.write(six.binary_type('ssh-rsa {} UDS@X2GOCLIENT\n'.format(pubKey))) f.write('ssh-rsa {} UDS@X2GOCLIENT\n'.format(pubKey).encode())
# Ensure access is correct # Ensure access is correct
os.chown(authorizedKeys, uid, -1) os.chown(authorizedKeys, uid, -1)