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

debian/changelog

@@ -1,5 +0,0 @@
-risotto (0.1) unstable; urgency=low
-
-  * first version
-
- -- Cadoles <contact@cadoles.com>  Fri, 20 Mar 2020 15:18:25 +0100

debian/control

@@ -2,13 +2,19 @@ Source: risotto
 Section: admin
 Priority: extra
 Maintainer: Cadoles <contact@cadoles.com>
-Build-depends: debhelper (>=11), python3-all, python3-setuptools
+Build-depends: debhelper (>=11), python3-all, python3-setuptools, dh-python
 Standards-Version: 3.9.4
 Homepage: https://forge.cadoles.com/Infra/risotto
 
+Package: python3-risotto
+Architecture: any
+Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
+Depends: ${python:Depends}, ${misc:Depends}, python3-asyncpg, python3-rougail, python3-aiohttp
+Description: configuration manager libraries
+
 Package: risotto
 Architecture: any
 Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${misc:Depends}, python3-risotto
 Description: configuration manager
 

debian/risotto.install

@@ -0,0 +1,2 @@
+script/risotto-server usr/bin/
+sql/risotto.sql usr/share/eole/db/eole-risotto/gen/

script/risotto-server

@@ -1,16 +1,13 @@
 #!/usr/bin/env python3
-from sdnotify import SystemdNotifier
 from asyncio import get_event_loop
 from risotto import get_app
 
 
 if __name__ == '__main__':
-    notifier = SystemdNotifier()
     loop = get_event_loop()
     loop.run_until_complete(get_app(loop))
-    print('HTTP server ready')
-    notifier.notify("READY=1")
     try:
+        print('HTTP server ready')
         loop.run_forever()
     except KeyboardInterrupt:
         pass

src/risotto/config.py

@@ -1,7 +1,6 @@
 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')
@@ -89,40 +88,6 @@ 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/')
-if 'PKI_ADMIN_PASSWORD' in environ:
-    PKI_ADMIN_PASSWORD = environ['PKI_ADMIN_PASSWORD']
-else:
-    PKI_ADMIN_PASSWORD = config['PKI_ADMIN_PASSWORD']
-if 'PKI_ADMIN_EMAIL' in environ:
-    PKI_ADMIN_EMAIL = environ['PKI_ADMIN_EMAIL']
-else:
-    PKI_ADMIN_EMAIL = config['PKI_ADMIN_EMAIL']
-if 'PKI_URL' in environ:
-    PKI_URL = environ['PKI_URL']
-else:
-    PKI_URL = config.get('PKI_URL', 'http://localhost:8002')
 
 
 def dsn_factory(database, user, password, address=DB_ADDRESS):
@@ -145,16 +110,6 @@ _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,
-                        },
-           'pki': {'admin_password': PKI_ADMIN_PASSWORD,
-                   'owner': PKI_ADMIN_EMAIL,
-                   'url': PKI_URL,
-                   },
            'cache': {'root_path': CACHE_ROOT_PATH},
            'servermodel': {'internal_source_path': SRV_SEED_PATH,
                            'internal_source': 'internal'},

src/risotto/controller.py

@@ -48,31 +48,6 @@ class Controller:
                                  **kwargs,
                                  )
 
-    @staticmethod
-    async def check_role(self,
-                         uri: str,
-                         username: str,
-                         **kwargs: dict,
-                         ) -> None:
-        # create a new config
-        async with await Config(dispatcher.option) as config:
-            await config.property.read_write()
-            await config.option('message').value.set(uri)
-            subconfig = config.option(uri)
-            for key, value in kwargs.items():
-                try:
-                    await subconfig.option(key).value.set(value)
-                except AttributeError:
-                    if get_config()['global']['debug']:
-                        print_exc()
-                    raise ValueError(_(f'unknown parameter in "{uri}": "{key}"'))
-                except ValueOptionError as err:
-                    raise ValueError(_(f'invalid parameter in "{uri}": {err}'))
-            await dispatcher.check_role(subconfig,
-                                        username,
-                                        uri,
-                                        )
-
     async def on_join(self,
                       risotto_context,
                       ):

src/risotto/dispatcher.py

@@ -333,7 +333,7 @@ class Dispatcher(register.RegisterDispatcher,
             parameters = await subconfig.value.dict()
             if extra_parameters:
                 parameters.update(extra_parameters)
-        return parameters
+            return parameters
 
     def get_service(self,
                     name: str):
@@ -342,15 +342,14 @@ class Dispatcher(register.RegisterDispatcher,
     async def check_role(self,
                          config: Config,
                          user_login: str,
-                         uri: str,
+                         uri: str) -> None:
-                         ) -> None:
         async with self.pool.acquire() as connection:
             async with connection.transaction():
                 # Verify if user exists and get ID
                 sql = '''
                 SELECT UserId
                 FROM UserUser
-                WHERE Login = $1
+                WHERE UserLogin = $1
                 '''
                 user_id = await connection.fetchval(sql,
                                                     user_login)
@@ -408,7 +407,7 @@ class Dispatcher(register.RegisterDispatcher,
                     kw[key] = value
 
         kw['risotto_context'] = risotto_context
-        returns = await function(self.get_service(function_obj['module']), **kw)
+        returns = await function(self.injected_self[function_obj['module']], **kw)
         if risotto_context.type == 'rpc':
             # valid returns
             await self.valid_call_returns(risotto_context,

src/risotto/http.py

@@ -29,8 +29,7 @@ def create_context(request):
 
 
 def register(version: str,
-             path: str,
+             path: str):
-             ):
     """ Decorator to register function to the http route
     """
     def decorator(function):
@@ -42,9 +41,7 @@ def register(version: str,
 
 
 class extra_route_handler:
-    async def __new__(cls,
+    async def __new__(cls, request):
-                      request,
-                      ):
         kwargs = dict(request.match_info)
         kwargs['request'] = request
         kwargs['risotto_context'] = create_context(request)
@@ -99,13 +96,11 @@ async def handle(request):
             print_exc()
         raise HTTPInternalServerError(reason=str(err))
     return Response(text=dumps({'response': text}),
-                    content_type='application/json',
+                    content_type='application/json')
-                    )
 
 
 async def api(request,
-              risotto_context,
+              risotto_context):
-              ):
     global TIRAMISU
     if not TIRAMISU:
         # check all URI that have an associated role
@@ -157,8 +152,7 @@ async def get_app(loop):
     for version in versions:
         api_route = {'function': api,
                      'version': version,
-                     'path': f'/api/{version}',
+                     'path': f'/api/{version}'}
-                     }
         extra_handler = type(api_route['path'], (extra_route_handler,), api_route)
         routes.append(get(api_route['path'], extra_handler))
         print(f'  - {api_route["path"]} (http_get)')
@@ -180,10 +174,7 @@ async def get_app(loop):
     await dispatcher.register_remote()
     print()
     await dispatcher.on_join()
-    return await loop.create_server(app.make_handler(),
+    return await loop.create_server(app.make_handler(), '*', get_config()['http_server']['port'])
-                                    '*',
-                                    get_config()['http_server']['port'],
-                                    )
 
 
 TIRAMISU = None

src/risotto/register.py

@@ -7,7 +7,6 @@ from typing import Callable, Optional, List
 from asyncpg import create_pool
 from json import dumps, loads
 from pkg_resources import iter_entry_points
-from traceback import print_exc
 import risotto
 from .utils import _
 from .error import RegistrationError
@@ -24,7 +23,7 @@ class Services():
 
     def load_services(self):
         for entry_point in iter_entry_points(group='risotto_services'):
-            self.services.setdefault(entry_point.name, {})
+            self.services.setdefault(entry_point.name, [])
         self.services_loaded = True
 
     def load_modules(self,
@@ -33,20 +32,21 @@ class Services():
         for entry_point in iter_entry_points(group='risotto_modules'):
             service_name, module_name = entry_point.name.split('.')
             if limit_services is None or service_name in limit_services:
-                self.services[service_name][module_name] = entry_point.load()
+                setattr(self, module_name, entry_point.load())
+                self.services[service_name].append(module_name)
         self.modules_loaded = True
-#
+
-#    def get_services(self):
+    def get_services(self):
-#        if not self.services_loaded:
+        if not self.services_loaded:
-#            self.load_services()
+            self.load_services()
-#        return [(service, getattr(self, service)) for service in self.services]
+        return [(s, getattr(self, s)) for s in self.services]
 
     def get_modules(self,
                     limit_services: Optional[List[str]]=None,
                     ) -> List[str]:
         if not self.modules_loaded:
             self.load_modules(limit_services=limit_services)
-        return [(module + '.' + submodule, entry_point) for module, submodules in self.services.items() for submodule, entry_point in submodules.items()]
+        return [(module + '.' + submodule, getattr(self, submodule)) for module, submodules in self.services.items() for submodule in submodules]
 
     def get_services_list(self):
         return self.services.keys()
@@ -278,7 +278,7 @@ class RegisterDispatcher:
         try:
             self.injected_self[submodule_name] = module.Risotto(test)
         except AttributeError as err:
-            print(_(f'unable to register the module {submodule_name}, this module must have Risotto class'))
+            raise RegistrationError(_(f'unable to register the module {submodule_name}, this module must have Risotto class'))
 
     def validate(self):
         """ check if all messages have a function
@@ -320,13 +320,7 @@ class RegisterDispatcher:
                     await log.info_msg(risotto_context,
                                        None,
                                        info_msg)
-                    try:
+                    await module.on_join(risotto_context)
-                        await module.on_join(risotto_context)
-                    except Exception as err:
-                        if get_config()['global']['debug']:
-                            print_exc()
-                        msg = _(f'on_join returns an error in module {submodule_name}: {err}')
-                        await log.error_msg(risotto_context, {}, msg)
 
     async def load(self):
         # valid function's arguments

tests/test_config.py

@@ -392,6 +392,7 @@ async def test_server_created_base():
                              release_distribution='last',
                              site_name='site_1',
                              zones_name=['zones'],
+                             zones_ip=['1.1.1.1'],
                              )
     assert list(config_module.server) == [server_name]
     assert set(config_module.server[server_name]) == {'server', 'server_to_deploy', 'funcs_file'}
@@ -419,6 +420,7 @@ async def test_server_created_own_sm():
                              release_distribution='last',
                              site_name='site_1',
                              zones_name=['zones'],
+                             zones_ip=['1.1.1.1'],
                              )
     assert list(config_module.server) == [server_name]
     assert set(config_module.server[server_name]) == {'server', 'server_to_deploy', 'funcs_file'}
@@ -467,6 +469,7 @@ async def test_server_configuration_get():
                              release_distribution='last',
                              site_name='site_1',
                              zones_name=['zones'],
+                             zones_ip=['1.1.1.1'],
                              )
     #
     await config_module.server[server_name]['server'].property.read_write()
@@ -512,6 +515,7 @@ async def test_server_configuration_deployed():
                              release_distribution='last',
                              site_name='site_1',
                              zones_name=['zones'],
+                             zones_ip=['1.1.1.1'],
                              )
     #
     await config_module.server[server_name]['server'].property.read_write()