This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit 879347f73a0d67a89bb69e0ae3322bd121efb385 Merge: 377543e 6300cc0 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Fri Feb 20 10:09:05 2015 +0100 Merge branch 'develop' of https://git.chorem.org/mum into develop Conflicts: app/module_loader.py app/modules/monitoring_modules/__init__.py app/module_loader.py | 22 +++++++++++++++++----- app/modules/detection_modules/nmap_detection.py | 6 ++++-- .../detection_modules/unix/kernel_detection.py | 1 + app/modules/monitoring_modules/__init__.py | 1 + app/modules/monitoring_modules/unix/__init__.py | 1 + .../monitoring_modules/unix/updated_packages.py | 19 +++++++++++++++++++ static/js/controllers/table_ctrl.js | 10 +++++----- views/dashboard.html | 1 - 8 files changed, 48 insertions(+), 13 deletions(-) diff --cc app/module_loader.py index 9f6ad2a,d12d3d7..c336695 --- a/app/module_loader.py +++ b/app/module_loader.py @@@ -1,18 -1,12 +1,19 @@@ __author__ = 'aguilbaud' - import modules.detection_modules - import modules.detection_modules.unix + import modules import modules.connection_modules + import modules.detection_modules + import modules.monitoring_modules import modules.storage_modules +""" +Loads dynamically modules from packages connection_modules, detection_modules, monitoring_modules, storage_modules. +""" def load_db(): + """ + Creates an instance of the class shelve_db from storage_modules. + :return: an instance of the shelve_db class + """ db_name = "shelve_db" db = __import__("modules.storage_modules." + db_name, fromlist=modules.storage_modules) db_instance = getattr(db, db_name)() @@@ -46,15 -26,18 +47,26 @@@ def load_conn(conn_name, addr_host, key def run_all_detection_modules(os, conn, db): + """ + Instanciates and runs every detection_modules listed in the __init__.py file of the package corresponding to + the operating system entered in parameters. + :param os: the oprating system of the host + :param conn: an instance of a connection module + :param db: an instance of a storage module + """ - - for mod_name in "modules.detection_modules." + os + ".__all__": + __import__("modules.detection_modules." + os) + pack_mod_os = __import__("modules.detection_modules." + os, fromlist=modules.detection_modules.__all__) + for mod_name in pack_mod_os.__all__: mod = __import__ ("modules.detection_modules." + os + "." + mod_name, fromlist=modules.detection_modules.unix.__all__) # on charge le module mod_instance = getattr(mod, mod_name)(conn, db) # on appelle le constructeur - mod_instance.run_detection() + mod_instance.run_detection() + + ++ + def run_all_monitoring_modules(os, conn, db): + __import__("modules.monitoring_modules." + os) + pack_mod_os = __import__("modules.monitoring_modules." + os, fromlist=modules.monitoring_modules.__all__) + for mod_name in pack_mod_os.__all__: + mod = __import__ ("modules.monitoring_modules." + os + "." + mod_name, fromlist=modules.monitoring_modules.unix.__all__) # on charge le module + mod_instance = getattr(mod, mod_name)(conn, db) # on appelle le constructeur - #mod_instance.check() ++ #mod_instance.check() diff --cc app/modules/monitoring_modules/__init__.py index fcb43f2,64f86cc..9735bce --- a/app/modules/monitoring_modules/__init__.py +++ b/app/modules/monitoring_modules/__init__.py @@@ -1,1 -1,2 +1,2 @@@ -__author__ = 'alexis' -__all__=['unix'] +__author__ = 'aguilbaud' ++__all__ = ['unix'] -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.