Merge pull request #59 from adator85/V5.X.X

V5.3.9

core/base.py

@@ -48,7 +48,6 @@ class Base:
         with open(version_filename, 'r') as version_data:
             current_version:dict[str, str] = json.load(version_data)
 
-        # self.DEFENDER_VERSION = current_version["version"]
         self.Config.current_version = current_version['version']
 
         return None
@@ -81,6 +80,14 @@ class Base:
             self.logs.warning(f'Github not available to fetch latest version')
 
     def check_for_new_version(self, online:bool) -> bool:
+        """Check if there is a new version available
+
+        Args:
+            online (bool): True if you want to get the version from github (main branch)
+
+        Returns:
+            bool: True if there is a new version available
+        """
         try:
             self.logs.debug(f'Checking for a new service version')
 
@@ -229,6 +236,19 @@ class Base:
 
         return False
 
+    def db_update_module(self, user_cmd: str, module_name: str) -> None:
+        """Modifie la date et le user qui a rechargé le module
+
+        Args:
+            user_cmd (str): le user qui a rechargé le module
+            module_name (str): le module a rechargé
+        """
+        update_cmd_query = f"UPDATE {self.Config.table_module} SET datetime = :datetime, user = :user WHERE module_name = :module_name"
+        mes_donnees = {'datetime': self.get_datetime(), 'user': user_cmd, 'module_name': module_name}
+        self.db_execute_query(update_cmd_query, mes_donnees)
+
+        return False
+
     def db_delete_module(self, module_name:str) -> None:
         """Supprime les modules de la base de données
 
@@ -591,7 +611,7 @@ class Base:
             )
         '''
         
-        table_core_channel = '''CREATE TABLE IF NOT EXISTS core_channel (
+        table_core_channel = f'''CREATE TABLE IF NOT EXISTS {self.Config.table_channel} (
             id INTEGER PRIMARY KEY AUTOINCREMENT,
             datetime TEXT,
             module_name TEXT,

core/installation.py

@@ -1,7 +1,8 @@
 import os
-from sys import exit
+import json
+from sys import exit, prefix
 from dataclasses import dataclass
-from subprocess import check_call, run, CalledProcessError, PIPE
+from subprocess import check_call, run, CalledProcessError, PIPE, check_output
 from platform import python_version, python_version_tuple
 
 class Install:
@@ -24,13 +25,23 @@ class Install:
         venv_pip_executable: str
         venv_python_executable: str
 
+    @dataclass
+    class Package:
+        name: str = None
+        version: str = None
+
+    DB_PACKAGES: list[Package] = []
+
     def __init__(self) -> None:
 
         self.set_configuration()
 
         if self.skip_install:
+            self.check_packages_version()
             return None
 
+        self.check_packages_version()
+
         # Sinon tester les dependances python et les installer avec pip
         if self.do_install():
 
@@ -75,11 +86,13 @@ class Install:
 
         if not os.path.exists(os.path.join(self.config.defender_install_folder, 'core', 'configuration.json')):
             # If configuration file do not exist
-            exit("/!\\ Configuration file (configuration.json) doesn't exist /!\\")
+            exit("/!\\ Configuration file (core/configuration.json) doesn't exist! please create it /!\\")
 
         # Exclude Windows OS from the installation
         if os.name == 'nt':
-            #print('/!\\ Skip installation /!\\')
+            # If windows, modify pip and python virtual environment executable
+            self.config.venv_pip_executable = f'{os.path.join(defender_install_folder, venv_folder, "Scripts")}{os.sep}pip.exe'
+            self.config.venv_python_executable = f'{os.path.join(defender_install_folder, venv_folder, "Scripts")}{os.sep}python.exe'
             self.skip_install = True
             return False
 
@@ -91,7 +104,7 @@ class Install:
     def is_root(self) -> bool:
 
         if os.geteuid() != 0:
-            print('User without privileges ==> PASS')
+            print('> User without privileges ==> OK')
             return False
         elif os.geteuid() == 0:
             print('/!\\ Do not use root to install Defender /!\\')
@@ -123,6 +136,75 @@ class Install:
             print(f"Try to install dependencies ...")
             exit(5)
 
+    def get_packages_version_from_json(self) -> None:
+        """This will create Package model with package names and required version
+        """
+        try:
+            
+            version_filename = f'.{os.sep}version.json'
+            with open(version_filename, 'r') as version_data:
+                package_info:dict[str, str] = json.load(version_data)
+
+            for name, version in package_info.items():
+                if name == 'version':
+                    continue
+
+                self.DB_PACKAGES.append(
+                    self.Package(name=name, version=version)
+                    )
+
+            return None
+        except FileNotFoundError as fe:
+            print(f"File not found: {fe}")
+        except Exception as err:
+            print(f"General Error: {err}")
+
+    def check_packages_version(self) -> bool:
+
+        try:
+            newVersion = False
+            self.get_packages_version_from_json()
+            
+            if not self.config.venv_folder in prefix:
+                print(f"You are probably running a new installation or you are not using your virtual env {self.config.venv_folder}")
+                return newVersion
+
+            print(f"> Checking for dependencies versions ==> WAIT")
+            for package in self.DB_PACKAGES:
+                newVersion = False
+                required_version = package.version
+                installed_version = None
+
+                output = check_output([self.config.venv_pip_executable, 'show', package.name])
+                for line in output.decode().splitlines():
+                    if line.startswith('Version:'):
+                        installed_version = line.split(':')[1].strip()
+                        break
+
+                required_major, required_minor, required_patch = required_version.split('.')
+                installed_major, installed_minor, installed_patch = installed_version.split('.')
+
+                if required_major > installed_major:
+                    print(f'> New version of {package.name} is available {installed_version} ==> {required_version}')
+                    newVersion = True
+                elif required_major == installed_major and required_minor > installed_minor:
+                    print(f'> New version of {package.name} is available {installed_version} ==> {required_version}')
+                    newVersion = True
+                elif required_major == installed_major and required_minor == installed_minor and required_patch > installed_patch:
+                    print(f'> New version of {package.name} is available {installed_version} ==> {required_version}')
+                    newVersion = True
+
+                if newVersion:
+                    self.run_subprocess([self.config.venv_pip_executable, 'install', '--upgrade', package.name])
+
+            print(f"> Dependencies versions ==> OK")
+            return newVersion
+
+        except CalledProcessError:
+            print(f"/!\\ Package {package.name} not installed /!\\")
+        except Exception as err:
+            print(f"General Error: {err}")
+
     def check_python_version(self) -> bool:
         """Test si la version de python est autorisée ou non
 

core/irc.py

@@ -95,13 +95,15 @@ class Irc:
             return None
 
         except ssl.SSLEOFError as soe:
-            self.Base.logs.critical(f"SSLEOFError __create_socket: {soe} - {soc.fileno()}")
+            self.Base.logs.critical(f"SSLEOFError: {soe} - {soc.fileno()}")
         except ssl.SSLError as se:
-            self.Base.logs.critical(f"SSLError __create_socket: {se} - {soc.fileno()}")
+            self.Base.logs.critical(f"SSLError: {se} - {soc.fileno()}")
         except OSError as oe:
-            self.Base.logs.critical(f"OSError __create_socket: {oe} - {soc.fileno()}")
+            self.Base.logs.critical(f"OSError: {oe} - {soc.fileno()}")
+            if 'connection refused' in str(oe).lower():
+                sys.exit(oe)
         except AttributeError as ae:
-            self.Base.logs.critical(f"AttributeError __create_socket: {ae} - {soc.fileno()}")
+            self.Base.logs.critical(f"AttributeError: {ae} - {soc.fileno()}")
 
     def __ssl_context(self) -> ssl.SSLContext:
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
@@ -311,7 +313,7 @@ class Irc:
 
     def send_response(self, responses:list[bytes]) -> None:
         try:
-            # print(data)
+            # print(responses)
             for data in responses:
                 response = data.decode(self.CHARSET[0]).split()
                 self.cmd(response)
@@ -532,11 +534,61 @@ class Irc:
             self.Base.logs.error(f"General Error: {err}")
             return False
 
+    def reload_module(self, from_user: str, mod_name: str) -> bool:
+        try:
+            module_name = mod_name.lower()                       # ==> mod_defender
+            class_name = module_name.split('_')[1].capitalize()  # ==> Defender
+
+            if 'mods.' + module_name in sys.modules:
+                self.Base.logs.info('Unload the module ...')
+                self.loaded_classes[class_name].unload()
+                self.Base.logs.info('Module Already Loaded ... reloading the module ...')
+                the_module = sys.modules['mods.' + module_name]
+                importlib.reload(the_module)
+
+                # Supprimer la class déja instancier
+                if class_name in self.loaded_classes:
+                # Supprimer les commandes déclarer dans la classe
+                    for level, command in self.loaded_classes[class_name].commands_level.items():
+                        # Supprimer la commande de la variable commands
+                        for c in self.loaded_classes[class_name].commands_level[level]:
+                            self.commands.remove(c)
+                            self.commands_level[level].remove(c)
+
+                    del self.loaded_classes[class_name]
+
+                my_class = getattr(the_module, class_name, None)
+                new_instance = my_class(self.ircObject)
+                self.loaded_classes[class_name] = new_instance
+
+                self.Base.db_update_module(from_user, mod_name)
+                self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} :Module {module_name} rechargé")
+                return False
+            else:
+                self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} :Module {module_name} n'est pas chargé !")
+
+        except TypeError as te:
+            self.Base.logs.error(f"A TypeError raised: {te}")
+            self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} :A TypeError raised: {te}")
+            self.Base.db_delete_module(module_name)
+        except AttributeError as ae:
+            self.Base.logs.error(f"Missing Attribute: {ae}")
+            self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} :Missing Attribute: {ae}")
+            self.Base.db_delete_module(module_name)
+        except KeyError as ke:
+            self.Base.logs.error(f"Key Error: {ke}")
+            self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} :Key Error: {ke}")
+            self.Base.db_delete_module(module_name)
+        except Exception as e:
+            self.Base.logs.error(f"Something went wrong with a module you want to reload: {e}")
+            self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} :Something went wrong with the module: {e}")
+            self.Base.db_delete_module(module_name)
+
     def insert_db_admin(self, uid:str, level:int) -> None:
 
         if self.User.get_User(uid) is None:
             return None
-        
+
         getUser = self.User.get_User(uid)
 
         nickname = getUser.nickname
@@ -821,7 +873,7 @@ class Irc:
                             self.Base.logs.info(f"# CHANNEL  :    {self.Config.SERVICE_CHANLOG}   ")
                             self.Base.logs.info(f"# VERSION  :    {version}                       ")
                             self.Base.logs.info(f"################################################")
-                            
+
                             if self.Base.check_for_new_version(False):
                                 self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} : New Version available {version}")
 
@@ -829,6 +881,13 @@ class Irc:
                         self.sendPrivMsg(msg=f'[{self.Config.COLORS.green}INFORMATION{self.Config.COLORS.nogc}] >> Defender is ready', channel=self.Config.SERVICE_CHANLOG)
                         self.INIT = 0
 
+                        # Send EOF to other modules
+                        for classe_name, classe_object in self.loaded_classes.items():
+                            classe_object.cmd(original_response)
+
+                        # Stop here When EOS
+                        return None
+
                 case _:
                     pass
 
@@ -1003,7 +1062,8 @@ class Irc:
                             arg.remove(f':{self.Config.SERVICE_PREFIX}')
                             if not arg[0].lower() in self.commands:
                                 self.Base.logs.debug(f"This command {arg[0]} is not available")
-                                return False
+                                self.sendNotice(f"This command [{self.Config.COLORS.bold}{arg[0]}{self.Config.COLORS.bold}] is not available", user_trigger)
+                                return None
 
                             cmd_to_send = convert_to_string.replace(':','')
                             self.Base.log_cmd(user_trigger, cmd_to_send)
@@ -1039,7 +1099,7 @@ class Irc:
                                     ping_response = current_unixtime - recieved_unixtime
 
                                     self.send2socket(f'PONG :{recieved_unixtime}')
-                                    self.send2socket(f':{dnickname} NOTICE {user_trigger} :\x01PING {recieved_unixtime} secs\x01')
+                                    self.send2socket(f':{dnickname} NOTICE {user_trigger} :\x01PING {ping_response} secs\x01')
                                     return False
 
                                 if not arg[0].lower() in self.commands:
@@ -1348,14 +1408,21 @@ class Irc:
                             batch_commands = ' | '.join(groupe)
                             self.send2socket(f':{dnickname} NOTICE {fromuser} : {batch_commands}')
 
+                        self.send2socket(f':{dnickname} NOTICE {fromuser} : ')
+
                     count_level_definition += 1
-                    self.send2socket(f':{dnickname} NOTICE {fromuser} : ')
 
                 self.send2socket(f':{dnickname} NOTICE {fromuser} : ***************** FIN DES COMMANDES *****************')
 
             case 'load':
-
-                self.load_module(fromuser, str(cmd[1]))
+                try:
+                    # Load a module ex: .load mod_defender
+                    mod_name = str(cmd[1])
+                    self.load_module(fromuser, mod_name)
+                except KeyError as ke:
+                    self.Base.logs.error(f"Key Error: {ke} - list recieved: {cmd}")
+                except Exception as err:
+                    self.Base.logs.error(f"General Error: {ke} - list recieved: {cmd}")
 
             case 'unload':
                 # unload mod_defender
@@ -1366,50 +1433,10 @@ class Irc:
                     self.Base.logs.error(f"General Error: {err}")
 
             case 'reload':
-                # reload mod_dktmb
+                # reload mod_defender
                 try:
-                    module_name = str(cmd[1]).lower()                                          # ==> mod_defender
-                    class_name = module_name.split('_')[1].capitalize()                        # ==> Defender
-
-                    if 'mods.' + module_name in sys.modules:
-                        self.Base.logs.info('Unload the module ...')
-                        self.loaded_classes[class_name].unload()
-                        self.Base.logs.info('Module Already Loaded ... reloading the module ...')
-                        the_module = sys.modules['mods.' + module_name]
-                        importlib.reload(the_module)
-
-                        # Supprimer la class déja instancier
-                        if class_name in self.loaded_classes:
-                        # Supprimer les commandes déclarer dans la classe
-                            for level, command in self.loaded_classes[class_name].commands_level.items():
-                                # Supprimer la commande de la variable commands
-                                for c in self.loaded_classes[class_name].commands_level[level]:
-                                    self.commands.remove(c)
-                                    self.commands_level[level].remove(c)
-
-                            del self.loaded_classes[class_name]
-
-                        my_class = getattr(the_module, class_name, None)
-                        new_instance = my_class(self.ircObject)
-                        self.loaded_classes[class_name] = new_instance
-
-                        self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} :Module {module_name} rechargé")
-                        return False
-                    else:
-                        self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} :Module {module_name} n'est pas chargé !")
-
-                except TypeError as te:
-                    self.Base.logs.error(f"A TypeError raised: {te}")
-                    self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} :A TypeError raised: {te}")
-                    self.Base.db_delete_module(module_name)
-                except AttributeError as ae:
-                    self.Base.logs.error(f"Missing Attribute: {ae}")
-                    self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} :Missing Attribute: {ae}")
-                    self.Base.db_delete_module(module_name)
-                except KeyError as ke:
-                    self.Base.logs.error(f"Key Error: {ke}")
-                    self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} :Key Error: {ke}")
-                    self.Base.db_delete_module(module_name)
+                    module_name = str(cmd[1]).lower()   # ==> mod_defender
+                    self.reload_module(from_user=fromuser, mod_name=module_name)
                 except Exception as e:
                     self.Base.logs.error(f"Something went wrong with a module you want to reload: {e}")
                     self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} :Something went wrong with the module: {e}")
@@ -1460,24 +1487,24 @@ class Irc:
 
                 self.Base.logs.debug(self.loaded_classes)
                 all_modules  = self.Base.get_all_modules()
+                loaded = False
 
-                results = self.Base.db_execute_query(f'SELECT module_name FROM {self.Config.table_module}')
+                results = self.Base.db_execute_query(f'SELECT datetime, user, module_name FROM {self.Config.table_module}')
                 results = results.fetchall()
 
-                found = False
-
                 for module in all_modules:
                     for loaded_mod in results:
-                        if module == loaded_mod[0]:
-                            found = True
+                        if module == loaded_mod[2]:
+                            loaded_datetime = loaded_mod[0]
+                            loaded_user = loaded_mod[1]
+                            loaded = True
 
-                    if found:
-                        self.send2socket(f":{dnickname} NOTICE {fromuser} :{module} - {self.Config.COLORS.green}Loaded{self.Config.COLORS.nogc}")
+                    if loaded:
+                        self.send2socket(f":{dnickname} NOTICE {fromuser} :{module} - {self.Config.COLORS.green}Loaded{self.Config.COLORS.nogc} by {loaded_user} on {loaded_datetime}")
+                        loaded = False
                     else:
                         self.send2socket(f":{dnickname} NOTICE {fromuser} :{module} - {self.Config.COLORS.red}Not Loaded{self.Config.COLORS.nogc}")
 
-                    found = False
-
             case 'show_timers':
 
                 if self.Base.running_timers:

mods/mod_clone.py

@@ -60,6 +60,7 @@ class Clone():
 
         self.Base.db_query_channel(action='add', module_name=self.module_name, channel_name=self.Config.CLONE_CHANNEL)
         self.Irc.send2socket(f":{self.Config.SERVICE_NICKNAME} JOIN {self.Config.CLONE_CHANNEL}")
+        self.Irc.send2socket(f":{self.Config.SERVICE_NICKNAME} SAMODE {self.Config.CLONE_CHANNEL} +o {self.Config.SERVICE_NICKNAME}")
         self.Irc.send2socket(f":{self.Config.SERVICE_NICKNAME} MODE {self.Config.CLONE_CHANNEL} +nts")
         self.Irc.send2socket(f":{self.Config.SERVICE_NICKNAME} MODE {self.Config.CLONE_CHANNEL} +k {self.Config.CLONE_CHANNEL_PASSWORD}")
 
@@ -126,6 +127,8 @@ class Clone():
             self.Irc.send2socket(f':{self.Config.SERVICE_NICKNAME} PRIVMSG {clone} :KILL')
 
         self.Base.db_query_channel(action='del', module_name=self.module_name, channel_name=self.Config.CLONE_CHANNEL)
+        self.Irc.send2socket(f":{self.Config.SERVICE_NICKNAME} MODE {self.Config.CLONE_CHANNEL} -nts")
+        self.Irc.send2socket(f":{self.Config.SERVICE_NICKNAME} MODE {self.Config.CLONE_CHANNEL} -k {self.Config.CLONE_CHANNEL_PASSWORD}")
         self.Irc.send2socket(f":{self.Config.SERVICE_NICKNAME} PART {self.Config.CLONE_CHANNEL}")
         return None
 

mods/mod_command.py

@@ -150,6 +150,7 @@ class Command():
                 try:
                     message = ' '.join(cmd[3:])
                     self.Irc.send2socket(f":{dnickname} NOTICE {self.user_to_notice} :[{red}ERROR MSG{nogc}] {message}")
+                    self.Base.logs.error(f"{cmd[1]} - {message}")
                 except KeyError as ke:
                     self.Base.logs.error(ke)
                 except Exception as err:

mods/mod_defender.py

@@ -111,9 +111,6 @@ class Defender():
         self.__load_module_configuration()
         # End of mandatory methods you can start your customization #
 
-        # # Rejoindre les salons
-        # self.join_saved_channels()
-
         self.timeout = self.Config.API_TIMEOUT
 
         # Listes qui vont contenir les ip a scanner avec les différentes API
@@ -150,7 +147,8 @@ class Defender():
         self.Base.create_thread(func=self.thread_reputation_timer)
 
         if self.ModConfig.reputation == 1:
-            self.Irc.send2socket(f":{self.Config.SERVICE_ID} SAMODE {self.Config.SALON_JAIL} +{self.Config.SERVICE_UMODES} {self.Config.SERVICE_NICKNAME}")
+            self.Irc.send2socket(f":{self.Config.SERVEUR_ID} SJOIN {self.Base.get_unixtime()} {self.Config.SALON_JAIL} + :{self.Config.SERVICE_NICKNAME}")
+            self.Irc.send2socket(f":{self.Config.SERVICE_NICKNAME} SAMODE {self.Config.SALON_JAIL} +o {self.Config.SERVICE_NICKNAME}")
 
         return None
 
@@ -249,40 +247,6 @@ class Defender():
         self.reputationTimer_isRunning:bool = False
         return None
 
-    def add_defender_channel(self, channel:str) -> bool:
-        """Cette fonction ajoute les salons de join de Defender
-
-        Args:
-            channel (str): le salon à enregistrer.
-        """
-        mes_donnees = {'channel': channel}
-        response = self.Base.db_execute_query("SELECT id FROM def_channels WHERE channel = :channel", mes_donnees)
-        
-        isChannelExist = response.fetchone()
-
-        if isChannelExist is None:
-            mes_donnees = {'datetime': self.Base.get_datetime(), 'channel': channel}
-            insert = self.Base.db_execute_query(f"INSERT INTO def_channels (datetime, channel) VALUES (:datetime, :channel)", mes_donnees)
-            return True
-        else:
-            return False
-
-    def delete_defender_channel(self, channel:str) -> bool:
-        """Cette fonction supprime les salons de join de Defender
-
-        Args:
-            channel (str): le salon à enregistrer.
-        """
-        mes_donnes = {'channel': channel}
-        response = self.Base.db_execute_query("DELETE FROM def_channels WHERE channel = :channel", mes_donnes)
-        
-        affected_row = response.rowcount
-
-        if affected_row > 0:
-            return True
-        else:
-            return False
-
     def reputation_insert(self, reputationModel: ReputationModel) -> bool:
 
         response = False
@@ -372,7 +336,7 @@ class Defender():
 
     def join_saved_channels(self) -> None:
 
-        result = self.Base.db_execute_query("SELECT id, channel FROM def_channels")
+        result = self.Base.db_execute_query(f"SELECT distinct channel_name FROM {self.Config.table_channel}")
         channels = result.fetchall()
         jail_chan = self.Config.SALON_JAIL
         jail_chan_mode = self.Config.SALON_JAIL_MODES
@@ -383,7 +347,7 @@ class Defender():
         unixtime = self.Base.get_unixtime()
 
         for channel in channels:
-            id, chan = channel
+            chan = channel[0]
             self.Irc.send2socket(f":{self.Config.SERVEUR_ID} SJOIN {unixtime} {chan} + :{self.Config.SERVICE_ID}")
             if chan == jail_chan:
                 self.Irc.send2socket(f":{service_id} SAMODE {jail_chan} +{dumodes} {dnickname}")
@@ -1000,190 +964,206 @@ class Defender():
             self.Logs.error(f"Thread_cloudfilt_scan Error : {ve}")
 
     def cmd(self, data: list) -> None:
+        try:
+            service_id = self.Config.SERVICE_ID                 # Defender serveur id
+            cmd = list(data).copy()
 
-        service_id = self.Config.SERVICE_ID                 # Defender serveur id
-        cmd = list(data).copy()
+            match cmd[1]:
 
-        if len(cmd) < 2:
-            return None
+                case 'REPUTATION':
+                    # :001 REPUTATION 91.168.141.239 118
+                    try:
+                        self.reputation_first_connexion['ip'] = cmd[2]
+                        self.reputation_first_connexion['score'] = cmd[3]
+                        if str(cmd[3]).find('*') != -1:
+                            # If the reputation changed, we do not need to scan the IP
+                            return None
 
-        match cmd[1]:
+                        if not self.Base.is_valid_ip(cmd[2]):
+                            return None
 
-            case 'EOS':
-                if self.Irc.INIT == 0:
-                    self.Irc.send2socket(f":{service_id} SAMODE {self.Config.SALON_JAIL} +{self.Config.SERVICE_UMODES} {self.Config.SERVICE_NICKNAME}")
+                        # Possibilité de déclancher les bans a ce niveau.
+                    except IndexError as ie:
+                        self.Logs.error(f'cmd reputation: index error: {ie}')
 
-            case 'REPUTATION':
-                # :001 REPUTATION 91.168.141.239 118
-                try:
-                    self.reputation_first_connexion['ip'] = cmd[2]
-                    self.reputation_first_connexion['score'] = cmd[3]
-                    if str(cmd[3]).find('*') != -1:
-                        # If the reputation changed, we do not need to scan the IP
+            if len(cmd) < 3:
+                return None
+
+            match cmd[2]:
+
+                case 'MODE':
+                    # ['...', ':001XSCU0Q', 'MODE', '#jail', '+b', '~security-group:unknown-users']
+                    channel = str(cmd[3])
+                    mode = str(cmd[4])
+                    group_to_check = str(cmd[5:])
+                    group_to_unban = '~security-group:unknown-users'
+
+                    if self.Config.SALON_JAIL == channel:
+                        if mode == '+b' and group_to_unban in group_to_check:
+                            self.Irc.send2socket(f":{service_id} MODE {self.Config.SALON_JAIL} -b ~security-group:unknown-users")
+                            self.Irc.send2socket(f":{service_id} MODE {self.Config.SALON_JAIL} -eee ~security-group:webirc-users ~security-group:known-users ~security-group:websocket-users")
+
+                case 'PRIVMSG':
+                    cmd.pop(0)
+                    user_trigger = str(cmd[0]).replace(':','')
+                    channel = cmd[2]
+                    find_nickname = self.User.get_nickname(user_trigger)
+                    self.flood(find_nickname, channel)
+
+                case 'UID':
+                    # If Init then do nothing
+                    if self.Irc.INIT == 1:
                         return None
 
-                    if not self.Base.is_valid_ip(cmd[2]):
-                        return None
+                    # Supprimer la premiere valeur et finir le code normalement
+                    cmd.pop(0)
 
-                    # Possibilité de déclancher les bans a ce niveau.
-                except IndexError as ie:
-                    self.Logs.error(f'cmd reputation: index error: {ie}')
+                    # Get User information
+                    _User = self.User.get_User(str(cmd[7]))
 
-        match cmd[2]:
-
-            case 'PRIVMSG':
-                cmd.pop(0)
-                user_trigger = str(cmd[0]).replace(':','')
-                channel = cmd[2]
-                find_nickname = self.User.get_nickname(user_trigger)
-                self.flood(find_nickname, channel)
-
-            case 'UID':
-                # If Init then do nothing
-                if self.Irc.INIT == 1:
-                    return None
-
-                # Supprimer la premiere valeur et finir le code normalement
-                cmd.pop(0)
-
-                # Get User information
-                _User = self.User.get_User(str(cmd[7]))
-
-                # If user is not service or IrcOp then scan them
-                if not re.match(fr'^.*[S|o?].*$', _User.umodes):
-                    self.abuseipdb_UserModel.append(_User) if self.ModConfig.abuseipdb_scan == 1 and not _User.remote_ip in self.Config.WHITELISTED_IP else None
-                    self.freeipapi_UserModel.append(_User) if self.ModConfig.freeipapi_scan == 1 and not _User.remote_ip in self.Config.WHITELISTED_IP else None
-                    self.cloudfilt_UserModel.append(_User) if self.ModConfig.cloudfilt_scan == 1 and not _User.remote_ip in self.Config.WHITELISTED_IP else None
-                    self.psutil_UserModel.append(_User) if self.ModConfig.psutil_scan == 1 and not _User.remote_ip in self.Config.WHITELISTED_IP else None
-                    self.localscan_UserModel.append(_User) if self.ModConfig.local_scan == 1 and not _User.remote_ip in self.Config.WHITELISTED_IP else None
-
-                if _User is None:
-                    self.Logs.critical(f'This UID: [{cmd[7]}] is not available please check why')
-                    return None
-
-                reputation_flag = self.ModConfig.reputation
-                reputation_seuil = self.ModConfig.reputation_seuil
-
-                if self.Irc.INIT == 0:
-                    # Si le user n'es pas un service ni un IrcOP
+                    # If user is not service or IrcOp then scan them
                     if not re.match(fr'^.*[S|o?].*$', _User.umodes):
-                        if reputation_flag == 1 and _User.score_connexion <= reputation_seuil:
-                            currentDateTime = self.Base.get_datetime()
-                            self.reputation_insert(
-                                self.ReputationModel(
-                                    uid=_User.uid, nickname=_User.nickname, username=_User.username, realname=_User.realname, 
-                                    hostname=_User.hostname, umodes=_User.umodes, vhost=_User.vhost, ip=_User.remote_ip, score=_User.score_connexion,
-                                    secret_code=self.Base.get_random(8), isWebirc=_User.isWebirc, isWebsocket=_User.isWebsocket, connected_datetime=currentDateTime,
-                                    updated_datetime=currentDateTime
+                        self.abuseipdb_UserModel.append(_User) if self.ModConfig.abuseipdb_scan == 1 and not _User.remote_ip in self.Config.WHITELISTED_IP else None
+                        self.freeipapi_UserModel.append(_User) if self.ModConfig.freeipapi_scan == 1 and not _User.remote_ip in self.Config.WHITELISTED_IP else None
+                        self.cloudfilt_UserModel.append(_User) if self.ModConfig.cloudfilt_scan == 1 and not _User.remote_ip in self.Config.WHITELISTED_IP else None
+                        self.psutil_UserModel.append(_User) if self.ModConfig.psutil_scan == 1 and not _User.remote_ip in self.Config.WHITELISTED_IP else None
+                        self.localscan_UserModel.append(_User) if self.ModConfig.local_scan == 1 and not _User.remote_ip in self.Config.WHITELISTED_IP else None
+
+                    if _User is None:
+                        self.Logs.critical(f'This UID: [{cmd[7]}] is not available please check why')
+                        return None
+
+                    reputation_flag = self.ModConfig.reputation
+                    reputation_seuil = self.ModConfig.reputation_seuil
+
+                    if self.Irc.INIT == 0:
+                        # Si le user n'es pas un service ni un IrcOP
+                        if not re.match(fr'^.*[S|o?].*$', _User.umodes):
+                            if reputation_flag == 1 and _User.score_connexion <= reputation_seuil:
+                                currentDateTime = self.Base.get_datetime()
+                                self.reputation_insert(
+                                    self.ReputationModel(
+                                        uid=_User.uid, nickname=_User.nickname, username=_User.username, realname=_User.realname, 
+                                        hostname=_User.hostname, umodes=_User.umodes, vhost=_User.vhost, ip=_User.remote_ip, score=_User.score_connexion,
+                                        secret_code=self.Base.get_random(8), isWebirc=_User.isWebirc, isWebsocket=_User.isWebsocket, connected_datetime=currentDateTime,
+                                        updated_datetime=currentDateTime
+                                    )
                                 )
-                            )
-                            # self.Irc.send2socket(f":{service_id} WHOIS {nickname}")
-                            if self.reputation_check(_User.uid):
-                                if reputation_flag == 1 and _User.score_connexion <= reputation_seuil:
-                                    self.system_reputation(_User.uid)
-                                    self.Logs.info('Démarrer le systeme de reputation')
+                                # self.Irc.send2socket(f":{service_id} WHOIS {nickname}")
+                                if self.reputation_check(_User.uid):
+                                    if reputation_flag == 1 and _User.score_connexion <= reputation_seuil:
+                                        self.system_reputation(_User.uid)
+                                        self.Logs.info('Démarrer le systeme de reputation')
 
-            case 'SJOIN':
-                # ['@msgid=F9B7JeHL5pj9nN57cJ5pEr;time=2023-12-28T20:47:24.305Z', ':001', 'SJOIN', '1702138958', '#welcome', ':0015L1AHL']
-                try:
+                case 'SJOIN':
+                    # ['@msgid=F9B7JeHL5pj9nN57cJ5pEr;time=2023-12-28T20:47:24.305Z', ':001', 'SJOIN', '1702138958', '#welcome', ':0015L1AHL']
+                    try:
+                        cmd.pop(0)
+                        parsed_chan = cmd[3]
+
+                        if self.ModConfig.reputation == 1:
+                            parsed_UID = cmd[4]
+                            pattern = fr'^:[@|%|\+|~|\*]*'
+                            parsed_UID = re.sub(pattern, '', parsed_UID)
+
+                            get_reputation = self.reputation_get_Reputation(parsed_UID)
+
+                            if parsed_chan != self.Config.SALON_JAIL:
+                                self.Irc.send2socket(f":{service_id} MODE {parsed_chan} +b ~security-group:unknown-users")
+                                self.Irc.send2socket(f":{service_id} MODE {parsed_chan} +eee ~security-group:webirc-users ~security-group:known-users ~security-group:websocket-users")
+
+                            if not get_reputation is None:
+                                isWebirc = get_reputation.isWebirc
+
+                                if not isWebirc:
+                                    if parsed_chan != self.Config.SALON_JAIL:
+                                        self.Irc.send2socket(f":{service_id} SAPART {get_reputation.nickname} {parsed_chan}")
+
+                                if self.ModConfig.reputation_ban_all_chan == 1 and not isWebirc:
+                                    if parsed_chan != self.Config.SALON_JAIL:
+                                        self.Irc.send2socket(f":{service_id} MODE {parsed_chan} +b {get_reputation.nickname}!*@*")
+                                        self.Irc.send2socket(f":{service_id} KICK {parsed_chan} {get_reputation.nickname}")
+
+                            self.Logs.debug(f'SJOIN parsed_uid : {parsed_UID}')
+                    except KeyError as ke:
+                        self.Logs.error(f"key error SJOIN : {ke}")
+
+                case 'SLOG':
+                    # self.Base.scan_ports(cmd[7])
                     cmd.pop(0)
-                    parsed_chan = cmd[3]
 
-                    if self.ModConfig.reputation == 1:
-                        parsed_UID = cmd[4]
-                        pattern = fr'^:[@|%|\+|~|\*]*'
-                        parsed_UID = re.sub(pattern, '', parsed_UID)
+                    if not self.Base.is_valid_ip(cmd[7]):
+                        return None
 
-                        get_reputation = self.reputation_get_Reputation(parsed_UID)
+                    # if self.ModConfig.local_scan == 1 and not cmd[7] in self.Config.WHITELISTED_IP:
+                    #     self.localscan_remote_ip.append(cmd[7])
 
-                        self.Irc.send2socket(f":{service_id} MODE {parsed_chan} +b ~security-group:unknown-users")
-                        self.Irc.send2socket(f":{service_id} MODE {parsed_chan} +eee ~security-group:webirc-users ~security-group:known-users ~security-group:websocket-users")
+                    # if self.ModConfig.psutil_scan == 1 and not cmd[7] in self.Config.WHITELISTED_IP:
+                    #     self.psutil_remote_ip.append(cmd[7])
 
-                        if not get_reputation is None:
-                            isWebirc = get_reputation.isWebirc
+                    # if self.ModConfig.abuseipdb_scan == 1 and not cmd[7] in self.Config.WHITELISTED_IP:
+                    #     self.abuseipdb_remote_ip.append(cmd[7])
 
-                            if not isWebirc:
-                                if parsed_chan != self.Config.SALON_JAIL:
-                                    self.Irc.send2socket(f":{service_id} SAPART {get_reputation.nickname} {parsed_chan}")
+                    # if self.ModConfig.freeipapi_scan == 1 and not cmd[7] in self.Config.WHITELISTED_IP:
+                    #     self.freeipapi_remote_ip.append(cmd[7])
 
-                            if self.ModConfig.reputation_ban_all_chan == 1 and not isWebirc:
-                                if parsed_chan != self.Config.SALON_JAIL:
-                                    self.Irc.send2socket(f":{service_id} MODE {parsed_chan} +b {get_reputation.nickname}!*@*")
-                                    self.Irc.send2socket(f":{service_id} KICK {parsed_chan} {get_reputation.nickname}")
+                    # if self.ModConfig.cloudfilt_scan == 1 and not cmd[7] in self.Config.WHITELISTED_IP:
+                    #     self.cloudfilt_remote_ip.append(cmd[7])
 
-                        self.Logs.debug(f'SJOIN parsed_uid : {parsed_UID}')
-                except KeyError as ke:
-                    self.Logs.error(f"key error SJOIN : {ke}")
+                case 'NICK':
+                    # :0010BS24L NICK [NEWNICK] 1697917711
+                    # Changement de nickname
+                    try:
+                        cmd.pop(0)
+                        uid = str(cmd[0]).replace(':','')
+                        get_Reputation = self.reputation_get_Reputation(uid)
+                        jail_salon = self.Config.SALON_JAIL
+                        service_id = self.Config.SERVICE_ID
 
-            case 'SLOG':
-                # self.Base.scan_ports(cmd[7])
-                cmd.pop(0)
+                        if get_Reputation is None:
+                            self.Logs.debug(f'This UID: {uid} is not listed in the reputation dataclass')
+                            return None
 
-                if not self.Base.is_valid_ip(cmd[7]):
-                    return None
+                        # Update the new nickname
+                        oldnick = get_Reputation.nickname
+                        newnickname = cmd[2]
+                        get_Reputation.nickname = newnickname
 
-                # if self.ModConfig.local_scan == 1 and not cmd[7] in self.Config.WHITELISTED_IP:
-                #     self.localscan_remote_ip.append(cmd[7])
+                        # If ban in all channel is ON then unban old nickname an ban the new nickname
+                        if self.ModConfig.reputation_ban_all_chan == 1:
+                            for chan in self.Channel.UID_CHANNEL_DB:
+                                if chan.name != jail_salon:
+                                    self.Irc.send2socket(f":{service_id} MODE {chan.name} -b {oldnick}!*@*")
+                                    self.Irc.send2socket(f":{service_id} MODE {chan.name} +b {newnickname}!*@*")
 
-                # if self.ModConfig.psutil_scan == 1 and not cmd[7] in self.Config.WHITELISTED_IP:
-                #     self.psutil_remote_ip.append(cmd[7])
+                    except KeyError as ke:
+                        self.Logs.error(f'cmd - NICK - KeyError: {ke}')
 
-                # if self.ModConfig.abuseipdb_scan == 1 and not cmd[7] in self.Config.WHITELISTED_IP:
-                #     self.abuseipdb_remote_ip.append(cmd[7])
-
-                # if self.ModConfig.freeipapi_scan == 1 and not cmd[7] in self.Config.WHITELISTED_IP:
-                #     self.freeipapi_remote_ip.append(cmd[7])
-
-                # if self.ModConfig.cloudfilt_scan == 1 and not cmd[7] in self.Config.WHITELISTED_IP:
-                #     self.cloudfilt_remote_ip.append(cmd[7])
-
-            case 'NICK':
-                # :0010BS24L NICK [NEWNICK] 1697917711
-                # Changement de nickname
-                try:
+                case 'QUIT':
+                    # :001N1WD7L QUIT :Quit: free_znc_1
                     cmd.pop(0)
-                    uid = str(cmd[0]).replace(':','')
-                    get_Reputation = self.reputation_get_Reputation(uid)
+                    ban_all_chan = self.Base.int_if_possible(self.ModConfig.reputation_ban_all_chan)
+                    user_id = str(cmd[0]).replace(':','')
+                    final_UID = user_id
+
                     jail_salon = self.Config.SALON_JAIL
                     service_id = self.Config.SERVICE_ID
 
-                    if get_Reputation is None:
-                        self.Logs.debug(f'This UID: {uid} is not listed in the reputation dataclass')
-                        return None
+                    get_user_reputation = self.reputation_get_Reputation(final_UID)
 
-                    # Update the new nickname
-                    oldnick = get_Reputation.nickname
-                    newnickname = cmd[2]
-                    get_Reputation.nickname = newnickname
-
-                    # If ban in all channel is ON then unban old nickname an ban the new nickname
-                    if self.ModConfig.reputation_ban_all_chan == 1:
+                    if not get_user_reputation is None:
+                        final_nickname = get_user_reputation.nickname
                         for chan in self.Channel.UID_CHANNEL_DB:
-                            if chan.name != jail_salon:
-                                self.Irc.send2socket(f":{service_id} MODE {chan.name} -b {oldnick}!*@*")
-                                self.Irc.send2socket(f":{service_id} MODE {chan.name} +b {newnickname}!*@*")
+                            if chan.name != jail_salon and ban_all_chan == 1:
+                                self.Irc.send2socket(f":{service_id} MODE {chan.name} -b {final_nickname}!*@*")
+                        self.reputation_delete(final_UID)
 
-                except KeyError as ke:
-                    self.Logs.error(f'cmd - NICK - KeyError: {ke}')
-
-            case 'QUIT':
-                # :001N1WD7L QUIT :Quit: free_znc_1
-                cmd.pop(0)
-                ban_all_chan = self.Base.int_if_possible(self.ModConfig.reputation_ban_all_chan)
-                user_id = str(cmd[0]).replace(':','')
-                final_UID = user_id
-
-                jail_salon = self.Config.SALON_JAIL
-                service_id = self.Config.SERVICE_ID
-
-                get_user_reputation = self.reputation_get_Reputation(final_UID)
-
-                if not get_user_reputation is None:
-                    final_nickname = get_user_reputation.nickname
-                    for chan in self.Channel.UID_CHANNEL_DB:
-                        if chan.name != jail_salon and ban_all_chan == 1:
-                            self.Irc.send2socket(f":{service_id} MODE {chan.name} -b {final_nickname}!*@*")
-                    self.reputation_delete(final_UID)
+        except KeyError as ke:
+            self.Logs.error(f"{ke} / {cmd} / length {str(len(cmd))}")
+        except IndexError as ie:
+            self.Logs.error(f"{ie} / {cmd} / length {str(len(cmd))}")
+        except Exception as err:
+            self.Logs.error(f"General Error: {err}")
 
     def _hcmds(self, user:str, channel: any, cmd: list, fullcmd: list = []) -> None:
 

mods/mod_jsonrpc.py

@@ -59,10 +59,21 @@ class Jsonrpc():
         self.__load_module_configuration()
         # End of mandatory methods you can start your customization #
 
-        self.UnrealIrcdRpcLive: Live = Live(path_to_socket_file=self.Config.JSONRPC_PATH_TO_SOCKET_FILE,
-                       callback_object_instance=self,
-                       callback_method_name='callback_sent_to_irc'
-                       )
+        # self.UnrealIrcdRpcLive: Live = Live(
+        #                 req_method='unixsocket',
+        #                 path_to_socket_file=self.Config.JSONRPC_PATH_TO_SOCKET_FILE,
+        #                 callback_object_instance=self,
+        #                 callback_method_name='callback_sent_to_irc'
+        #                )
+
+        self.UnrealIrcdRpcLive: Live = Live(
+                    req_method='websocket',
+                    url=self.Config.JSONRPC_URL,
+                    username=self.Config.JSONRPC_USER,
+                    password=self.Config.JSONRPC_PASSWORD,
+                    callback_object_instance=self,
+                    callback_method_name='callback_sent_to_irc'
+                    )
 
         self.Rpc: Loader = Loader(
             req_method=self.Config.JSONRPC_METHOD,
@@ -251,6 +262,9 @@ class Jsonrpc():
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :VHOST                : {UserInfo.user.vhost}')
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CLIENT PORT          : {UserInfo.client_port}')
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :SERVER PORT          : {UserInfo.server_port}')
+                            
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CERTFP               : {UserInfo.tls.certfp}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CIPHER               : {UserInfo.tls.cipher}')
 
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :IDLE SINCE           : {UserInfo.idle_since}')
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CONNECTED SINCE      : {UserInfo.connected_since}')

mods/mod_test.py

@@ -124,8 +124,16 @@ class Test():
         return None
 
     def cmd(self, data:list) -> None:
+        try:
+            cmd = list(data).copy()
 
-        return None
+            return None
+        except KeyError as ke:
+            self.Base.logs.error(f"Key Error: {ke}")
+        except IndexError as ie:
+            self.Base.logs.error(f"{ie} / {cmd} / length {str(len(cmd))}")
+        except Exception as err:
+            self.Base.logs.error(f"General Error: {err}")
 
     def _hcmds(self, user:str, channel: any, cmd: list, fullcmd: list = []) -> None:
 

mods/mod_votekick.py

@@ -242,15 +242,16 @@ class Votekick():
         return None
 
     def cmd(self, data:list) -> None:
-        cmd = list(data).copy()
+        try:
+            cmd = list(data).copy()
+            return None
 
-        match cmd[2]:
-            case 'SJOIN':
-                pass
-            case _:
-                pass
-
-        return None
+        except KeyError as ke:
+            self.Base.logs.error(f"Key Error: {ke}")
+        except IndexError as ie:
+            self.Base.logs.error(f"{ie} / {cmd} / length {str(len(cmd))}")
+        except Exception as err:
+            self.Base.logs.error(f"General Error: {err}")
 
     def _hcmds(self, user:str, channel: any, cmd: list, fullcmd: list = []) -> None:
         # cmd is the command starting from the user command

version.json

@@ -1,3 +1,9 @@
 {
-    "version": "5.3.4"
+    "version": "5.3.9",
+
+    "requests": "2.32.3",
+    "psutil": "6.0.0",
+    "unrealircd_rpc_py": "1.0.6",
+    "sqlalchemy": "2.0.35",
+    "faker": "30.1.0"
 }