Mise en forme du code

core/base.py

@@ -32,7 +32,7 @@ class Base:
 
         self.db_create_first_admin()                            # Créer un nouvel admin si la base de données est vide
 
-    def get_unixtime(self)->int:
+    def get_unixtime(self) -> int:
         """
         Cette fonction retourne un UNIXTIME de type 12365456
         Return: Current time in seconds since the Epoch (int)
@@ -40,7 +40,7 @@ class Base:
         unixtime = int( time.time() )
         return unixtime
 
-    def get_datetime(self)->str:
+    def get_datetime(self) -> str:
         """
         Retourne une date au format string (24-12-2023 20:50:59)
         """
@@ -137,7 +137,7 @@ class Base:
                                   (:createdOn, :user, :password, :hostname, :vhost, :level)"""
                                   , mes_donnees)
 
-        pass
+        return None
 
     def create_timer(self, time_to_wait: float, func: object, func_args: tuple = ()) -> None:
 
@@ -243,7 +243,7 @@ class Base:
             self.running_sockets.remove(soc)
             print(f"> Socket ==> closed {str(soc.fileno())}")
 
-        pass
+        return None
 
     def db_init(self) -> tuple[Engine, Connection]:
 

core/irc.py

@@ -1,6 +1,6 @@
 import ssl, re, importlib, sys, time, threading, socket
 from datetime import datetime, timedelta
-
+from typing import Union
 from core.configuration import Config
 from core.base import Base
 
@@ -130,7 +130,6 @@ class Irc:
         Args:
             writer (StreamWriter): permet l'envoi des informations au serveur.
         """
-
         nickname = self.Config.SERVICE_NICKNAME
         username = self.Config.SERVICE_USERNAME
         realname = self.Config.SERVICE_REALNAME
@@ -151,8 +150,6 @@ class Irc:
         unixtime = self.Base.get_unixtime()
 
         # Envoyer un message d'identification
-        # strtobytes = bytes(":" + sid + " PASS :" + password + "\r\n", 'utf-8')
-        # self.IrcSocket.send(strtobytes)
         writer.send(f":{sid} PASS :{password}\r\n".encode('utf-8'))
         writer.send(f":{sid} PROTOCTL NICKv2 VHP UMODE2 NICKIP SJOIN SJOIN2 SJ3 NOQUIT TKLEXT MLOCK SID MTAGS\r\n".encode('utf-8'))
         writer.send(f":{sid} PROTOCTL EAUTH={link},,,{service_name}-v{version}\r\n".encode('utf-8'))
@@ -164,11 +161,9 @@ class Irc:
         writer.send(f":{sid} MODE {chan} +{cmodes}\r\n".encode('utf-8'))
         writer.send(f":{service_id} SAMODE {chan} +{umodes} {nickname}\r\n".encode('utf-8'))
 
-        # writer.write(f"USER {nickname} {username} {username} {nickname} {username} :{username}\r\n".encode('utf-8'))
+        return None
-        # writer.write(f"USER {username} {username} {username} :{username}\r\n".encode('utf-8'))
-        # writer.write(f"NICK {nickname}\r\n".encode('utf-8'))
 
-    def send2socket(self, send_message:str)->None:
+    def send2socket(self, send_message:str) -> None:
         """Envoit les commandes à envoyer au serveur.
 
         Args:
@@ -207,6 +202,7 @@ class Irc:
     ##############################################
     #             FIN CONNEXION IRC              #
     ##############################################
+
     def load_existing_modules(self) -> None:
         """Charge les modules qui existe déja dans la base de données
 
@@ -219,7 +215,7 @@ class Irc:
 
         return None
 
-    def get_defender_uptime(self)->str:
+    def get_defender_uptime(self) -> str:
         """Savoir depuis quand Defender est connecté
 
         Returns:
@@ -431,8 +427,6 @@ class Irc:
         vhost = self.db_uid[uid]['vhost']
         level = int(level)
 
-        
-
         self.db_admin[uid] = {
             'nickname': nickname,
             'username': username,
@@ -535,7 +529,7 @@ class Irc:
             self.debug(response)
             return response
 
-    def get_uid(self, uidornickname:str) -> str | None:
+    def get_uid(self, uidornickname:str) -> Union[str, None]:
 
         uid_recherche = uidornickname
         response = None
@@ -548,7 +542,7 @@ class Irc:
 
         return response
 
-    def get_nickname(self, uidornickname:str) -> str | None:
+    def get_nickname(self, uidornickname:str) -> Union[str, None]:
 
         nickname_recherche = uidornickname
 

mods/mod_defender.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from typing import Union
 import re, socket, psutil, requests, json
 from core.irc import Irc
 
@@ -355,7 +356,7 @@ class Defender():
 
         return uptime_minutes
 
-    def system_reputation(self, uid:str)->None:
+    def system_reputation(self, uid:str)-> None:
         # Reputation security
         # - Activation ou désactivation du système --> OK
         # - Le user sera en mesure de changer la limite de la réputation --> OK
@@ -578,7 +579,7 @@ class Defender():
 
         return matching_ports
 
-    def abuseipdb_scan(self, remote_ip:str) -> dict[str, any] | None:
+    def abuseipdb_scan(self, remote_ip:str) -> Union[dict[str, any], None]:
         """Analyse l'ip avec AbuseIpDB
            Cette methode devra etre lancer toujours via un thread ou un timer.
         Args:
@@ -635,7 +636,7 @@ class Defender():
         except KeyError as ke:
             self.Irc.debug(f"AbuseIpDb KeyError : {ke}")
 
-    def freeipapi_scan(self, remote_ip:str) -> dict[str, any] | None:
+    def freeipapi_scan(self, remote_ip:str) -> Union[dict[str, any], None]:
         """Analyse l'ip avec Freeipapi
            Cette methode devra etre lancer toujours via un thread ou un timer.
         Args:
@@ -807,6 +808,9 @@ class Defender():
                 if self.defConfig['abuseipdb_scan'] == 1:
                     self.Base.create_thread(self.abuseipdb_scan, (cmd[7], ))
 
+                if self.defConfig['freeipapi_scan'] == 1:
+                    self.Base.create_thread(self.freeipapi_scan, (cmd[7], ))
+
             case 'NICK':
                 # :0010BS24L NICK [NEWNICK] 1697917711
                 # Changement de nickname