Merge remote-tracking branch 'origin/v3.5'

server/src/uds/REST/methods/actor_v3.py

@@ -276,6 +276,8 @@ class Initialize(ActorV3Action):
 
             # Valid actor token, now validate access allowed. That is, look for a valid mac from the ones provided.
             try:
+                # Enforce lowecase ids for sqlite
+                idsList = [i.lower() for i in idsList]
                 # Set full filter
                 dbFilter = dbFilter.filter(
                     unique_id__in=idsList,
@@ -454,6 +456,9 @@ class LoginLogout(ActorV3Action):
                 x['mac'] for x in self._params['id']
             ][:10]
 
+            # Enforce lowercase for idList
+            idsList = [x.lower() for x in idsList]
+
             validId: typing.Optional[str] = service.getValidId(idsList)
 
             # Must be valid
@@ -664,6 +669,9 @@ class Unmanaged(ActorV3Action):
         ][:10]
         validId: typing.Optional[str] = service.getValidId(idsList)
 
+        # enforce lowercase idsList
+        idsList = [i.lower() for i in idsList]
+
         # Check if there is already an assigned user service
         # To notify it logout
         userService: typing.Optional[UserService]

server/src/uds/web/views/auth.py

@@ -113,15 +113,6 @@ def authCallback_stage2(
         params: typing.Dict[str, typing.Any] = ticket['params']
         auth_uuid: str = ticket['auth']
         authenticator = Authenticator.objects.get(uuid=auth_uuid)
-        params['_request'] = request
-        # params['_session'] = request.session
-        # params['_user'] = request.user
-        logger.debug(
-            'Request session:%s -> %s, %s',
-            request.ip,
-            request.session.keys(),
-            request.session.session_key,
-        )
 
         result = authenticateViaCallback(authenticator, params, request)
 

server/src/uds/web/views/modern.py

@@ -37,7 +37,7 @@ from django.http import HttpRequest, HttpResponse, JsonResponse, HttpResponseRed
 from django.views.decorators.cache import never_cache
 from django.urls import reverse
 from uds.core.util.request import ExtendedHttpRequest, ExtendedHttpRequestWithUser
-from uds.core.auths import auth
+from uds.core.auths import auth, exceptions
 
 from uds.web.util import errors
 from uds.web.forms.LoginForm import LoginForm