Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

src/risotto/config.py

@@ -1,6 +1,7 @@
 from os import environ
 from os.path import isfile
 from configobj import ConfigObj
+from uuid import uuid4
 
 
 CONFIG_FILE = environ.get('CONFIG_FILE', '/etc/risotto/risotto.conf')
@@ -88,6 +89,28 @@ if 'IMAGE_PATH' in environ:
     IMAGE_PATH = environ['IMAGE_PATH']
 else:
     IMAGE_PATH = config.get('IMAGE_PATH', '/tmp')
+if 'PASSWORD_ADMIN_USERNAME' in environ:
+    PASSWORD_ADMIN_USERNAME = environ['PASSWORD_ADMIN_USERNAME']
+else:
+    PASSWORD_ADMIN_USERNAME = config.get('PASSWORD_ADMIN_USERNAME', 'risotto')
+if 'PASSWORD_ADMIN_EMAIL' in environ:
+    PASSWORD_ADMIN_EMAIL = environ['PASSWORD_ADMIN_EMAIL']
+else:
+    # this parameter is mandatory
+    PASSWORD_ADMIN_EMAIL = config['PASSWORD_ADMIN_EMAIL']
+if 'PASSWORD_ADMIN_PASSWORD' in environ:
+    PASSWORD_ADMIN_PASSWORD = environ['PASSWORD_ADMIN_PASSWORD']
+else:
+    # this parameter is mandatory
+    PASSWORD_ADMIN_PASSWORD = config['PASSWORD_ADMIN_PASSWORD']
+if 'PASSWORD_DEVICE_IDENTIFIER' in environ:
+    PASSWORD_DEVICE_IDENTIFIER = environ['PASSWORD_DEVICE_IDENTIFIER']
+else:
+    PASSWORD_DEVICE_IDENTIFIER = config.get('PASSWORD_DEVICE_IDENTIFIER', uuid4())
+if 'PASSWORD_URL' in environ:
+    PASSWORD_URL = environ['PASSWORD_URL']
+else:
+    PASSWORD_URL = config.get('PASSWORD_URL', 'https://localhost:8001/')
 
 
 def dsn_factory(database, user, password, address=DB_ADDRESS):
@@ -110,6 +133,12 @@ _config = {'database': {'dsn': dsn_factory(RISOTTO_DB_NAME, RISOTTO_DB_USER, RIS
                       'sql_dir': SQL_DIR,
                       'tmp_dir': TMP_DIR,
                       },
+           'password': {'admin_username': PASSWORD_ADMIN_USERNAME,
+                        'admin_email': PASSWORD_ADMIN_EMAIL,
+                        'admin_password': PASSWORD_ADMIN_PASSWORD,
+                        'device_identifier': PASSWORD_DEVICE_IDENTIFIER,
+                        'service_url': PASSWORD_URL,
+                        },
            'cache': {'root_path': CACHE_ROOT_PATH},
            'servermodel': {'internal_source_path': SRV_SEED_PATH,
                            'internal_source': 'internal'},

src/risotto/dispatcher.py

@@ -349,7 +349,7 @@ class Dispatcher(register.RegisterDispatcher,
                 sql = '''
                 SELECT UserId
                 FROM UserUser
-                WHERE UserLogin = $1
+                WHERE Login = $1
                 '''
                 user_id = await connection.fetchval(sql,
                                                     user_login)
@@ -394,10 +394,9 @@ class Dispatcher(register.RegisterDispatcher,
                      ) -> Optional[Dict]:
         # so send the message
         function = function_obj['function']
-        submodule_name = function_obj['module']
+        risotto_context.module = function_obj['module'].split('.', 1)[0]
         function_name = function.__name__
-        risotto_context.module = submodule_name.split('.', 1)[0]
-        info_msg = _(f'in module {submodule_name}.{function_name}')
+        info_msg = _(f"in function {function_obj['full_module_name']}.{function_name}")
         # build argument for this function
         if risotto_context.type == 'rpc':
             kw = config_arguments

src/risotto/register.py

@@ -199,7 +199,8 @@ class RegisterDispatcher:
             raise RegistrationError(_(f'the message {message} not exists'))
 
         # xxx submodule can only be register with v1.yyy.xxx..... message
-        risotto_module_name, submodule_name = function.__module__.split('.')[-3:-1]
+        full_module_name = function.__module__
+        risotto_module_name, submodule_name = full_module_name.split('.')[-3:-1]
         module_name = risotto_module_name.split('_')[-1]
         message_module, message_submodule, message_name = message.split('.', 2)
         if message_module not in self.risotto_modules:
@@ -224,6 +225,7 @@ class RegisterDispatcher:
         register(version,
                  message,
                  f'{module_name}.{submodule_name}',
+                 full_module_name,
                  function,
                  function_args,
                  notification,
@@ -233,11 +235,13 @@ class RegisterDispatcher:
                      version: str,
                      message: str,
                      module_name: str,
+                     full_module_name: str,
                      function: Callable,
                      function_args: list,
                      notification: Optional[str],
                      ):
         self.messages[version][message]['module'] = module_name
+        self.messages[version][message]['full_module_name'] = full_module_name
         self.messages[version][message]['function'] = function
         self.messages[version][message]['arguments'] = function_args
         if notification:
@@ -247,6 +251,7 @@ class RegisterDispatcher:
                        version: str,
                        message: str,
                        module_name: str,
+                       full_module_name: str,
                        function: Callable,
                        function_args: list,
                        notification: Optional[str],
@@ -255,8 +260,10 @@ class RegisterDispatcher:
             self.messages[version][message]['functions'] = []
 
         dico = {'module': module_name,
+                'full_module_name': full_module_name,
                 'function': function,
-                'arguments': function_args}
+                'arguments': function_args,
+                }
         if notification and notification:
             dico['notification'] = notification
         self.messages[version][message]['functions'].append(dico)
@@ -309,7 +316,7 @@ class RegisterDispatcher:
                     risotto_context.type = None
                     risotto_context.connection = connection
                     risotto_context.module = submodule_name.split('.', 1)[0]
-                    info_msg = _(f'in module risotto_{submodule_name}.on_join')
+                    info_msg = _(f'in function risotto_{submodule_name}.on_join')
                     await log.info_msg(risotto_context,
                                        None,
                                        info_msg)