From c98933b6ed369d0888ed81c1fe78ff335e40eb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= Date: Tue, 29 Jun 2021 14:48:04 +0200 Subject: [PATCH] Fixed guacamole urls && small pam fix --- server/src/uds/dispatchers/guacamole/urls.py | 10 ++++------ server/src/uds/dispatchers/pam/views.py | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/server/src/uds/dispatchers/guacamole/urls.py b/server/src/uds/dispatchers/guacamole/urls.py index 51ba651c..1e106425 100644 --- a/server/src/uds/dispatchers/guacamole/urls.py +++ b/server/src/uds/dispatchers/guacamole/urls.py @@ -31,13 +31,11 @@ @author: Adolfo Gómez, dkmaster at dkmon dot com """ from django.conf.urls import url -from .views import guacamole +from .views import guacamole, guacamole_authenticated urlpatterns = [ - # Old, compat - url(r'^guacamole/(?P.+)$', guacamole, name='dispatcher.guacamole'), - # New path - url(r'^uds/guacamole/(?P.+)$', guacamole, name='dispatcher.guacamole'), # Authenticated path - url(r'^uds/guacamole/auth/(?P[^/]+)/(?P.+)$', guacamole, name='dispatcher.guacamole'), + url(r'^uds/guacamole/auth/(?P[^/]+)/(?P.+)$', guacamole_authenticated, name='dispatcher.guacamole'), + # Non authenticated path. Disabled + # url(r'^uds/guacamole/(?P.+)$', guacamole, name='dispatcher.guacamole.noauth'), ] diff --git a/server/src/uds/dispatchers/pam/views.py b/server/src/uds/dispatchers/pam/views.py index 99208049..653ad6b1 100644 --- a/server/src/uds/dispatchers/pam/views.py +++ b/server/src/uds/dispatchers/pam/views.py @@ -35,6 +35,7 @@ import logging from django.http import HttpResponseNotAllowed, HttpResponse, HttpRequest from uds.models import TicketStore from uds.core.auths import auth +from uds.core.util.request import ExtendedHttpRequestWithUser logger = logging.getLogger(__name__) @@ -42,7 +43,7 @@ logger = logging.getLogger(__name__) @auth.trustedSourceRequired -def pam(request: HttpRequest) -> HttpResponse: +def pam(request: ExtendedHttpRequestWithUser) -> HttpResponse: response = '' if request.method == 'POST': return HttpResponseNotAllowed(['GET'])