Refactor weblogin callback to use secure request session and constant timeout

Extracted client plugins downloadables to its own file for readibility and code maintenance

server/src/tests/core/auths/test_callbacks.py

@@ -61,27 +61,27 @@ class AuthCallbackTest(UDSTestCase):
     def test_no_callback(self) -> None:
         config.GlobalConfig.NOTIFY_CALLBACK_URL.set('')  # Clean callback url
 
-        with mock.patch('requests.post') as mock_post:
+        with mock.patch('uds.core.util.security.secure_requests_session') as session_mock:
             callbacks.weblogin(self.user)
-            mock_post.assert_not_called()
+            session_mock.assert_not_called()
 
     def test_callback_failed_url(self) -> None:
         config.GlobalConfig.NOTIFY_CALLBACK_URL.set('http://localhost:1234')  # Sample non existent url
         callbacks.FAILURE_CACHE.set('notify_failure', 3)  # Already failed 3 times
 
-        with mock.patch('requests.post') as mock_post:
+        with mock.patch('uds.core.util.security.secure_requests_session') as session_mock:
             callbacks.weblogin(self.user)
-            mock_post.assert_not_called()
+            session_mock.assert_not_called()
 
     def test_callback_fails_repeteadly(self) -> None:
         config.GlobalConfig.NOTIFY_CALLBACK_URL.set('https://localhost:1234')
 
-        with mock.patch('requests.post') as mock_post:
+        with mock.patch('uds.core.util.security.secure_requests_session') as session_mock:
-            mock_post.side_effect = Exception('Error')
+            session_mock.return_value.post.side_effect = Exception('Error')
             for _i in range(16):
                 callbacks.weblogin(self.user)
                 
-            self.assertEqual(mock_post.call_count, 3)
+            self.assertEqual(session_mock.call_count, 3)
 
     def test_callback_change_groups(self) -> None:
         config.GlobalConfig.NOTIFY_CALLBACK_URL.set('https://localhost:1234')
@@ -91,13 +91,13 @@ class AuthCallbackTest(UDSTestCase):
         
         diff_groups = all_groups - current_groups
 
-        with mock.patch('requests.post') as mock_post:
+        with mock.patch('uds.core.util.security.secure_requests_session') as session_mock:
-            mock_post.return_value.json.return_value = {
+            session_mock.return_value.post.return_value.json.return_value = {
                 'new_groups': list(diff_groups),
                 'removed_groups': list(current_groups),
             }
 
             callbacks.weblogin(self.user)
 
-            self.assertEqual(mock_post.call_count, 1)
+            self.assertEqual(session_mock.call_count, 1)
             self.assertEqual({group.name for group in self.user.groups.all()}, diff_groups)

server/src/uds/core/auths/callbacks.py

@@ -69,7 +69,7 @@ def weblogin(user: models.User) -> None:
                     'groups': [group.name for group in user.groups.all()],
                 },
             },
-            timeout=consts.net.URGENT_REQUEST_TIMEOUT,
+            timeout=consts.net.SHORT_REQUEST_TIMEOUT,
         )
         response.raise_for_status()
         FAILURE_CACHE.delete('notify_failure')

server/src/uds/core/consts/net.py

@@ -35,7 +35,7 @@ import typing
 # Request related timeouts, etc..
 DEFAULT_REQUEST_TIMEOUT: typing.Final[int] = 20  # In seconds
 DEFAULT_CONNECT_TIMEOUT: typing.Final[int] = 4   # In seconds
-URGENT_REQUEST_TIMEOUT: typing.Final[int] = 3    # In seconds
+SHORT_REQUEST_TIMEOUT: typing.Final[int] = 3    # In seconds
 
 # Default UDS Registerd Server listen port
 SERVER_DEFAULT_LISTEN_PORT: typing.Final[int] = 43910

server/src/uds/core/types/requests.py

@@ -43,7 +43,7 @@ class ExtendedHttpRequest(HttpRequest):
     ip_version: int
     ip_proxy: str
     os: 'types.os.DetectedOsInfo'
-    user: typing.Optional['User'] # type: ignore
+    user: typing.Optional['User'] # type: ignore  # Overrides the user attribute from HttpRequest
     authorized: bool
 
 

server/src/uds/models/authenticator.py

@@ -127,6 +127,12 @@ class Authenticator(ManagedObjectModel, TaggingMixin):
         """
         # If type is not registered (should be, but maybe a database inconsistence), consider this a "base empty auth"
         return auths.factory().lookup(self.data_type) or auths.Authenticator
+    
+    def type_is_valid(self) -> bool:
+        """
+        Returns if the type of this authenticator exists
+        """
+        return auths.factory().lookup(self.data_type) is not None
 
     def get_or_create_user(self, username: str, realName: typing.Optional[str] = None) -> 'User':
         """

server/src/uds/web/util/configjs.py

@@ -39,12 +39,13 @@ from django.utils.translation import gettext, get_language
 from django.urls import reverse
 from django.templatetags.static import static
 
-from uds.REST.methods.client import CLIENT_VERSION
 from uds.core import consts
 from uds.core.managers import downloads_manager
 from uds.core.util.config import GlobalConfig
 from uds.models import Authenticator, Image, Network, Transport
 
+from . import udsclients_info
+
 # Not imported at runtime, just for type checking
 if typing.TYPE_CHECKING:
     from uds.core.types.requests import ExtendedHttpRequest
@@ -92,13 +93,13 @@ def uds_js(request: 'ExtendedHttpRequest') -> str:
 
     # the auths for client
     def _get_auth_info(auth: Authenticator) -> dict[str, typing.Any]:
-        theType = auth.get_type()
+        auth_type = auth.get_type()
         return {
             'id': auth.uuid,
             'name': auth.name,
             'label': auth.small_name,
             'priority': auth.priority,
-            'is_custom': theType.is_custom(),
+            'is_custom': auth_type.is_custom(),
         }
 
     config: dict[str, typing.Any] = {
@@ -106,7 +107,7 @@ def uds_js(request: 'ExtendedHttpRequest') -> str:
         'version_stamp': consts.system.VERSION_STAMP,
         'language': get_language(),
         'available_languages': [{'id': k, 'name': gettext(v)} for k, v in settings.LANGUAGES],
-        'authenticators': [_get_auth_info(auth) for auth in authenticators if auth.get_type()],
+        'authenticators': [_get_auth_info(auth) for auth in authenticators if auth.type_is_valid()],
         'mfa': request.session.get('mfa', None),
         'tag': tag,
         'os': request.os.os.name,
@@ -122,7 +123,7 @@ def uds_js(request: 'ExtendedHttpRequest') -> str:
         'launcher_wait_time': 5000,
         'messages': {
             # Calendar denied message
-            'calendarDenied': GlobalConfig.LIMITED_BY_CALENDAR_TEXT.get().strip()
+            'calendar_denied': GlobalConfig.LIMITED_BY_CALENDAR_TEXT.get().strip()
             or gettext('Access limited by calendar')
         },
         'urls': {
@@ -167,57 +168,7 @@ def uds_js(request: 'ExtendedHttpRequest') -> str:
             'ip_proxy': request.ip_proxy,
         }
 
-    # all plugins are under url clients...
+    plugins = udsclients_info.PLUGINS.copy()
-    plugins = [
-        {
-            'url': static('clients/' + url.format(version=CLIENT_VERSION)),
-            'description': description,
-            'name': name,
-            'legacy': legacy,
-        }
-        for url, description, name, legacy in (
-            (
-                'UDSClientSetup-{version}.exe',
-                gettext('Windows client'),
-                'Windows',
-                False,
-            ),
-            ('UDSClient-{version}.pkg', gettext('Mac OS X client'), 'MacOS', False),
-            (
-                'udsclient3_{version}_all.deb',
-                gettext('Debian based Linux client') + ' ' + gettext('(requires Python-3.9 or newer)'),
-                'Linux',
-                False,
-            ),
-            (
-                'udsclient3-{version}-1.noarch.rpm',
-                gettext('RPM based Linux client (Fedora, Suse, ...)')
-                + ' '
-                + gettext('(requires Python-3.9 or newer)'),
-                'Linux',
-                False,
-            ),
-            (
-                'udsclient3-x86_64-{version}.tar.gz',
-                gettext('Binary appimage X86_64 Linux client'),
-                'Linux',
-                False,
-            ),
-            (
-                'udsclient3-armhf-{version}.tar.gz',
-                gettext('Binary appimage ARMHF Linux client (Raspberry, ...)'),
-                'Linux',
-                False,
-            ),
-            (
-                'udsclient3-{version}.tar.gz',
-                gettext('Generic .tar.gz Linux client') + ' ' + gettext('(requires Python-3.9 or newer)'),
-                'Linux',
-                False,
-            ),
-        )
-    ]
-
     # We can add here custom downloads with something like this:
     # plugins.append({
     #     'url': 'http://www.google.com/coche.exe',

server/src/uds/web/util/udsclients_info.py

@@ -0,0 +1,57 @@
+import typing
+
+from django.utils.translation import gettext
+from django.templatetags.static import static
+from uds.REST.methods.client import CLIENT_VERSION
+
+
+# all plugins are under url clients...
+PLUGINS: typing.Final[list[dict[str, 'str|bool']]] = [
+    {
+        'url': static('clients/' + url.format(version=CLIENT_VERSION)),
+        'description': description,
+        'name': name,
+        'legacy': legacy,
+    }
+    for url, description, name, legacy in (
+        (
+            'UDSClientSetup-{version}.exe',
+            gettext('Windows client'),
+            'Windows',
+            False,
+        ),
+        ('UDSClient-{version}.pkg', gettext('Mac OS X client'), 'MacOS', False),
+        (
+            'udsclient3_{version}_all.deb',
+            gettext('Debian based Linux client') + ' ' + gettext('(requires Python-3.9 or newer)'),
+            'Linux',
+            False,
+        ),
+        (
+            'udsclient3-{version}-1.noarch.rpm',
+            gettext('RPM based Linux client (Fedora, Suse, ...)')
+            + ' '
+            + gettext('(requires Python-3.9 or newer)'),
+            'Linux',
+            False,
+        ),
+        (
+            'udsclient3-x86_64-{version}.tar.gz',
+            gettext('Binary appimage X86_64 Linux client'),
+            'Linux',
+            False,
+        ),
+        (
+            'udsclient3-armhf-{version}.tar.gz',
+            gettext('Binary appimage ARMHF Linux client (Raspberry, ...)'),
+            'Linux',
+            False,
+        ),
+        (
+            'udsclient3-{version}.tar.gz',
+            gettext('Generic .tar.gz Linux client') + ' ' + gettext('(requires Python-3.9 or newer)'),
+            'Linux',
+            False,
+        ),
+    )
+]