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

actor/src/udsactor/rest.py

@@ -123,6 +123,10 @@ class UDSApi:  # pylint: disable=too-few-public-methods
                 kwargs["ssl_context"] = context
 
                 return super().init_poolmanager(*args, **kwargs)
+            
+            def cert_verify(self, conn, url, verify, cert):  # pylint: disable=unused-argument
+                # Overridden to do nothing
+                return super().cert_verify(conn, url, validateCert, cert)
 
         self._session = requests.Session()
         self._session.mount("https://", UDSHTTPAdapter())
@@ -199,7 +203,7 @@ class UDSServerApi(UDSApi):
                         priority=v['priority'],
                         isCustom=v['isCustom'],
                     )
-        except Exception:
+        except Exception as e:
             pass
 
     def register(

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

@@ -52,5 +52,6 @@ class Config(Handler):
     def put(self):
         for section, secDict in self._params.items():
             for key, vals in secDict.items():
+                logger.info('Updating config value %s.%s to %s by %s', section, key, vals['value'], self._user.name)
                 CfgConfig.update(section, key, vals['value'])
         return 'done'

server/src/uds/core/managers/user_service.py

@@ -200,7 +200,7 @@ class UserServiceManager(metaclass=singleton.Singleton):
         """
         Creates a new cache for the deployed service publication at level indicated
         """
-        logger.debug(
+        logger.info(
             'Creating a new cache element at level %s for publication %s',
             cacheLevel,
             publication,
@@ -226,7 +226,7 @@ class UserServiceManager(metaclass=singleton.Singleton):
 
         if servicePool.service.getType().publicationType is not None:
             publication = servicePool.activePublication()
-            logger.debug(
+            logger.info(
                 'Creating a new assigned element for user %s por publication %s',
                 user,
                 publication,
@@ -324,7 +324,7 @@ class UserServiceManager(metaclass=singleton.Singleton):
         @return: the Uservice canceling
         """
         userService.refresh_from_db()
-        logger.debug('Canceling userService %s creation', userService)
+        logger.info('Canceling userService %s creation', userService)
 
         if userService.isPreparing() is False:
             logger.info(
@@ -357,7 +357,7 @@ class UserServiceManager(metaclass=singleton.Singleton):
         """
         with transaction.atomic():
             userService = UserService.objects.select_for_update().get(id=userService.id)
-            logger.debug('Removing userService %a', userService)
+            logger.info('Removing userService %a', userService)
             if (
                 userService.isUsable() is False
                 and State.isRemovable(userService.state) is False

server/src/uds/core/util/security.py

@@ -110,6 +110,10 @@ def secureRequestsSession(verify: bool = True) -> 'requests.Session':
 
             return super().init_poolmanager(*args, **kwargs)
 
+        def cert_verify(self, conn, url, _, cert):  # pylint: disable=unused-argument
+            # Overridden to do nothing
+            return super().cert_verify(conn, url, verify, cert)
+
     session = requests.Session()
     session.mount("https://", UDSHTTPAdapter())