From 72e49c348a3d88af9c152882354a867aac59db65 Mon Sep 17 00:00:00 2001 From: aschumann-virtualcable Date: Fri, 24 Jul 2026 14:54:34 +0200 Subject: [PATCH] Add new signature files for SPICE and X2GO transports - Introduced `tunnel.js.mldsa65.sig` for SPICE transport. - Introduced `direct.js.mldsa65.sig` and `tunnel.js.mldsa65.sig` for X2GO transport. Remove old .py files for transports --- .../RDPEmbedded/scripts/macosx/direct.py | 197 ---------------- .../RDPEmbedded/scripts/macosx/tunnel.py | 218 ------------------ .../transports/SPICE/scripts/linux/direct.py | 25 -- .../SPICE/scripts/linux/direct.py.signature | 1 - .../transports/SPICE/scripts/linux/tunnel.py | 56 ----- .../SPICE/scripts/linux/tunnel.py.signature | 1 - .../transports/SPICE/scripts/macosx/direct.py | 34 --- .../SPICE/scripts/macosx/direct.py.signature | 1 - .../transports/SPICE/scripts/macosx/tunnel.py | 60 ----- .../SPICE/scripts/macosx/tunnel.py.signature | 1 - .../scripts/windows/direct.js.mldsa65.sig | 1 + .../SPICE/scripts/windows/direct.py | 39 ---- .../SPICE/scripts/windows/direct.py.signature | 1 - .../scripts/windows/tunnel.js.mldsa65.sig | 1 + .../SPICE/scripts/windows/tunnel.py | 63 ----- .../SPICE/scripts/windows/tunnel.py.signature | 1 - .../transports/X2GO/scripts/linux/direct.py | 37 --- .../X2GO/scripts/linux/direct.py.signature | 1 - .../transports/X2GO/scripts/linux/tunnel.py | 46 ---- .../X2GO/scripts/linux/tunnel.py.signature | 1 - .../scripts/windows/direct.js.mldsa65.sig | 1 + .../transports/X2GO/scripts/windows/direct.py | 40 ---- .../X2GO/scripts/windows/direct.py.signature | 1 - .../scripts/windows/tunnel.js.mldsa65.sig | 1 + .../transports/X2GO/scripts/windows/tunnel.py | 47 ---- .../X2GO/scripts/windows/tunnel.py.signature | 1 - 26 files changed, 4 insertions(+), 872 deletions(-) delete mode 100644 src/uds/transports/RDPEmbedded/scripts/macosx/direct.py delete mode 100644 src/uds/transports/RDPEmbedded/scripts/macosx/tunnel.py delete mode 100644 src/uds/transports/SPICE/scripts/linux/direct.py delete mode 100644 src/uds/transports/SPICE/scripts/linux/direct.py.signature delete mode 100644 src/uds/transports/SPICE/scripts/linux/tunnel.py delete mode 100644 src/uds/transports/SPICE/scripts/linux/tunnel.py.signature delete mode 100644 src/uds/transports/SPICE/scripts/macosx/direct.py delete mode 100644 src/uds/transports/SPICE/scripts/macosx/direct.py.signature delete mode 100644 src/uds/transports/SPICE/scripts/macosx/tunnel.py delete mode 100644 src/uds/transports/SPICE/scripts/macosx/tunnel.py.signature create mode 100644 src/uds/transports/SPICE/scripts/windows/direct.js.mldsa65.sig delete mode 100644 src/uds/transports/SPICE/scripts/windows/direct.py delete mode 100644 src/uds/transports/SPICE/scripts/windows/direct.py.signature create mode 100644 src/uds/transports/SPICE/scripts/windows/tunnel.js.mldsa65.sig delete mode 100644 src/uds/transports/SPICE/scripts/windows/tunnel.py delete mode 100644 src/uds/transports/SPICE/scripts/windows/tunnel.py.signature delete mode 100644 src/uds/transports/X2GO/scripts/linux/direct.py delete mode 100644 src/uds/transports/X2GO/scripts/linux/direct.py.signature delete mode 100644 src/uds/transports/X2GO/scripts/linux/tunnel.py delete mode 100644 src/uds/transports/X2GO/scripts/linux/tunnel.py.signature create mode 100644 src/uds/transports/X2GO/scripts/windows/direct.js.mldsa65.sig delete mode 100644 src/uds/transports/X2GO/scripts/windows/direct.py delete mode 100644 src/uds/transports/X2GO/scripts/windows/direct.py.signature create mode 100644 src/uds/transports/X2GO/scripts/windows/tunnel.js.mldsa65.sig delete mode 100644 src/uds/transports/X2GO/scripts/windows/tunnel.py delete mode 100644 src/uds/transports/X2GO/scripts/windows/tunnel.py.signature diff --git a/src/uds/transports/RDPEmbedded/scripts/macosx/direct.py b/src/uds/transports/RDPEmbedded/scripts/macosx/direct.py deleted file mode 100644 index ac1b181ad..000000000 --- a/src/uds/transports/RDPEmbedded/scripts/macosx/direct.py +++ /dev/null @@ -1,197 +0,0 @@ -import typing -import shutil -import os -import os.path -import logging - -logger = logging.getLogger(__name__) - -# On older client versions, need importing globally to allow inner functions to work -import subprocess # type: ignore - -# Avoid type checking annoing errors -try: - from uds import tools # type: ignore -except ImportError: - tools: typing.Any = None - raise - -if 'sp' not in globals(): - # Inject local passed sp into globals for inner functions if not already there - globals()['sp'] = sp # type: ignore # pylint: disable=undefined-variable - - -def fix_resolution() -> typing.List[str]: - import re - import subprocess - - results = str( - subprocess.Popen( - ['system_profiler SPDisplaysDataType'], stdout=subprocess.PIPE, shell=True - ).communicate()[0] - ) - groups = re.search(r': \d* x \d*', results) - width, height = '1024', '768' # Safe default values - if groups: - res = groups.group(0).split(' ') - width, height = str(int(res[1]) - 4), str(int(int(res[3]) * 90 / 100)) # Width and Height - return list(map(lambda x: x.replace('#WIDTH#', width).replace('#HEIGHT#', height), sp['as_new_xfreerdp_params'])) # type: ignore - - -msrdc_list = [ - '/Applications/Microsoft Remote Desktop.app', - '/Applications/Microsoft Remote Desktop.localized/Microsoft Remote Desktop.app', - '/Applications/Windows App.app', - '/Applications/Windows App.localized/Windows App.app', -] - -thincast_list = [ - '/Applications/Thincast Remote Desktop Client.app', -] - -xfreerdp_list = [ - 'udsrdp', - 'xfreerdp', - 'xfreerdp3', - 'xfreerdp2', -] - - -executable = None -kind = '' - -# Check first thincast (better option right now, prefer it) -logger.debug('Searching for Thincast in: %s', thincast_list) -for thincast in thincast_list: - if os.path.isdir(thincast): - logger.debug('Thincast found: %s', thincast) - executable = thincast - kind = 'thincast' - break - -if not executable: - logger.debug('Searching for xfreerdp in: %s', xfreerdp_list) - found_xfreerdp = False - for xfreerdp_executable in xfreerdp_list: - xfreerdp = tools.findApp(xfreerdp_executable) # type: ignore - logger.debug('tools.findApp(%s) result: %s', xfreerdp_executable, xfreerdp) # type: ignore - if xfreerdp and os.path.isfile(xfreerdp): # type: ignore - logger.debug('xfreerdp found: %s', xfreerdp) # type: ignore - executable = xfreerdp # type: ignore - # Ensure that the kind is 'xfreerdp' and not 'xfreerdp3' or 'xfreerdp2' - kind = xfreerdp_executable.rstrip('3').rstrip('2') - break - if not found_xfreerdp: - logger.debug('Searching for MSRDC in: %s', msrdc_list) - for msrdc in msrdc_list: - if os.path.isdir(msrdc) and sp['as_file']: # type: ignore - executable = msrdc - kind = 'msrdc' - break - -if not executable: - logger.debug('No compatible executable found (Thincast, xfreerdp, MSRDC)') - msrd = msrd_li = '' - if sp['as_rdp_url']: # type: ignore - msrd = ', Microsoft Remote Desktop' - msrd_li = '

  • {} from Apple Store

    • '.format(msrd) - - raise Exception( - f'''

    xfreerdp{msrd} or thincast client not found

    -

    In order to connect to UDS RDP Sessions, you need to have a

    -

    - ''' - ) - -logger.debug('Using %s client of kind %s', executable, kind) # type: ignore - -if kind == 'msrdc': - theFile = sp['as_file'] # type: ignore - filename = tools.saveTempFile(theFile) # type: ignore - # Rename as .rdp, so open recognizes it - shutil.move(filename, filename + '.rdp') # type: ignore - - # tools.addTaskToWait(subprocess.Popen(['open', filename + '.rdp'])) - # Force MSRDP to be used with -a (thanks to Dani Torregrosa @danitorregrosa (https://github.com/danitorregrosa)) - tools.addTaskToWait( # type: ignore - subprocess.Popen( - [ - 'open', - '-a', - executable, - filename + '.rdp', - ] # type: ignore - ) - ) - tools.addFileToUnlink(filename + '.rdp') # type: ignore - - -if kind == 'thincast': - if sp['as_file']: # type: ignore - logger.debug('Opening Thincast with RDP file %s', sp['as_file']) # type: ignore - theFile = sp['as_file'] # type: ignore - filename = tools.saveTempFile(theFile) # type: ignore - - # add to file the password without encryption (Thincast will encrypt it) - filename_handle = open(filename, 'a') # type: ignore - if sp.get('password', ''): # type: ignore - filename_handle.write(f'password 51:b:{sp["password"]}\n') # type: ignore - filename_handle.close() - - # Rename as .rdp, so open recognizes it - shutil.move(filename, filename + '.rdp') # type: ignore - params = [ # type: ignore - 'open', - '-a', - executable, - filename + '.rdp', # type: ignore - ] - logger.debug('Opening Thincast with RDP file with params: %s', ' '.join(params)) # type: ignore - tools.addTaskToWait( # type: ignore - subprocess.Popen(params) # type: ignore - ) - tools.addFileToUnlink(filename + '.rdp') # type: ignore - else: - logger.debug('Opening Thincast with xfreerdp parameters') - # Fix resolution... - try: - xfparms = fix_resolution() - except Exception as e: - xfparms = list(map(lambda x: x.replace('#WIDTH#', '1400').replace('#HEIGHT#', '800'), sp['as_new_xfreerdp_params'])) # type: ignore - - params = [ # type: ignore - 'open', - '-a', - executable, - '--args', - ] + [os.path.expandvars(i) for i in xfparms + ['/v:{}'.format(sp['address'])]] # type: ignore - #logger.debug('Executing: %s', ' '.join(params)) - subprocess.Popen(params) # type: ignore -else: # for now, both xfreerdp or udsrdp - # Fix resolution... - try: - xfparms = fix_resolution() - except Exception as e: - xfparms = list(map(lambda x: x.replace('#WIDTH#', '1400').replace('#HEIGHT#', '800'), sp['as_new_xfreerdp_params'])) # type: ignore - - params = [os.path.expandvars(i) for i in [executable] + xfparms + ['/v:{}'.format(sp['address'])]] # type: ignore - logger.debug('Executing: %s', ' '.join(params)) # type: ignore - subprocess.Popen(params) # type: ignore diff --git a/src/uds/transports/RDPEmbedded/scripts/macosx/tunnel.py b/src/uds/transports/RDPEmbedded/scripts/macosx/tunnel.py deleted file mode 100644 index a3c317a3e..000000000 --- a/src/uds/transports/RDPEmbedded/scripts/macosx/tunnel.py +++ /dev/null @@ -1,218 +0,0 @@ -# pylint: disable=import-error, no-name-in-module, too-many-format-args, undefined-variable, invalid-sequence-index -import typing -import shutil -import os -import os.path -import logging - -logger = logging.getLogger(__name__) - -# On older client versions, need importing globally to allow inner functions to work -import subprocess # type: ignore - -# Avoid type checking annoing errors -try: - from uds.tunnel import forward # type: ignore -except ImportError: - forward: typing.Any = None - raise - -try: - from uds import tools # type: ignore -except ImportError: - tools: typing.Any = None - raise - -if 'sp' not in globals(): - # Inject local passed sp into globals for inner functions if not already there - globals()['sp'] = sp # type: ignore # pylint: disable=undefined-variable - - -def fix_resolution() -> typing.List[str]: - import re - import subprocess - - results = str( - subprocess.Popen( - ['system_profiler SPDisplaysDataType'], stdout=subprocess.PIPE, shell=True - ).communicate()[0] - ) - groups = re.search(r': \d* x \d*', results) - width, height = '1024', '768' # Safe default values - if groups: - res = groups.group(0).split(' ') - width, height = str(int(res[1]) - 4), str(int(int(res[3]) * 90 / 100)) # Width and Height - return list(map(lambda x: x.replace('#WIDTH#', width).replace('#HEIGHT#', height), sp['as_new_xfreerdp_params'])) # type: ignore - - -msrdc_list = [ - '/Applications/Microsoft Remote Desktop.app', - '/Applications/Microsoft Remote Desktop.localized/Microsoft Remote Desktop.app', - '/Applications/Windows App.app', - '/Applications/Windows App.localized/Windows App.app', -] - -thincast_list = [ - '/Applications/Thincast Remote Desktop Client.app', -] - -xfreerdp_list = [ - 'udsrdp', - 'xfreerdp', - 'xfreerdp3', - 'xfreerdp2', -] - - -executable = None -kind = '' - -# Check first thincast (better option right now, prefer it) -logger.debug('Searching for Thincast in: %s', thincast_list) -for thincast in thincast_list: - if os.path.isdir(thincast): - executable = thincast - kind = 'thincast' - logger.debug('Found Thincast client at %s', thincast) - break - -if not executable: - logger.debug('Searching for xfreerdp in: %s', xfreerdp_list) - for xfreerdp_executable in xfreerdp_list: - xfreerdp: str = tools.findApp(xfreerdp_executable) # type: ignore - if xfreerdp and os.path.isfile(xfreerdp): # type: ignore - executable = xfreerdp # type: ignore - # Ensure that the kind is 'xfreerdp' and not 'xfreerdp3' or 'xfreerdp2' - kind = xfreerdp_executable.rstrip('3').rstrip('2') - logger.debug('Found xfreerdp client: %s (kind: %s)', xfreerdp, kind) # type: ignore - break - else: - logger.debug('Searching for Microsoft Remote Desktop in: %s', msrdc_list) - for msrdc in msrdc_list: - if os.path.isdir(msrdc) and sp['as_file']: # type: ignore - executable = msrdc - kind = 'msrdc' - logger.debug('Found Microsoft Remote Desktop client at %s', msrdc) - break - -if not executable: - msrd = msrd_li = '' - if sp['as_rdp_url']: # type: ignore - msrd = ', Microsoft Remote Desktop' - msrd_li = '

  • {} from Apple Store

    • '.format(msrd) - logger.debug('as_rdp_url is set, will suggest Microsoft Remote Desktop') - - raise Exception( - f'''

    xfreerdp{msrd} or thincast client not found

    -

    In order to connect to UDS RDP Sessions, you need to have a

    -

    - ''' - ) - -# Open tunnel -fs = forward(remote=(sp['tunHost'], int(sp['tunPort'])), ticket=sp['ticket'], timeout=sp['tunWait'], check_certificate=sp['tunChk']) # type: ignore -address = '127.0.0.1:{}'.format(fs.server_address[1]) # type: ignore - -# Check that tunnel works.. -if fs.check() is False: # type: ignore - logger.debug('Tunnel check failed, could not connect to tunnel server') - raise Exception('

    Could not connect to tunnel server.

    Please, check your network settings.

    ') -else: - logger.debug('Tunnel check succeeded, connection to tunnel server established') - -logger.debug('Using %s client of kind %s', executable, kind) # type: ignore - -if kind == 'msrdc': - theFile = theFile = sp['as_file'].format(address=address) # type: ignore - - filename = tools.saveTempFile(theFile) # type: ignore - # Rename as .rdp, so open recognizes it - shutil.move(filename, filename + '.rdp') # type: ignore - - # tools.addTaskToWait(subprocess.Popen(['open', filename + '.rdp'])) - # Force MSRDP to be used with -a (thanks to Dani Torregrosa @danitorregrosa (https://github.com/danitorregrosa) ) - tools.addTaskToWait( # type: ignore - subprocess.Popen( - [ - 'open', - '-a', - executable, - filename + '.rdp', - ] # type: ignore - ) - ) - tools.addFileToUnlink(filename + '.rdp') # type: ignore - -if kind == 'thincast': - if sp['as_file']: # type: ignore - logger.debug('Opening Thincast with RDP file %s', sp['as_file']) # type: ignore - theFile = sp['as_file'] # type: ignore - theFile = theFile.format( # type: ignore - address='{}'.format(address) - ) - filename = tools.saveTempFile(theFile) # type: ignore - - # filename_handle = open(filename, 'a') # type: ignore - # if sp.get('password', ''): # type: ignore - # filename_handle.write(f'password 51:b:{sp["password"]}\n') # type: ignore - # filename_handle.close() - - # Rename as .rdp, so open recognizes it - shutil.move(filename, filename + '.rdp') # type: ignore - # show filename content in log for debug - with open(filename + '.rdp', 'r') as f: # type: ignore - logger.debug('RDP file content:\n%s', f.read()) # type: ignore - params = [ # type: ignore - 'open', - '-a', - executable, - filename + '.rdp', # type: ignore - ] - logger.debug('Opening Thincast with RDP file with params: %s', ' '.join(params)) # type: ignore - tools.addTaskToWait( # type: ignore - subprocess.Popen(params) # type: ignore - ) - tools.addFileToUnlink(filename + '.rdp') # type: ignore - else: - logger.debug('Opening Thincast with xfreerdp parameters') - # Fix resolution... - try: - xfparms = fix_resolution() - except Exception as e: - xfparms = list(map(lambda x: x.replace('#WIDTH#', '1400').replace('#HEIGHT#', '800'), sp['as_new_xfreerdp_params'])) # type: ignore - - params = [ # type: ignore - 'open', - '-a', - executable, - '--args', - ] + [os.path.expandvars(i) for i in xfparms + ['/v:{}'.format(address)]] # type: ignore - #logger.debug('Executing: %s', ' '.join(params)) - subprocess.Popen(params) # type: ignore -else: # freerdp or udsrdp - # Fix resolution... - try: - xfparms = fix_resolution() - except Exception as e: - xfparms = list(map(lambda x: x.replace('#WIDTH#', '1400').replace('#HEIGHT#', '800'), sp['as_new_xfreerdp_params'])) # type: ignore - - params = [os.path.expandvars(i) for i in [executable] + xfparms + ['/v:{}'.format(address)]] # type: ignore - subprocess.Popen(params) # type: ignore diff --git a/src/uds/transports/SPICE/scripts/linux/direct.py b/src/uds/transports/SPICE/scripts/linux/direct.py deleted file mode 100644 index 62e527329..000000000 --- a/src/uds/transports/SPICE/scripts/linux/direct.py +++ /dev/null @@ -1,25 +0,0 @@ -# This is a template -# Saved as .py for easier editing -from __future__ import unicode_literals - -# pylint: disable=import-error, no-name-in-module -import subprocess - -from uds import tools # type: ignore - -executable = tools.findApp('remote-viewer') - -if executable is None: - raise Exception( - '''

    You need to have installed virt-viewer to connect to this UDS service.

    -

    - Please, install appropriate package for your Linux system. (probably named something like remote-viewer) -

    -''' - ) - -theFile = sp['as_file'] # type: ignore - -filename = tools.saveTempFile(theFile) - -subprocess.Popen([executable, filename]) diff --git a/src/uds/transports/SPICE/scripts/linux/direct.py.signature b/src/uds/transports/SPICE/scripts/linux/direct.py.signature deleted file mode 100644 index 8f3559dc4..000000000 --- a/src/uds/transports/SPICE/scripts/linux/direct.py.signature +++ /dev/null @@ -1 +0,0 @@ -EWgWLy06X2poBlYgqlJfEXA5X8gJlvgQ4Zy6fPxl/cAXLS+k7h6AMsDlfdA19Pa3nSOKyq/jPBqDV/ac7iJ9cATun65eYKj/r/lSshzKCaP76aAbvVLPwBFmPrQ0MEr5Y0SoIUh+5CQmsXumKNIzveOIij6E7x+AbRBbhvEh2EbtTi0G4iiuaFYLvLiikaXo+EpCY2qmURd2MxZ8Nz1ngJgsbymWXsBm7qyj+WRkjdK7hk+PeoV3fxqvcs0RoAKSPzXvFTIWCpOduowT2lX6tgmMdOlVmTzTMvwpggIbN2Ed5I9CKx56Ie4B3rzAayC+UA1xwy47HRLKd9GVbdocKWVYokrDmuSFCQzAIQ57/M8ewGDN63Cmx3yf7TJu0qx0nCWh4lePAZPZQJf3ADvBmEogrKT+mJ68qh40FK6vJikAvzjhSNDz2cz7M4AKKvupoR7WxiHXmS1XRa6G5UR4DTuht8Irw+SOBbphmxyavxCKjL+f8M7fyJUAbh/MtSD3P4/dGj6m3q0KW0zn2JkFbZoGrpbc1J0Pv3Qw9WtcK8f0Nb1j5CfYxY88syLo+oeTafefjevLgBVvWeup9IBcCtelCGDlvzu1qGEh9ofBXv5HVxC94i0JG9ufBfZqXeI2CAEwaqVxhP+eJX3QT0Trh3ZLQwqa+Ss0mrvGEtfOEk0= \ No newline at end of file diff --git a/src/uds/transports/SPICE/scripts/linux/tunnel.py b/src/uds/transports/SPICE/scripts/linux/tunnel.py deleted file mode 100644 index 05133f562..000000000 --- a/src/uds/transports/SPICE/scripts/linux/tunnel.py +++ /dev/null @@ -1,56 +0,0 @@ -# This is a template -# Saved as .py for easier editing -from __future__ import unicode_literals - -# pylint: disable=import-error, no-name-in-module, undefined-variable -import subprocess - -from uds import tools # type: ignore -from uds.tunnel import forward # type: ignore - -executable = tools.findApp('remote-viewer') - -if executable is None: - raise Exception( - '''

    You need to have installed virt-viewer to connect to this UDS service.

    -

    - Please, install appropriate package for your system. -

    -

    - Please, install appropriate package for your Linux system. (probably named something like virt-viewer) -

    -''' - ) - - -theFile = sp['as_file_ns'] # type: ignore -fs = None -if sp['ticket']: # type: ignore - # Open tunnel - fs = forward(remote=(sp['tunHost'], int(sp['tunPort'])), ticket=sp['ticket'], timeout=sp['tunWait'], check_certificate=sp['tunChk']) # type: ignore - - # Check that tunnel works.. - if fs.check() is False: - raise Exception( - '

    Could not connect to tunnel server.

    Please, check your network settings.

    ' - ) - -fss = None -if sp['ticket_secure']: # type: ignore - # Open tunnel - theFile = sp['as_file'] - fss = forward(remote=(sp['tunHost'], int(sp['tunPort'])), ticket=sp['ticket_secure'], timeout=sp['tunWait'], check_certificate=sp['tunChk']) # type: ignore - - # Check that tunnel works.. - if fss.check() is False: - raise Exception( - '

    Could not connect to tunnel server 2.

    Please, check your network settings.

    ' - ) - -theFile = theFile.format( - secure_port='-1' if not fss else fss.server_address[1], - port='-1' if not fs else fs.server_address[1], -) - -filename = tools.saveTempFile(theFile) -subprocess.Popen([executable, filename]) diff --git a/src/uds/transports/SPICE/scripts/linux/tunnel.py.signature b/src/uds/transports/SPICE/scripts/linux/tunnel.py.signature deleted file mode 100644 index a02e6fd76..000000000 --- a/src/uds/transports/SPICE/scripts/linux/tunnel.py.signature +++ /dev/null @@ -1 +0,0 @@ -nIHuZ7FPPHZ6q7ITXxr+JKKVs38SDJiexURVymKXPIQmslDVOGcxRfrSu3RqujQ8MdtvJy7UOU90pBbOFANGo4hws5pY0ZndaVydzdrg3l8FBrbe+yGziFFXFfaby5xuRC2caCnngQZt5vv3jtL4dvIsaujaIIWw3Sqo8Oc23KguKwrGeIJhzbRmY3rJ+z0oHieJ8iDLhNKs725G8X4yo91IDQ73eFCGod9jwJwlGmYdk9hCvgvU1cuzESGzkHt3Fwzk6VGfDdRCJdxIP4CEgGgabBJiKKpsa6XnnLWuWPXFcut4uK7dmy17qOo8cgS2mlvo6ItT8IygSEyMciqs4ZnQ4dl5CUryvhxodmmiNTPvMgJQVVEMrOHZ7lVEYuWr3tD9uxyqBtD28ADDTLC84v5kWgXLXo9AdhQ5gZw/dChSTsitH95jbMLBDgeTmXNukboSkHjT1erfsohexEoPQQpFiQOS4mBxzbnF1/4vC7r8RyIOLg9XAlsRbGLF/sDx+5itLxgESJzjD+fx4o2dXuKfYmpsSCcf1ZZpA2a9x6hzNWg5WdVQG7FwdY/l8ySFZDzxb1IDZGW+1cpcYIzuYh3tQqmRQhInU0eszKL/Kj0/KvCqgseBfCtiSPntRrh0YsYfxJlBGfjBv9aKkTwfXV1x9oQV3pyw9DQoJGatVBo= \ No newline at end of file diff --git a/src/uds/transports/SPICE/scripts/macosx/direct.py b/src/uds/transports/SPICE/scripts/macosx/direct.py deleted file mode 100644 index b32d2ff6d..000000000 --- a/src/uds/transports/SPICE/scripts/macosx/direct.py +++ /dev/null @@ -1,34 +0,0 @@ -# This is a template -# Saved as .py for easier editing -from __future__ import unicode_literals - -# pylint: disable=import-error, no-name-in-module -import os -import subprocess - -from uds import tools # type: ignore - -remoteViewer = '/Applications/RemoteViewer.app/Contents/MacOS/RemoteViewer' - -if not os.path.isfile(remoteViewer): - raise Exception( - '''

    You need to have installed virt-viewer to connect to this UDS service.

    -

    - Please, install appropriate package for your system. -

    -

    - Open download page -

    -

    - Please, note that in order to UDS Connector to work correctly, you must copy the Remote Viewer app to your Applications Folder.
    - Also remember, that in order to allow this app to run on your system, you must open it one time once it is copied to your App folder -

    -''' - ) - - -theFile = sp['as_file'] # type: ignore - -filename = tools.saveTempFile(theFile) - -subprocess.Popen([remoteViewer, filename]) diff --git a/src/uds/transports/SPICE/scripts/macosx/direct.py.signature b/src/uds/transports/SPICE/scripts/macosx/direct.py.signature deleted file mode 100644 index 1e24352b2..000000000 --- a/src/uds/transports/SPICE/scripts/macosx/direct.py.signature +++ /dev/null @@ -1 +0,0 @@ -trUPaAK6GcQ3T21hk0Gmmz1cYCdX3NahxZgytM1Z0hp7TIksQOh6OkNFP03RSaT4DnbWJBaot3xPYk2bTzzYsQv10ZQwHA2GS1exlzAAfP9/oLBTji0xGOt5zXEWSD0gqeAMrjhRK8pxpaJZ3xUuvujPuh3sNeb/XqQdNlXUkFK5AFb16FgiU2cE2bNF7nF1Vbz6v2bL3g1vlBhCOzvTYBbBijaeZpdgMDjlXcPoweqzvB3La4RKVDDD8lD51UNp3jurqcZquhTWdZys431tvORtQTISzR3xy6/AlsQzcSSr7lKBwmcKbF6ajct/D2oulqrxaBrbYqlZRe3a+FowjDgHVDjd9n+56m7+p25JoA+blkwhsfW22QzTDPhnq6Lx72c43L4WzU+rVJ3s5Hm8GScDfCdNY25ooaoF1HXs10Qra9/w5E6asoTIEuzs0Op4PNdtSqJ6RN87YKIC2iHnDFeerTJIP8uvDx3zx/i99781KcKQb/goIjMrJEGSQUGPMLwLxkB24o2/DChflVbbq5//rb66Iu6ZETxeRoHPQIO+z3wNGdbRB8ZP5jHpkgbKEKgt48ubila1TtN0+Bl4ASyYmzc4eFnsJD8D6ojAghYyNL1dyYZ9G2eJEseztehs6kiU6DljezwNCfWN/jx38dDQ8wAPWMrstfxV8CkD2ko= \ No newline at end of file diff --git a/src/uds/transports/SPICE/scripts/macosx/tunnel.py b/src/uds/transports/SPICE/scripts/macosx/tunnel.py deleted file mode 100644 index 66e30b831..000000000 --- a/src/uds/transports/SPICE/scripts/macosx/tunnel.py +++ /dev/null @@ -1,60 +0,0 @@ -# This is a template -# Saved as .py for easier editing -from __future__ import unicode_literals - -# pylint: disable=import-error, no-name-in-module, undefined-variable -import os -import subprocess - -from uds import tools # type: ignore -from uds.tunnel import forward # type: ignore - -remoteViewer = '/Applications/RemoteViewer.app/Contents/MacOS/RemoteViewer' - -if not os.path.isfile(remoteViewer): - raise Exception( - '''

    You need to have installed virt-viewer to connect to this UDS service.

    -

    - Please, install appropriate package for your system. -

    -

    - Open download page -

    -

    - Please, note that in order to UDS Connector to work correctly, you must copy the Remote Viewer app to your Applications Folder.
    - Also remember, that in order to allow this app to run on your system, you must open it one time once it is copied to your App folder -

    -''' - ) - -theFile = sp['as_file_ns'] # type: ignore -fs = None -if sp['ticket']: # type: ignore - # Open tunnel - fs = forward(remote=(sp['tunHost'], int(sp['tunPort'])), ticket=sp['ticket'], timeout=sp['tunWait'], check_certificate=sp['tunChk']) # type: ignore - - # Check that tunnel works.. - if fs.check() is False: - raise Exception( - '

    Could not connect to tunnel server.

    Please, check your network settings.

    ' - ) - -fss = None -if sp['ticket_secure']: # type: ignore - # Open tunnel - theFile = sp['as_file'] - fss = forward(remote=(sp['tunHost'], int(sp['tunPort'])), ticket=sp['ticket_secure'], timeout=sp['tunWait'], check_certificate=sp['tunChk']) # type: ignore - - # Check that tunnel works.. - if fss.check() is False: - raise Exception( - '

    Could not connect to tunnel server 2.

    Please, check your network settings.

    ' - ) - -theFile = theFile.format( - secure_port='-1' if not fss else fss.server_address[1], - port='-1' if not fs else fs.server_address[1], -) - -filename = tools.saveTempFile(theFile) -subprocess.Popen([remoteViewer, filename]) diff --git a/src/uds/transports/SPICE/scripts/macosx/tunnel.py.signature b/src/uds/transports/SPICE/scripts/macosx/tunnel.py.signature deleted file mode 100644 index 0862cbc90..000000000 --- a/src/uds/transports/SPICE/scripts/macosx/tunnel.py.signature +++ /dev/null @@ -1 +0,0 @@ -BiMXqnn9XTSuqJcwc/TbnRK9WljlbwBQ3kBTnWVkco8sO5y+qeHgoobLu9OQ4qmWi2+YLLBzP+1j0UMFvMl0M+ErL+/rcKnflb2JXzvNlJSB9Ei9S0RmnyWTvyGoUBIUCz5hXuSry2FDw+PwTIQ3S5KnGBJxEB8rriIsKK6o/G9r6mmQ9P1929uud/kqpbyHyBktzONt/oV9N1e54ZACuSPDhkv3aLDe4PlbgPnIdtXNTXcr+gvDajuA8WBaCy2dp6SV43U5DK7IsWZuc1WOLZ6cxtS/RfsfsEJilrDQPJehK3Pg8paL+AIFC+cYju274zyZW4VGUJE3VE69IBoqEALYMgWGAhc7kTBQQ4IxOquMgoE6xljes3fEpVtK3g/YILDqn7tq7xOwR/1eZzac/0r/buHtDtCApYK7xFA0YcDrFGbwwuQ6OwnT4MpwCVaJ0wucjZWwaa4f4kq6kwvhZC1Vadvv6ysxl0bOG7+//GK+j0Fvq7AHmnhVFztz8w1SgBff+SZaFcz9OB22B9ioPPEPaomkWWsMb0g4diO4dAH8/mKfdI6j8ch4uHSY9SqnL1/TwNxEvYgaaarW4D0W6dQTwJ3BY2Z/Bfn6aTonDi5w8Qef2F0XDRHUW4DercLB5W9MboNEOva3hAYkuQC4YFGUF4rTr8wglNBTQAHFH5Q= \ No newline at end of file diff --git a/src/uds/transports/SPICE/scripts/windows/direct.js.mldsa65.sig b/src/uds/transports/SPICE/scripts/windows/direct.js.mldsa65.sig new file mode 100644 index 000000000..102e6b83d --- /dev/null +++ b/src/uds/transports/SPICE/scripts/windows/direct.js.mldsa65.sig @@ -0,0 +1 @@ +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 \ No newline at end of file diff --git a/src/uds/transports/SPICE/scripts/windows/direct.py b/src/uds/transports/SPICE/scripts/windows/direct.py deleted file mode 100644 index d0cabca49..000000000 --- a/src/uds/transports/SPICE/scripts/windows/direct.py +++ /dev/null @@ -1,39 +0,0 @@ -# This is a template -# Saved as .py for easier editing -from __future__ import unicode_literals - -# pylint: disable=import-error, no-name-in-module -import os -import glob -import subprocess - -from uds import tools # type: ignore - -# Lets find remote viewer -# There is a bug that when installed, the remote viewer (at least 64 bits version) does not store correctly its path, so lets find it "a las bravas" -executable = None - -for env in ('PROGRAMFILES', 'PROGRAMW6432'): - if env in os.environ: - for base_folder in glob.glob(os.environ[env] + '\\VirtViewer*'): - executable = tools.findApp('remote-viewer.exe', os.path.join(base_folder, 'bin')) - if executable is not None: - break - -if executable is None: - raise Exception( - '''

    You need to have installed virt-viewer to connect to this UDS service.

    -

    - Please, install appropriate package for your system. -

    -

    - Open download page -

    -''' - ) - -theFile = sp['as_file'] # type: ignore - -filename = tools.saveTempFile(theFile) - -subprocess.Popen([executable, filename]) diff --git a/src/uds/transports/SPICE/scripts/windows/direct.py.signature b/src/uds/transports/SPICE/scripts/windows/direct.py.signature deleted file mode 100644 index eb8646efe..000000000 --- a/src/uds/transports/SPICE/scripts/windows/direct.py.signature +++ /dev/null @@ -1 +0,0 @@ -cH1rujpb4TXrilcSsjLckNv8xDUILhuLl4Ree3LpGOYY9fmDnIYU3xX9TzJAGhIfBonUuwdG1/m/y89SgyfFihQp7YN2DIyIp0Rm9nzMo12u6efNPO4Ae8X9UweNedKie9E9giMEPTMRSglhkSyMbV9pRRh5gPu49+jNRRMbs7Yhsx9MVaJnfSXrCVMx13aZTr0tCEkvZqcex6DYd0TwVcWN5fZgB7haCUQ//FCFXIVxwj72EBtwcIqDeDi97JOLXmLQ3sQo6zNeB0KutQGagNhvYsfCdkUQZPJDK+UrvXBg1q7IjCFC5CuilFzxcDcetmzAWxG1kKotkFfOPhRYYyUvWdrRvVKbRFrfDeFhWOfWzqhQokvRBes52s4YoQygnAsnamkYr9r27SHDLKyz/6i2eI7LiTdCG3P/LaPZI9alxkgjTKfqXqyaEed+5tWNXrniffZH4liIK+YtGVI5DpdsXbxOiQF8TeJOTyG4kLPjstS1dvc7OeP59BwCohGBR1Ebcmj4cjh/H112zzfMs1C9UuN8Jg3E+BeSTGsqObMti51Z+/FL6UA4OYx0WitXigxBeRtYxC9PlmXXpt4V/Wv3j4/fnDK94q6VUtnMq/PL0kMt6XiIjE5vTjm1LhHNiC2xMABFSZ2tBE9up3uFFJ8z6mNTGlJEpfrUHSAGcFY= \ No newline at end of file diff --git a/src/uds/transports/SPICE/scripts/windows/tunnel.js.mldsa65.sig b/src/uds/transports/SPICE/scripts/windows/tunnel.js.mldsa65.sig new file mode 100644 index 000000000..82c3f22b1 --- /dev/null +++ b/src/uds/transports/SPICE/scripts/windows/tunnel.js.mldsa65.sig @@ -0,0 +1 @@ +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 \ No newline at end of file diff --git a/src/uds/transports/SPICE/scripts/windows/tunnel.py b/src/uds/transports/SPICE/scripts/windows/tunnel.py deleted file mode 100644 index affb8d22d..000000000 --- a/src/uds/transports/SPICE/scripts/windows/tunnel.py +++ /dev/null @@ -1,63 +0,0 @@ -# This is a template -# Saved as .py for easier editing -from __future__ import unicode_literals - -# pylint: disable=import-error, no-name-in-module, undefined-variable -import os -import glob -import subprocess - -from uds import tools # type: ignore -from uds.tunnel import forward # type: ignore - -# Lets find remote viewer -# There is a bug that when installed, the remote viewer (at least 64 bits version) does not store correctly its path, so lets find it "a las bravas" -executable = None -for env in ('PROGRAMFILES', 'PROGRAMW6432'): - if env in os.environ: - for base_folder in glob.glob(os.environ[env] + '\\VirtViewer*'): - executable = tools.findApp('remote-viewer.exe', os.path.join(base_folder, 'bin')) - if executable is not None: - break - -if executable is None: - raise Exception( - '''

    You need to have installed virt-viewer to connect to this UDS service.

    -

    - Please, install appropriate package for your system. -

    -

    - Open download page -

    -''' - ) -theFile = sp['as_file_ns'] # type: ignore -fs = None -if sp['ticket']: # type: ignore - # Open tunnel - fs = forward(remote=(sp['tunHost'], int(sp['tunPort'])), ticket=sp['ticket'], timeout=sp['tunWait'], check_certificate=sp['tunChk']) # type: ignore - - # Check that tunnel works.. - if fs.check() is False: - raise Exception('

    Could not connect to tunnel server.

    Please, check your network settings.

    ') - -fss = None -if sp['ticket_secure']: # type: ignore - theFile = sp['as_file'] - # Open tunnel - fss = forward(remote=(sp['tunHost'], int(sp['tunPort'])), ticket=sp['ticket_secure'], timeout=sp['tunWait'], check_certificate=sp['tunChk']) # type: ignore - - # Check that tunnel works.. - if fss.check() is False: - raise Exception( - '

    Could not connect to tunnel server 2.

    Please, check your network settings.

    ' - ) - -theFile = theFile.format( - secure_port='-1' if not fss else fss.server_address[1], - port='-1' if not fs else fs.server_address[1], -) - -filename = tools.saveTempFile(theFile) - -subprocess.Popen([executable, filename]) diff --git a/src/uds/transports/SPICE/scripts/windows/tunnel.py.signature b/src/uds/transports/SPICE/scripts/windows/tunnel.py.signature deleted file mode 100644 index 17caa35d9..000000000 --- a/src/uds/transports/SPICE/scripts/windows/tunnel.py.signature +++ /dev/null @@ -1 +0,0 @@ -WfChDg7NFGG1NjcvcVNA3I0TAiDG6IeRojb51w4K4iMYSUm540o2jHW2FpYD+tmcMQCmf788kw+2R5GHXMA37gXo1qHB1QlkXM0aCTJLp6UyZ8i8CcLsyWHrkjp2NzI24XQLNSYHAJn2zTfhCMd5Zyqw3gZmMTQKmkX+f+t2Oi0FGHwVhCp6ZVCRKLWKEFcc6b/uYFJ6IP9WaSXLg3ftOLw/e+GDzdYsrf9m2ytCBlXtm9XrtyhEszpIs+bseIUTbhKw2FDr2UoORezQPFN8pLZE/WoQ+A87tgfRaf0foc/LOm/Yo5Xkh5p7Q33eYY6jsGWiFWgYugQ3PzLHrK8agpZTYmHJymVUHItvZxGR2w1npIxAyzv6FM7aLhOSi+0nXLotCY01nRzBxCs46kmSapjKi2XpaRVskiM1dPdYJ8TUCKb9c2Gb7MUxVrXnWOgDBZZx5yQJaEKz5JXYlHwHb74xDleqwl93Vbv4KdKvYd/sBwK0uqdpojCzIIvNuwfpBqXrFWORGUnkrnIK0cCw2tA+oqBjMyFlIS6NhLLYfdqvsVPMV8CP3hRlmIX42EVi/f7XLHZQuOJcEhZuLg8RqwrSPX7b4sC/KLjOmXdMsUulwOFyVk39x5Ze6mNjDqxO7RNA4hZ3+6TlZnCbo5keZIEretOk+JwkWCZEbLFz5+I= \ No newline at end of file diff --git a/src/uds/transports/X2GO/scripts/linux/direct.py b/src/uds/transports/X2GO/scripts/linux/direct.py deleted file mode 100644 index 404d13419..000000000 --- a/src/uds/transports/X2GO/scripts/linux/direct.py +++ /dev/null @@ -1,37 +0,0 @@ -# This is a template -# Saved as .py for easier editing -from __future__ import unicode_literals - -# pylint: disable=import-error, no-name-in-module -import subprocess -from os.path import expanduser - -from uds import tools # type: ignore - -home = expanduser('~') + ':1;/media:1;' -keyFile = tools.saveTempFile(sp['key']) # type: ignore -theFile = sp['xf'].format(export=home, keyFile=keyFile.replace('\\', '/'), ip=sp['ip'], port=sp['port']) # type: ignore -filename = tools.saveTempFile(theFile) - -# HOME=[temporal folder, where we create a .x2goclient folder and a sessions inside] pyhoca-cli -P UDS/test-session - -executable = tools.findApp('x2goclient') -if executable is None: - raise Exception( - '''

    You must have installed latest X2GO Client in order to connect to this UDS service.

    -

    Please, install the required packages for your platform

    ''' - ) - -subprocess.Popen( - [ - executable, - '--session-conf={}'.format(filename), - '--session=UDS/connect', - '--close-disconnect', - '--hide', - '--no-menu', - '--add-to-known-hosts', - ] -) -# tools.addFileToUnlink(filename) -# tools.addFileToUnlink(keyFile) diff --git a/src/uds/transports/X2GO/scripts/linux/direct.py.signature b/src/uds/transports/X2GO/scripts/linux/direct.py.signature deleted file mode 100644 index d87fcdb11..000000000 --- a/src/uds/transports/X2GO/scripts/linux/direct.py.signature +++ /dev/null @@ -1 +0,0 @@ -tqZRxv0birRB+xfMibMGkSiRr7+vwwT06jRyu4I4BeNoRpQkG0yqPnIjbSvXaL5AzInpfuxpqfYG8QonmVoyYH7WZOS3jgMP3yO0yvLEeEE3JgWqmJ34/SvkvS3UZMHlVEg7aTL26OlR60zvd5ROHToKjaxywq8n1qaHjJVDIPJEWHDl18Bk1iNLfExm+S3vi5Dbo9jNagsmrwA3YgH9VQR6HBAAdZAPJpIudzIER1kb0xWwM4BIVjlYLK0LMtQixHUIWubdy5nEDRYK4seNHo+ZL31cMPoHj4YNfkKDsAwFLEDex6ks784AqzBlgQ2P4tmKdF83rq4WTYtRiH33MlzfWx10lCH4Jkea7XhuQqz/K5JAuCKgyae2ACGjb+0sqc06d0RJIFvM6Ojm1E6B9Wxuubku8FYoJHu8yyO6BpMTLl2n+Ex7MZ5RKmtix7kXWn7IU4LugIGezHjIj4icMjQsqOMzwgFAYBvU0ojj63E91q3TxApHTOj6HA2OknjP01icohzi6yqAnGa8UHzTmY1zq4HZVE+9+iiJBDo2QFbf2aATN8XECRxLqLZB/UT0kV7kN505NssHUAU1sCPc4ftDrkzjcbFAQJKVPNdBe58/bbhp8ERRkqbtEdc7OIBrXG1ltCpo7n8rxflxbd7+crlBWUtZ2e05w2Mck/vmt+k= \ No newline at end of file diff --git a/src/uds/transports/X2GO/scripts/linux/tunnel.py b/src/uds/transports/X2GO/scripts/linux/tunnel.py deleted file mode 100644 index 4c348461e..000000000 --- a/src/uds/transports/X2GO/scripts/linux/tunnel.py +++ /dev/null @@ -1,46 +0,0 @@ -# This is a template -# Saved as .py for easier editing -from __future__ import unicode_literals - -# pylint: disable=import-error, no-name-in-module, too-many-format-args, undefined-variable - -import subprocess -from uds.tunnel import forward # type: ignore -from os.path import expanduser - -from uds import tools # type: ignore - -# Open tunnel -fs = forward(remote=(sp['tunHost'], int(sp['tunPort'])), ticket=sp['ticket'], timeout=sp['tunWait'], check_certificate=sp['tunChk']) # type: ignore - -# Check that tunnel works.. -if fs.check() is False: - raise Exception( - '

    Could not connect to tunnel server.

    Please, check your network settings.

    ' - ) - -home = expanduser('~') + ':1;/media:1;' -keyFile = tools.saveTempFile(sp['key']) # type: ignore -theFile = sp['xf'].format(export=home, keyFile=keyFile.replace('\\', '/'), ip='127.0.0.1', port=fs.server_address[1]) # type: ignore -filename = tools.saveTempFile(theFile) - -# HOME=[temporal folder, where we create a .x2goclient folder and a sessions inside] pyhoca-cli -P UDS/test-session - -executable = tools.findApp('x2goclient') -if executable is None: - raise Exception( - '''

    You must have installed latest X2GO Client in order to connect to this UDS service.

    -

    Please, install the required packages for your platform

    ''' - ) - -subprocess.Popen( - [ - executable, - '--session-conf={}'.format(filename), - '--session=UDS/connect', - '--close-disconnect', - '--hide', - '--no-menu', - '--add-to-known-hosts', - ] -) diff --git a/src/uds/transports/X2GO/scripts/linux/tunnel.py.signature b/src/uds/transports/X2GO/scripts/linux/tunnel.py.signature deleted file mode 100644 index 87bc721bd..000000000 --- a/src/uds/transports/X2GO/scripts/linux/tunnel.py.signature +++ /dev/null @@ -1 +0,0 @@ -KpAeVl463qecqFKpx1QBYS6IaiTAvoIeegqobxXiCfTbng3A/OG3OMLQIOOkE+H+O4knQ02DiuUgENQYveCa8F0axL6UDjQNaCGaLWBV/FmTifPDGJ9//Usu336qPC4Lp8vkclqjiZBN5FzCpEgvkxUCh97G2yD81sEWEfpqtrG35IlDMtNFNCoshRx+u+PGl7VOWHt0uJo6j536EBOYWQrPoobHv0WXQlhFEMQKvpJ2FsLWpULlzDmF9CgwtCEUZWxG+VMPmA2VprMTduodxAMY3xApQIelsjP8I0WhDkmZfxP+eKDVGofwqHb2rNzjkBMktOkROCT2SW2jMtU2wu4/vrXDP0aRUuB5O07eVAEAW40VQQh7oYOgxhbuRlLtGdEo06pLlye5Na9oiVzTuXWaquPDJWxW6me0CtR2jmpXnfifHitVqvOtwCpkceJg6tArZ8Z58vZSIvGBewrZ4gKh9yjorJWIM3QhHf3XcIZr2Zpv9MiUnvDMl+Sq4b/d3eyzZVi9Zpi7ErVQCOmFNoJcKvRYIzunAWoa2d9rBb2GJqr3mmjglG7hbNYYdE2utUYuaoUfKp/pKfH91iNY8CwtFTeGadKGWNTHvl8KNRRsHLP/mvIaNC8K2WcpZoai4PqkESWh1n6HQ6I13cyzNAJ/XCnOoZRTmIc89j9Zm1w= \ No newline at end of file diff --git a/src/uds/transports/X2GO/scripts/windows/direct.js.mldsa65.sig b/src/uds/transports/X2GO/scripts/windows/direct.js.mldsa65.sig new file mode 100644 index 000000000..86f685113 --- /dev/null +++ b/src/uds/transports/X2GO/scripts/windows/direct.js.mldsa65.sig @@ -0,0 +1 @@ +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 \ No newline at end of file diff --git a/src/uds/transports/X2GO/scripts/windows/direct.py b/src/uds/transports/X2GO/scripts/windows/direct.py deleted file mode 100644 index 71b638426..000000000 --- a/src/uds/transports/X2GO/scripts/windows/direct.py +++ /dev/null @@ -1,40 +0,0 @@ -# This is a template -# Saved as .py for easier editing -# from __future__ import unicode_literals - -# pylint: disable=import-error, no-name-in-module -import os -import subprocess -from os.path import expanduser - -from uds import tools # type: ignore - -home = expanduser('~').replace('\\', '\\\\') + '#1;' -keyFile = tools.saveTempFile(sp['key']) # type: ignore -# On windows, the separator beween active and not is "#" -theFile = sp['xf'].format(export='c:\\\\#1;', keyFile=keyFile.replace('\\', '/'), ip=sp['ip'], port=sp['port']) # type: ignore -filename = tools.saveTempFile(theFile) - -x2goPath = os.environ['PROGRAMFILES(X86)'] + '\\x2goclient' -executable = tools.findApp('x2goclient.exe', [x2goPath]) -if executable is None: - raise Exception( - '''

    You must have installed latest X2GO Client in order to connect to this UDS service.

    -

    You can download it for windows from X2Go Site.

    ''' - ) - -# C:\Program Files (x86)\\x2goclient>x2goclient.exe --session-conf=c:/temp/sessions --session=UDS/test-session --close-disconnect --hide --no-menu - -subprocess.Popen( - [ - executable, - '--session-conf={}'.format(filename), - '--session=UDS/connect', - '--close-disconnect', - '--hide', - '--no-menu', - '--add-to-known-hosts', - ] -) -# tools.addFileToUnlink(filename) -# tools.addFileToUnlink(keyFile) diff --git a/src/uds/transports/X2GO/scripts/windows/direct.py.signature b/src/uds/transports/X2GO/scripts/windows/direct.py.signature deleted file mode 100644 index 2f7592556..000000000 --- a/src/uds/transports/X2GO/scripts/windows/direct.py.signature +++ /dev/null @@ -1 +0,0 @@ -H59VyMECZ9TYWFgEH3X/wDEM4YLvFwSfPbebnbd96SUeDg5L2bpX7lvf7POcanMrsi4qBjXbF3PehRSshyFcFvT9F1BE9pTUR8VXexHmRiLR41PUERramjmkAWIenMZ/16nSIGlYMBFTaMR4U3M3eAp51Jx2OCi2oJiMiqOZ1MVCH0KaMjprnKWZ+sbrp2KhlWanKFKMKsDk98b0Aus9CaYiX3esdY/NQAif2TOqUrAk335pwUwo24iNrvLlSj3+bL7OrznmuVXq3mtA8oUTsrR2DzwVX/39dFAxidrjS+C8gKwerB+nGS2UbB2BIXVB7LRLbI0hR5qG4v8TYcJff4h+0IEy3CXpLZiSchF+iwtaksyVdxPzDOxmGEHn6qAiuJxWvSBwftuqyMnEfH6b417Yawidj+1iUy0zABmmiMmsh/XgJTq5uf6Ilsk3QvDM9PNG8pnkmARxb6KOm1fJ861E8q9SMpF0WGlA5xYUlLI5BR5jGYHSah/EQkZOqQkJ7SiOufnlHt8uPbrT8R1I/YwkK9VfyA0/qsC4zwslPKCrRB0bfLVMLolCKVSI0RYAt+XcoZIOsRvM1nsjEC4BfvSaCR1NqsLXIKxrDD3DOCPZ0Lsd9vcJJROohlA1V+3FBj3gH2ueCyFk90O9ZiGVSWxL4ODT4J0VfyYFwzp2MbE= \ No newline at end of file diff --git a/src/uds/transports/X2GO/scripts/windows/tunnel.js.mldsa65.sig b/src/uds/transports/X2GO/scripts/windows/tunnel.js.mldsa65.sig new file mode 100644 index 000000000..163ab431b --- /dev/null +++ b/src/uds/transports/X2GO/scripts/windows/tunnel.js.mldsa65.sig @@ -0,0 +1 @@ +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 \ No newline at end of file diff --git a/src/uds/transports/X2GO/scripts/windows/tunnel.py b/src/uds/transports/X2GO/scripts/windows/tunnel.py deleted file mode 100644 index 0b5675795..000000000 --- a/src/uds/transports/X2GO/scripts/windows/tunnel.py +++ /dev/null @@ -1,47 +0,0 @@ -# This is a template -# Saved as .py for easier editing -# from __future__ import unicode_literals - -# pylint: disable=import-error, no-name-in-module, too-many-format-args, undefined-variable - -import os -import subprocess -from uds.tunnel import forward # type: ignore -from os.path import expanduser - -from uds import tools # type: ignore - -# Open tunnel -fs = forward(remote=(sp['tunHost'], int(sp['tunPort'])), ticket=sp['ticket'], timeout=sp['tunWait'], check_certificate=sp['tunChk']) # type: ignore - -# Check that tunnel works.. -if fs.check() is False: - raise Exception( - '

    Could not connect to tunnel server.

    Please, check your network settings.

    ' - ) - -# Care, expanduser is encoding using "mcbs", so treat it as bytes on python 2.7 -home = expanduser('~').replace('\\', '\\\\') + '#1;' -keyFile = tools.saveTempFile(sp['key']) # type: ignore -theFile = sp['xf'].format(export=home, keyFile=keyFile.replace('\\', '/'), ip='127.0.0.1', port=fs.server_address[1]) # type: ignore -filename = tools.saveTempFile(theFile) - -x2goPath = os.environ['PROGRAMFILES(X86)'] + '\\x2goclient' -executable = tools.findApp('x2goclient.exe', x2goPath) -if executable is None: - raise Exception( - '''

    You must have installed latest X2GO Client in default program file folder in order to connect to this UDS service.

    -

    You can download it for windows from X2Go Site.

    ''' - ) - -subprocess.Popen( - [ - executable, - '--session-conf={}'.format(filename), - '--session=UDS/connect', - '--close-disconnect', - '--hide', - '--no-menu', - '--add-to-known-hosts', - ] -) diff --git a/src/uds/transports/X2GO/scripts/windows/tunnel.py.signature b/src/uds/transports/X2GO/scripts/windows/tunnel.py.signature deleted file mode 100644 index 81a59305c..000000000 --- a/src/uds/transports/X2GO/scripts/windows/tunnel.py.signature +++ /dev/null @@ -1 +0,0 @@ -TpOuQbtplQOuMXpTtxaAQJwZJtoVTMtWruV9d8+d6HJnSd7Y7iLMWkqerP3+rQBOqT67YAI8fq8ZZsYSDNKCoYQwJXqp8d2S8K2LyW7ClnYZXlFzVvjW0+wgTVV4E3f5Y7xT5TGlQ7/mO/KPgEloTxC8KD/DOTRc6MBusSgc/nd1ssE946qznCvihTsWuM4KGTfhQ4q9BVIVaxcFRszmhPqjVT0iY8sF3Aqghx4hvbgZKglqF9o/1JemzffLn/pxyclIePFJTPZlIzecfYcQ7Gsa+BpLbryRr6LUmuZLhBZYTnRP0dCrwMjfnitVSspwo0MJX4bDa1rQNPsQZLylrzNqbjA/aCf60qLit58KA2i7Vb/BfE3lPtoXKKILDEzOFqZObfRDDNQpiP8xCyJVXb5f3oVYYtRbuk/Ld1pNtsmTsEw69kQ30pW5Mqw+Qy5/6Nf75dAm1/9/FJga1uVBhlgPG0qgSf96M1s8FlSUrC5gn9neJB3ThOBpJkDRqvER192dwVlwcSbGLzgEGdZLFZq4cskfdsJHdWQ5aTcbnEBPrWRbvKbM1c2iuXXkLiKAAcY1rFmPWZscWbj8HqjFHwDd4bUjKzUA2GZt0LbhLG0ujQAK49Xdx7rHR15RL9hFFRwH4gUKQj/zuHCNkNXcW4bMmL1ZYWQXVW/X8Tv+LtQ= \ No newline at end of file