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

Several

Browse Source 
upgraded uds client projects
fixed admin js
rdp transport work
This commit is contained in:
Adolfo Gómez García 2019-04-23 07:28:29 +02:00
parent 436fe43098
commit deff947b03
9 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
3.0.0
3.0

16
client/full/.pydevproject
View File

@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/${PROJECT_DIR_NAME}/src</path>
</pydev_pathproperty>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/${PROJECT_DIR_NAME}/src</path>
</pydev_pathproperty>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">system-2.7</pydev_property>
</pydev_project>

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

@ -44,8 +44,6 @@ from uds import VERSION
import webbrowser
import json
import sys
import six
from UDSWindow import Ui_MainWindow

16
client/thin/.pydevproject
View File

@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/${PROJECT_DIR_NAME}/src</path>
</pydev_pathproperty>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/${PROJECT_DIR_NAME}/src</path>
</pydev_pathproperty>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">system-2.7</pydev_property>
</pydev_project>

8
server/src/uds/core/transports/BaseTransport.py
View File

@ -30,7 +30,9 @@
"""
@author: Adolfo Gómez, dkmaster at dkmon dot com
"""
from __future__ import unicode_literals
from typing import Tuple
import logging
from django.utils.translation import ugettext_noop as _
@ -40,8 +42,6 @@ from uds.core.transports import protocols
from uds.core.util import encoders
from uds.core.util import connection
import logging
logger = logging.getLogger(__name__)
DIRECT_GROUP = _('Direct')
@ -185,7 +185,7 @@ class Transport(Module):
"""
return user.name
def getUDSTransportScript(self, userService, transport, ip, os, user, password, request):
def getUDSTransportScript(self, userService, transport, ip, os, user, password, request) -> Tuple[str, str, dict]:
"""
If this is an uds transport, this will return the tranport script needed for executing
this on client

2
server/src/uds/static/admin/main.js
View File

File diff suppressed because one or more lines are too long

10
server/src/uds/static/admin/translations-fakejs.js
View File

@ -2,10 +2,10 @@
// Typescript
gettext("yes");
gettext("no");
gettext("$USERS users, $GROUPS groups");
gettext("$POOLS service pools");
gettext("$SERVICES user services");
gettext("$RESTRAINED restrained services!");
gettext("#USR_NUMBER# users, #GRP_NUMBER# groups");
gettext("#POOLS_NUMBER# service pools");
gettext("#SERVICES_NUMBER# user services");
gettext("#RESTRAINED_NUMBER# restrained services!");
gettext("New Network");
gettext("Edit Network");
gettext("Delete Network");
@ -427,7 +427,7 @@ gettext("Remove all");
gettext("Add");
gettext("Cancel");
gettext("Ok");
gettext("Close");
gettext("Discard & close");
gettext("Save");
gettext("Logs");
gettext("Filter");

3
server/src/uds/transports/RDP/BaseRDPTransport.py
View File

@ -36,6 +36,7 @@ from django.utils.translation import ugettext_noop as _
from uds.core.ui.UserInterface import gui
from uds.core.transports.BaseTransport import Transport
from uds.core.transports import protocols
from typing import Tuple
import logging
import os
@ -187,7 +188,7 @@ class BaseRDPTransport(Transport):
def getConnectionInfo(self, service, user, password):
return self.processUserPassword(service, user, password)
def getScript(self, scriptName, osName, params):
def getScript(self, scriptName, osName, params) -> Tuple[str, str, dict]:
# Reads script
scriptName = scriptName.format(osName)
with open(os.path.join(os.path.dirname(__file__), scriptName)) as f:

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

@ -9,7 +9,6 @@ try:
import winreg as wreg
except ImportError: # Python 2.7 fallback
import _winreg as wreg # @UnresolvedImport, pylint: disable=import-error
import os
import subprocess
from uds.forward import forward # @UnresolvedImport
from uds.log import logger # @UnresolvedImport
@ -26,7 +25,7 @@ if forwardThread.status == 2:
tools.addTaskToWait(forwardThread)
try:
thePass = six.binary_type(sp['password'].encode('UTF-16LE'))
thePass = six.binary_type(sp['password'].encode('UTF-16LE')) # @UndefinedVariable
password = win32crypt.CryptProtectData(thePass, None, None, None, None, 0x01).encode('hex')
except Exception:
# Cannot encrypt for user, trying for machine