shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-02-07 01:58:15 +03:00
Code Issues Releases Wiki Activity

* Fixed HTML5RDP to work correctly with new actor

Browse Source 
* Fixed base transport to receive an "user" and not an "username"
This commit is contained in:
Adolfo Gómez García 2015-02-17 11:45:30 +01:00
parent 1497314a46
commit 06e886a366
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/uds/core/transports/BaseTransport.py
View File

@ -144,13 +144,13 @@ class Transport(Module):
'''
return {'protocol': self.protocol, 'username': '', 'password': '', 'domain': ''}
def processedUser(self, userService, userName):
def processedUser(self, userService, user):
'''
Used to "transform" username that will be sent to service
This is used to make the "user" that will receive the service match with that sent in notification
@return: transformed username
'''
return userName
return user.name
def renderForHtml(self, userService, transport, ip, os, user, password):
'''

22
server/src/uds/transports/HTML5RDP/HTML5RDP.py
View File

@ -95,8 +95,11 @@ class HTML5RDPTransport(Transport):
self.cache().put(ip, 'N', READY_CACHE_TIMEOUT)
return ready == 'Y'
def renderForHtml(self, userService, transport, ip, os, user, password):
# We use helper to keep this clean
def processedUser(self, userService, userName):
v = self.processUserPassword(userService, userName, '')
return v['username']
def processUserPassword(self, service, user, password):
username = user.getUsernameForAuth()
if self.fixedName.value is not '':
@ -113,10 +116,10 @@ class HTML5RDPTransport(Transport):
password = self.fixedPassword.value
if self.fixedDomain.value is not '':
domain = self.fixedDomain.value
if self.useEmptyCreds.value is True:
if self.useEmptyCreds.isTrue():
username, password, domain = '', '', ''
if self.withoutDomain.value is True:
if self.withoutDomain.isTrue():
domain = ''
if '.' in domain: # Dotter domain form
@ -124,7 +127,16 @@ class HTML5RDPTransport(Transport):
domain = ''
# Fix username/password acording to os manager
username, password = userService.processUserPassword(username, password)
username, password = service.processUserPassword(username, password)
return {'protocol': self.protocol, 'username': username, 'password': password, 'domain': domain}
def renderForHtml(self, userService, transport, ip, os, user, password):
ci = self.processUserPassword(userService, user, password)
username, password, domain = ci['username'], ci['password'], ci['domain']
if domain != '':
username = domain + '\\' + username
# Build params dict
params = {