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

added missing dep on debian 3.0 client

Browse Source
This commit is contained in:
Adolfo Gómez García 2020-04-14 09:51:23 +02:00
parent d7e30d149c
commit 25d36a64fa
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client-py3/full/linux/debian/control
View File

@ -10,6 +10,6 @@ Package: udsclient
Section: admin Section: admin
Priority: optional Priority: optional
Architecture: all Architecture: all
Depends: python-paramiko (>=0.8.2), python-qt4 (>=4.9), python-six(>=1.1), python (>=2.7), freerdp2-x11 | freerdp-x11, desktop-file-utils, ${misc:Depends} Depends: python-paramiko (>=0.8.2), python3-crypto, python-qt4 (>=4.9), python-six(>=1.1), python (>=2.7), freerdp2-x11 | freerdp-x11, desktop-file-utils, ${misc:Depends}
Description: Client connector for Universal Desktop Services (UDS) Broker Description: Client connector for Universal Desktop Services (UDS) Broker
This package provides the required components to allow this machine to connect to services provided by UDS Broker. This package provides the required components to allow this machine to connect to services provided by UDS Broker.

2
client/full/linux/debian/control
View File

@ -10,6 +10,6 @@ Package: udsclient
Section: admin Section: admin
Priority: optional Priority: optional
Architecture: all Architecture: all
Depends: python-paramiko (>=0.8.2), python-qt4 (>=4.9), python-six(>=1.1), python (>=2.7), freerdp2-x11 | freerdp-x11, desktop-file-utils, ${misc:Depends} Depends: python-paramiko (>=0.8.2), python-crypto, python-qt4 (>=4.9), python-six(>=1.1), python (>=2.7), freerdp2-x11 | freerdp-x11, desktop-file-utils, ${misc:Depends}
Description: Client connector for Universal Desktop Services (UDS) Broker Description: Client connector for Universal Desktop Services (UDS) Broker
This package provides the required components to allow this machine to connect to services provided by UDS Broker. This package provides the required components to allow this machine to connect to services provided by UDS Broker.

2
client/full/src/UDSClient.py
View File

@ -110,7 +110,7 @@ class UDSClient(QtGui.QMainWindow):
self.stopAnim() self.stopAnim()
self.ui.info.setText('UDS Plugin Error') # In fact, main window is hidden, so this is not visible... :) self.ui.info.setText('UDS Plugin Error') # In fact, main window is hidden, so this is not visible... :)
self.closeWindow() self.closeWindow()
QtGui.QMessageBox.critical(None, 'UDS Plugin Error', '{}'.format(e), QtGui.QMessageBox.Ok) QtGui.QMessageBox.critical(None, 'UDS Plugin Error', '{}'.format(error), QtGui.QMessageBox.Ok)
self.withError = True self.withError = True
def cancelPushed(self): def cancelPushed(self):

2
server/src/uds/core/ui/user_interface.py
View File

@ -990,7 +990,7 @@ class UserInterface(metaclass=UserInterfaceType):
val = pickle.loads(v[1:]) val = pickle.loads(v[1:])
elif v and v[0] == 4: elif v and v[0] == 4:
logger.debug('Unpickling crypted') logger.debug('Unpickling crypted')
val = cryptoManager().AESDecrypt(v[1:], UDSB, True) val = cryptoManager().AESDecrypt(v[1:], UDSB, True).decode()
else: else:
val = v val = v
# Ensure "legacy bytes" values are loaded correctly as unicode # Ensure "legacy bytes" values are loaded correctly as unicode

6
server/src/uds/transports/RDP/scripts/linux/direct.py
View File

@ -12,19 +12,19 @@ from uds import tools
globals()['sp'] = sp # type: ignore # pylint: disable=undefined-variable globals()['sp'] = sp # type: ignore # pylint: disable=undefined-variable
def execUdsRdp(udsrdp): def execUdsRdp(udsrdp):
# import subprocess # @Reimport import subprocess # @Reimport
params = [udsrdp] + sp['as_new_xfreerdp_params'] + ['/v:{}'.format(sp['address'])] # @UndefinedVariable params = [udsrdp] + sp['as_new_xfreerdp_params'] + ['/v:{}'.format(sp['address'])] # @UndefinedVariable
tools.addTaskToWait(subprocess.Popen(params)) tools.addTaskToWait(subprocess.Popen(params))
def execNewXFreeRdp(xfreerdp): def execNewXFreeRdp(xfreerdp):
# import subprocess # @Reimport import subprocess # @Reimport
params = [xfreerdp] + sp['as_new_xfreerdp_params'] + ['/v:{}'.format(sp['address'])] # @UndefinedVariable params = [xfreerdp] + sp['as_new_xfreerdp_params'] + ['/v:{}'.format(sp['address'])] # @UndefinedVariable
tools.addTaskToWait(subprocess.Popen(params)) tools.addTaskToWait(subprocess.Popen(params))
def execRdesktop(rdesktop): def execRdesktop(rdesktop):
# import subprocess # @Reimport import subprocess # @Reimport
params = [rdesktop] + sp['as_rdesktop_params'] + [sp['address']] # @UndefinedVariable params = [rdesktop] + sp['as_rdesktop_params'] + [sp['address']] # @UndefinedVariable
p = subprocess.Popen(params, stdin=subprocess.PIPE) p = subprocess.Popen(params, stdin=subprocess.PIPE)
if sp['password'] != '': # @UndefinedVariable if sp['password'] != '': # @UndefinedVariable

3
server/src/uds/transports/RDP/scripts/linux/tunnel.py
View File

@ -13,16 +13,19 @@ from uds import tools # @UnresolvedImport
globals()['sp'] = sp # type: ignore # pylint: disable=undefined-variable globals()['sp'] = sp # type: ignore # pylint: disable=undefined-variable
def execUdsRdp(udsrdp, port): def execUdsRdp(udsrdp, port):
import subprocess # @Reimport
params = [udsrdp] + sp['as_new_xfreerdp_params'] + ['/v:127.0.0.1:{}'.format(port)] # @UndefinedVariable params = [udsrdp] + sp['as_new_xfreerdp_params'] + ['/v:127.0.0.1:{}'.format(port)] # @UndefinedVariable
tools.addTaskToWait(subprocess.Popen(params)) tools.addTaskToWait(subprocess.Popen(params))
def execNewXFreeRdp(xfreerdp, port): def execNewXFreeRdp(xfreerdp, port):
import subprocess # @Reimport
params = [xfreerdp] + sp['as_new_xfreerdp_params'] + ['/v:127.0.0.1:{}'.format(port)] # @UndefinedVariable params = [xfreerdp] + sp['as_new_xfreerdp_params'] + ['/v:127.0.0.1:{}'.format(port)] # @UndefinedVariable
tools.addTaskToWait(subprocess.Popen(params)) tools.addTaskToWait(subprocess.Popen(params))
def execRdesktop(rdesktop, port): def execRdesktop(rdesktop, port):
import subprocess # @Reimport
params = [rdesktop] + sp['as_rdesktop_params'] + ['127.0.0.1:{}'.format(port)] # @UndefinedVariable params = [rdesktop] + sp['as_rdesktop_params'] + ['127.0.0.1:{}'.format(port)] # @UndefinedVariable
p = subprocess.Popen(params, stdin=subprocess.PIPE) p = subprocess.Popen(params, stdin=subprocess.PIPE)
if sp['password'] != '': if sp['password'] != '':