merged 2.1 fixes

server/src/uds/transports/RDP/BaseRDPTransport.py

@@ -40,7 +40,7 @@ from uds.core.transports import protocols
 import logging
 import os
 
-__updated__ = '2017-03-15'
+__updated__ = '2017-03-20'
 
 
 logger = logging.getLogger(__name__)
@@ -69,6 +69,7 @@ class BaseRDPTransport(Transport):
     multimon = gui.CheckBoxField(label=_('Multiple monitors'), order=21, tooltip=_('If checked, all client monitors will be used for displaying (only works on windows clients)'), tab=gui.PARAMETERS_TAB)
     aero = gui.CheckBoxField(label=_('Allow Desk.Comp.'), order=22, tooltip=_('If checked, desktop composition will be allowed'), tab=gui.PARAMETERS_TAB)
     smooth = gui.CheckBoxField(label=_('Font Smoothing'), order=23, tooltip=_('If checked, fonts smoothing will be allowed (windows clients only)'), tab=gui.PARAMETERS_TAB)
+    credssp = gui.CheckBoxField(label=_('Credssp Support'), order=24, tooltip=_('If checked, will enalbe Credentials Provider Support)'), tab=gui.PARAMETERS_TAB)
     multimedia = gui.CheckBoxField(label=_('Multimedia sync'), order=25, tooltip=_('If checked. Linux client will use multimedia parameter for xfreerdp'), tab='Linux Client')
     alsa = gui.CheckBoxField(label=_('Use Alsa'), order=26, tooltip=_('If checked, Linux client will try to use ALSA, otherwise Pulse will be used'), tab='Linux Client')
     printerString = gui.TextField(label=_('Printer string'), order=27, tooltip=_('If printer is checked, the printer string used with xfreerdp client'), tab='Linux Client')
@@ -137,13 +138,7 @@ class BaseRDPTransport(Transport):
         return {'protocol': self.protocol, 'username': username, 'password': password, 'domain': domain}
 
     def getConnectionInfo(self, service, user, password):
-        dct = self.processUserPassword(service, user, password)
-        # We can use getConectionInfo with a Service Pool
-        try:
-            dct['sso'] = service.getProperty('sso_available') == '1'
-        except:  # If Service Pool
-            pass
-        return dct
+        return self.processUserPassword(service, user, password)
 
     def getScript(self, scriptName, osName, params):
         # Reads script

server/src/uds/transports/RDP/RDPFile.py

@@ -40,8 +40,7 @@ from uds.core.util import OsDetector
 import six
 import os
 
-
-__updated__ = '2017-03-15'
+__updated__ = '2017-03-20'
 
 
 class RDPFile(object):

server/src/uds/transports/RDP/RDPTransport.py

@@ -44,7 +44,7 @@ logger = logging.getLogger(__name__)
 
 READY_CACHE_TIMEOUT = 30
 
-__updated__ = '2017-03-17'
+__updated__ = '2017-03-20'
 
 
 class RDPTransport(BaseRDPTransport):
@@ -69,6 +69,7 @@ class RDPTransport(BaseRDPTransport):
     multimon = BaseRDPTransport.multimon
     aero = BaseRDPTransport.aero
     smooth = BaseRDPTransport.smooth
+    credssp = BaseRDPTransport.credssp
     multimedia = BaseRDPTransport.multimedia
     alsa = BaseRDPTransport.alsa
     printerString = BaseRDPTransport.printerString
@@ -85,7 +86,7 @@ class RDPTransport(BaseRDPTransport):
         depth = CommonPrefs.getDepth(prefs)
 
         r = RDPFile(width == -1 or height == -1, width, height, depth, target=os['OS'])
-        r.enablecredsspsupport = ci.get('sso', False)
+        r.enablecredsspsupport = ci.get('sso', self.credssp.isTrue())
         r.address = '{}:{}'.format(ip, 3389)
         r.username = username
         r.password = password

server/src/uds/transports/RDP/TRDPTransport.py

@@ -48,7 +48,7 @@ import logging
 import random
 import string
 
-__updated__ = '2017-03-17'
+__updated__ = '2017-03-20'
 
 
 logger = logging.getLogger(__name__)
@@ -87,6 +87,7 @@ class TRDPTransport(BaseRDPTransport):
     multimon = BaseRDPTransport.multimon
     aero = BaseRDPTransport.aero
     smooth = BaseRDPTransport.smooth
+    credssp = BaseRDPTransport.credssp
     multimedia = BaseRDPTransport.multimedia
     alsa = BaseRDPTransport.alsa
     printerString = BaseRDPTransport.printerString
@@ -115,7 +116,7 @@ class TRDPTransport(BaseRDPTransport):
         logger.debug('Username generated: {0}, password: {1}'.format(tunuser, tunpass))
 
         r = RDPFile(width == -1 or height == -1, width, height, depth, target=os['OS'])
-        r.enablecredsspsupport = ci.get('sso', False)
+        r.enablecredsspsupport = ci.get('sso', self.credssp.isTrue())
         r.address = '{address}'
         r.username = username
         r.password = password