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

small fix for base rdp to backwards compatibility

Browse Source
This commit is contained in:
Adolfo Gómez García 2017-02-14 10:27:48 +01:00
parent a499f13e56
commit c80535fabb
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/uds/transports/RDP/BaseRDPTransport.py
View File

@ -40,7 +40,7 @@ from uds.core.transports import protocols
import logging import logging
import os import os
__updated__ = '2017-02-13' __updated__ = '2017-02-14'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -137,7 +137,11 @@ class BaseRDPTransport(Transport):
def getConnectionInfo(self, service, user, password): def getConnectionInfo(self, service, user, password):
dct = self.processUserPassword(service, user, password) dct = self.processUserPassword(service, user, password)
dct['sso'] = service.getProperty('sso_available') == '1' # We can use getConectionInfo with a Service Pool
try:
dct['sso'] = service.getProperty('sso_available') == '1'
except: # If Service Pool
pass
return dct return dct
def getScript(self, script): def getScript(self, script):

4
server/src/uds/web/views/auth.py
View File

@ -58,7 +58,7 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
__updated__ = '2016-11-22' __updated__ = '2017-02-14'
@csrf_exempt @csrf_exempt
@ -226,7 +226,7 @@ def ticketAuth(request, ticketId):
) )
except TicketStore.InvalidTicket: except TicketStore.InvalidTicket:
return render( return render(request,
theme.template('simpleLauncherAlreadyLaunched.html') theme.template('simpleLauncherAlreadyLaunched.html')
) )
except Authenticator.DoesNotExist: except Authenticator.DoesNotExist: