1
0
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-25 23:21:41 +03:00

Merge remote-tracking branch 'origin/v3.0'

This commit is contained in:
Adolfo Gómez García 2021-03-10 18:13:42 +01:00
commit c6213ff37c
3 changed files with 18 additions and 5 deletions

View File

@ -145,6 +145,9 @@ class Environment:
Provides a temporary environment needed in some calls (test provider, for example)
It will not make environment persistent
"""
env = Environment(TEMP_ENV)
env.storage.delete()
env.cache.clean()
return Environment(TEMP_ENV)
@staticmethod

View File

@ -341,8 +341,12 @@ class HTML5RDPTransport(transports.Transport):
if self.fixedPassword.value != '':
password = self.fixedPassword.value
azureAd = False
if self.fixedDomain.value != '':
domain = self.fixedDomain.value
if self.fixedDomain.value.lower() == 'azuread':
azureAd = True
else:
domain = self.fixedDomain.value
if self.useEmptyCreds.isTrue():
username, password, domain = '', '', ''
@ -355,6 +359,9 @@ class HTML5RDPTransport(transports.Transport):
username = username + '@' + domain
domain = ''
username = 'AzureAD\\' + username
# Fix username/password acording to os manager
username, password = userService.processUserPassword(username, password)

View File

@ -339,8 +339,13 @@ class BaseRDPTransport(transports.Transport):
if self.fixedPassword.value:
password = self.fixedPassword.value
if self.fixedDomain.value:
domain = self.fixedDomain.value
azureAd = False
if self.fixedDomain.value != '':
if self.fixedDomain.value.lower() == 'azuread':
azureAd = True
else:
domain = self.fixedDomain.value
if self.useEmptyCreds.isTrue():
username, password, domain = '', '', ''
@ -355,8 +360,6 @@ class BaseRDPTransport(transports.Transport):
username = domain + '\\' + username
domain = ''
# Temporal "fix" to check if we do something on processUserPassword
# Fix username/password acording to os manager
username, password = userService.processUserPassword(username, password)