burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

x2go transport fix

Browse Source
This commit is contained in:
Adolfo Gómez García 2017-09-27 08:07:43 +02:00
parent 06f5184ddd
commit c6cc1f2b43
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/uds/transports/X2GO/scripts/linux/direct.py
View File

@ -6,13 +6,15 @@ from __future__ import unicode_literals
from PyQt4 import QtCore, QtGui # @UnresolvedImport
import os
import subprocess
from os.path import expanduser
from uds import tools # @UnresolvedImport
import six
home = expanduser('~') + ':1;'
keyFile = tools.saveTempFile('''{m.key}''')
theFile = '''{m.xf}'''.format(export='/:1;', keyFile=keyFile.replace('\\', '/'), ip='{m.ip}', port='22')
theFile = '''{m.xf}'''.format(export=home, keyFile=keyFile.replace('\\', '/'), ip='{m.ip}', port='22')
filename = tools.saveTempFile(theFile)
# HOME=[temporal folder, where we create a .x2goclient folder and a sessions inside] pyhoca-cli -P UDS/test-session

4
server/src/uds/transports/X2GO/scripts/linux/tunnel.py
View File

@ -8,6 +8,7 @@ from PyQt4 import QtCore, QtGui # @UnresolvedImport
import os
import subprocess
from uds.forward import forward # @UnresolvedImport
from os.path import expanduser
from uds import tools # @UnresolvedImport
@ -20,8 +21,9 @@ if forwardThread.status == 2:
tools.addTaskToWait(forwardThread)
home = expanduser('~') + ':1;'
keyFile = tools.saveTempFile('''{m.key}''')
theFile = '''{m.xf}'''.format(export='/:1;', keyFile=keyFile.replace('\\', '/'), ip='127.0.0.1', port=port)
theFile = '''{m.xf}'''.format(export=home, keyFile=keyFile.replace('\\', '/'), ip='127.0.0.1', port=port)
filename = tools.saveTempFile(theFile)
# HOME=[temporal folder, where we create a .x2goclient folder and a sessions inside] pyhoca-cli -P UDS/test-session

5
server/src/uds/transports/X2GO/scripts/windows/direct.py
View File

@ -6,13 +6,16 @@ from __future__ import unicode_literals
from PyQt4 import QtCore, QtGui # @UnresolvedImport
import os
import subprocess
from os.path import expanduser
from uds import tools # @UnresolvedImport
import six
home = expanduser('~').replace('\\', '\\\\') + '#1;'
keyFile = tools.saveTempFile('''{m.key}''')
theFile = '''{m.xf}'''.format(export='c:\\:1;', keyFile=keyFile.replace('\\', '/'), ip='{m.ip}', port='22')
# On windows, the separator beween active and not is "#"
theFile = '''{m.xf}'''.format(export='c:\\\\#1;', keyFile=keyFile.replace('\\', '/'), ip='{m.ip}', port='22')
filename = tools.saveTempFile(theFile)
x2goPath = os.environ['PROGRAMFILES(X86)'] + '\\x2goclient'

4
server/src/uds/transports/X2GO/scripts/windows/tunnel.py
View File

@ -8,6 +8,7 @@ from PyQt4 import QtCore, QtGui # @UnresolvedImport
import os
import subprocess
from uds.forward import forward # @UnresolvedImport
from os.path import expanduser
from uds import tools # @UnresolvedImport
@ -20,8 +21,9 @@ if forwardThread.status == 2:
tools.addTaskToWait(forwardThread)
home = expanduser('~').replace('\\', '\\\\') + '#1;'
keyFile = tools.saveTempFile('''{m.key}''')
theFile = '''{m.xf}'''.format(export='c:\\:1;', keyFile=keyFile.replace('\\', '/'), ip='127.0.0.1', port=port)
theFile = '''{m.xf}'''.format(export=home, keyFile=keyFile.replace('\\', '/'), ip='127.0.0.1', port=port)
filename = tools.saveTempFile(theFile)
x2goPath = os.environ['PROGRAMFILES(X86)'] + '\\x2goclient'