Added HTML5 RDP connector (and it works!!) using guacamole as tunneler

server/.settings/org.eclipse.core.resources.prefs

@@ -169,7 +169,8 @@ encoding//src/uds/services/Vmware_enterprise/client/Exceptions.py=utf-8
 encoding//src/uds/services/Vmware_enterprise/client/Server.py=utf-8
 encoding//src/uds/services/Vmware_enterprise/client/Task.py=utf-8
 encoding//src/uds/services/__init__.py=utf-8
-encoding//src/uds/tests.py=utf-8
+encoding//src/uds/transports/HTML5RDP/HTML5RDP.py=utf-8
+encoding//src/uds/transports/HTML5RDP/__init__.py=utf-8
 encoding//src/uds/transports/NX/NXTransport.py=utf-8
 encoding//src/uds/transports/NX/__init__.py=utf-8
 encoding//src/uds/transports/NX/web.py=utf-8

server/src/uds/dispatchers/guacamole/views.py

@@ -31,19 +31,35 @@
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
 
-from django.http import HttpResponseNotAllowed, HttpResponse
+from django.http import HttpResponse
 from uds.core.util.Cache import Cache
 import logging
 
 logger = logging.getLogger(__name__)
 
+ERROR = "ERROR"
+CONTENT_TYPE = 'text/plain'
+
 # We will use the cache to "hold" the tickets valid for users
 
+def dict2resp(dct):
+    return '\r'.join(( k + '\t' + v  for k, v in dct.iteritems()))
+
 def guacamole(request, tunnelId):
     logger.debug('Received credentials request for tunnel id {0}'.format(tunnelId))
     
-    cache = Cache("guacamole")
+    cache = Cache('guacamole')
     
-    response = 'protocol\trdp\rhostname\tw7adolfo\rusername\tadmin\rpassword\ttemporal'
+    val = cache.get(tunnelId, None)
     
-    return HttpResponse(response, content_type='text/plain')
+    if val is None:
+        return HttpResponse(ERROR, content_type=CONTENT_TYPE)
+    
+    # Remove key from cache, just 1 use
+    # Cache has a limit lifetime, so we will allow to "reload" the page  
+    # cache.remove(tunnelId) 
+    
+    #response = 'protocol\trdp\rhostname\tw7adolfo\rusername\tadmin\rpassword\ttemporal'
+    response = dict2resp(val)
+    
+    return HttpResponse(response, content_type=CONTENT_TYPE)

server/src/uds/transports/HTML5RDP/HTML5RDP.py

@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+
+#
+# Copyright (c) 2012 Virtual Cable S.L.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, 
+# are permitted provided that the following conditions are met:
+#
+#    * Redistributions of source code must retain the above copyright notice, 
+#      this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above copyright notice, 
+#      this list of conditions and the following disclaimer in the documentation 
+#      and/or other materials provided with the distribution.
+#    * Neither the name of Virtual Cable S.L. nor the names of its contributors 
+#      may be used to endorse or promote products derived from this software 
+#      without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+'''
+@author: Adolfo Gómez, dkmaster at dkmon dot com
+'''
+
+from django.utils.translation import ugettext_noop as _
+from uds.core.ui.UserInterface import gui
+from uds.core.util.Cache import Cache
+from uds.core.transports.BaseTransport import Transport
+from uds.core.util import connection
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+READY_CACHE_TIMEOUT = 30
+
+class HTML5RDPTransport(Transport):
+    '''
+    Provides access via RDP to service.
+    This transport can use an domain. If username processed by authenticator contains '@', it will split it and left-@-part will be username, and right password
+    '''
+    typeName = _('HTML5 RDP Transport')
+    typeType = 'HTML5RDPTransport'
+    typeDescription = _('RDP Transport using HTML5 client')
+    iconFile = 'rdp.png' 
+    needsJava = False  # If this transport needs java for rendering
+
+    guacamoleServer = gui.TextField(label=_('Tunnel Server'), order = 1, tooltip = _('Host of the tunnel server (use http/http & port if needed)'), defvalue = 'https://')
+    useEmptyCreds = gui.CheckBoxField(label = _('Empty creds'), order = 2, tooltip = _('If checked, the credentials used to connect will be emtpy'))
+    fixedName = gui.TextField(label=_('Username'), order = 3, tooltip = _('If not empty, this username will be always used as credential'))
+    fixedPassword = gui.PasswordField(label=_('Password'), order = 4, tooltip = _('If not empty, this password will be always used as credential'))
+    fixedDomain = gui.TextField(label=_('Domain'), order = 5, tooltip = _('If not empty, this domain will be always used as credential (used as DOMAIN\\user)'))
+
+    def initialize(self, values):
+        if values is None:
+            return
+        a = ''
+        if self.guacamoleServer.value[0:4] != 'http':
+            raise Transport.ValidationException(_('The server must be http or https'))
+
+    # Same check as normal RDP transport
+    def isAvailableFor(self, ip):
+        '''
+        Checks if the transport is available for the requested destination ip
+        Override this in yours transports
+        '''
+        logger.debug('Checking availability for {0}'.format(ip))
+        ready = self.cache().get(ip)
+        if ready is None:
+            # Check again for readyness
+            if connection.testServer(ip, '3389') == True:
+                self.cache().put(ip, 'Y', READY_CACHE_TIMEOUT)
+                return True
+            else:
+                self.cache().put(ip, 'N', READY_CACHE_TIMEOUT)
+        return ready == 'Y'
+    
+    def renderForHtml(self,  userService, idUserService, idTransport, ip, os, user, password):
+        # We use helper to keep this clean
+        import uuid
+        
+        username = user.getUsernameForAuth()
+        
+        domain = ''
+        if username.find('@') != -1:
+            domain = username[username.find('@')+1:]
+        elif username.find('\\') != -1:
+            domain = username[:username.find('\\')]
+            
+        if self.fixedName.value is not '':
+            username = self.fixedName.value
+        if self.fixedPassword.value is not '':
+            password = self.fixedPassword.value
+        if self.fixedDomain.value is not '':
+            domain = self.fixedDomain.value
+        if self.useEmptyCreds.isTrue():
+            username, password, domain = '','',''
+            
+        # Fix username/password acording to os manager
+        username, password = userService.processUserPassword(username, password)
+            
+        if domain != '':
+            if domain.find('.') == -1:
+                username = domain + '\\' + username
+            else:
+                username = username + '@' + username
+                
+        # Build params dict
+        params = { 'protocol':'rdp', 'hostname':ip, 'username': username, 'password': password }
+        
+        logger.debug('RDP Params: {0}'.format(params))
+                
+        cache = Cache('guacamole')
+        key = uuid.uuid4().hex
+        cache.put(key, params)
+        
+        url = "{0}/transport/?{1}".format( self.guacamoleServer.value, key)
+        return '''
+        <script type="text/javascript">
+        $(document).ready(function() {{
+            var url = "{0}&" + window.location.protocol + "//" + window.location.host + "/";
+            window.location = url;
+        }})
+        </script>
+        <div id='html5href' />
+        '''.format(url) 
+

server/src/uds/transports/HTML5RDP/__init__.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+#
+# Copyright (c) 2012 Virtual Cable S.L.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, 
+# are permitted provided that the following conditions are met:
+#
+#    * Redistributions of source code must retain the above copyright notice, 
+#      this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above copyright notice, 
+#      this list of conditions and the following disclaimer in the documentation 
+#      and/or other materials provided with the distribution.
+#    * Neither the name of Virtual Cable S.L. nor the names of its contributors 
+#      may be used to endorse or promote products derived from this software 
+#      without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+'''
+@author: Adolfo Gómez, dkmaster at dkmon dot com
+'''
+
+from uds.core.managers.UserPrefsManager import UserPrefsManager, CommonPrefs
+from HTML5RDP import HTML5RDPTransport
+from django.utils.translation import ugettext_noop as _

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

@@ -31,13 +31,13 @@
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
 
-from uds.core.managers.UserPrefsManager import UserPrefsManager, CommonPrefs
-from uds.transports.RDP.RDPTransport import RDPTransport
-from uds.transports.RDP.TSRDPTransport import TSRDPTransport
 from django.utils.translation import ugettext_noop as _
+from uds.core.managers.UserPrefsManager import UserPrefsManager, CommonPrefs
+from RDPTransport import RDPTransport
+from TSRDPTransport import TSRDPTransport
 
 UserPrefsManager.manager().registerPrefs('rdp', _('Remote Desktop Protocol'), 
                                           [ 
                                            CommonPrefs.screenSizePref,
                                            CommonPrefs.depthPref
-                                        ])
+                                        ])

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

@@ -79,7 +79,7 @@ def generateHtmlForRdp(transport, idUserService, idTransport, os, ip, port, user
         data.append('tun:' + extra['tun'])
         
     data = scramble('\t'.join(data))
-    res = '<div idTransport="applet"><applet code="RdpApplet.class" codebase="%s" archive="%s" width="200" height="22"><param name="data" value="%s"/></applet></div>' % (codebase, '1', data )
+    res = '<div id="applet"><applet code="RdpApplet.class" codebase="%s" archive="%s" width="200" height="22"><param name="data" value="%s"/></applet></div>' % (codebase, '1', data )
     if isMac is True:
         res += ('<div><p>' + _('In order to use this service, you should first install CoRD.') + '</p>'
                 '<p>' + _('You can obtain it from') + ' <a href="http://cord.sourceforge.net/">' + _('CoRD Website') + '</a></p>'