shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-24 21:34:41 +03:00
Code Issues Releases Wiki Activity

Moved required client versio ton core __init__,py

Browse Source
This commit is contained in:
Adolfo Gómez García 2022-07-13 13:14:20 +02:00
parent e33d63158a
commit 02aec9ebea
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/uds/REST/methods/client.py
View File

@ -44,13 +44,13 @@ from uds.web.util import errors
from uds.core.managers import cryptoManager, userServiceManager
from uds.core.util.config import GlobalConfig
from uds.core.services.exceptions import ServiceNotReadyError
from uds.core import VERSION as UDS_VERSION
from uds.core import VERSION as UDS_VERSION, REQUIRED_CLIENT_VERSION
logger = logging.getLogger(__name__)
CLIENT_VERSION = UDS_VERSION
REQUIRED_CLIENT_VERSION = '3.5.0'
# Enclosed methods under /client path

2
server/src/uds/core/__init__.py
View File

@ -42,3 +42,5 @@ from .module import Module
VERSION = '4.x.x-DEVEL'
VERSION_STAMP = '{}-DEVEL'.format(time.strftime("%Y%m%d"))
# Minimal uds client version required to connect to this server
REQUIRED_CLIENT_VERSION = '3.5.0'

5
server/src/uds/dispatchers/guacamole/views.py
View File

@ -78,8 +78,9 @@ def guacamole(
try:
userService = UserService.objects.get(uuid=ti['userService'])
if not userService.isUsable():
raise Exception() # Not usable, so we will not use it :)
if not userService.isUsable() or not userService.user:
# Not usable, or not assigned to a user, we will not use it
raise Exception()
# Log message and event
protocol = 'RDS' if 'remote-app' in val else val['protocol'].upper()
host = val.get('hostname', '0.0.0.0')