From a043a58f452a4b344d8515e40b8cde780ff3a476 Mon Sep 17 00:00:00 2001 From: adator <85586985+adator85@users.noreply.github.com> Date: Sat, 18 Oct 2025 20:49:21 +0200 Subject: [PATCH] Update to the 3.0.0 V --- core/classes/admin.py | 5 + core/classes/channel.py | 19 +- core/classes/client.py | 20 +- core/classes/commands.py | 4 + core/classes/protocols/command_handler.py | 6 + core/classes/protocols/factory.py | 5 + core/classes/protocols/inspircd.py | 418 +++++++++++----------- core/classes/protocols/interface.py | 144 ++++---- core/classes/protocols/unreal6.py | 53 +-- core/classes/rehash.py | 21 +- core/classes/reputation.py | 9 +- core/classes/sasl.py | 11 +- core/classes/settings.py | 6 +- core/classes/translation.py | 6 +- core/irc.py | 2 +- core/module.py | 1 + mods/jsonrpc/mod_jsonrpc.py | 93 ++--- mods/jsonrpc/threads.py | 27 +- 18 files changed, 435 insertions(+), 415 deletions(-) diff --git a/core/classes/admin.py b/core/classes/admin.py index 5ff95d8..7479e36 100644 --- a/core/classes/admin.py +++ b/core/classes/admin.py @@ -9,6 +9,11 @@ class Admin: UID_ADMIN_DB: list[MAdmin] = [] def __init__(self, loader: 'Loader') -> None: + """ + + Args: + loader (Loader): The Loader Instance. + """ self.Logs = loader.Logs self.Base = loader.Base self.Setting = loader.Settings diff --git a/core/classes/channel.py b/core/classes/channel.py index 76acb11..0bcb0fb 100644 --- a/core/classes/channel.py +++ b/core/classes/channel.py @@ -11,14 +11,16 @@ class Channel: """List that contains all the Channels objects (ChannelModel) """ - def __init__(self, loader: 'Loader') -> None: + def __init__(self, loader: 'Loader'): + """ + Args: + loader (Loader): The Loader Instance + """ self.Logs = loader.Logs self.Base = loader.Base self.Utils = loader.Utils - return None - def insert(self, new_channel: 'MChannel') -> bool: """This method will insert a new channel and if the channel exist it will update the user list (uids) @@ -110,6 +112,7 @@ class Channel: return result except ValueError as ve: self.Logs.error(f'{ve}') + return False def delete_user_from_all_channel(self, uid:str) -> bool: """Delete a client from all channels @@ -134,6 +137,7 @@ class Channel: return result except ValueError as ve: self.Logs.error(f'{ve}') + return False def add_user_to_a_channel(self, channel_name: str, uid: str) -> bool: """Add a client to a channel @@ -226,16 +230,18 @@ class Channel: return False pattern = fr'^#' - isChannel = findall(pattern, channel_to_check) + is_channel = findall(pattern, channel_to_check) - if not isChannel: + if not is_channel: return False else: return True except TypeError as te: self.Logs.error(f'TypeError: [{channel_to_check}] - {te}') + return False except Exception as err: self.Logs.error(f'Error Not defined: {err}') + return False def db_query_channel(self, action: Literal['add','del'], module_name: str, channel_name: str) -> bool: """You can add a channel or delete a channel. @@ -282,8 +288,7 @@ class Channel: else: return False - case _: - return False except Exception as err: self.Logs.error(err) + return False diff --git a/core/classes/client.py b/core/classes/client.py index f7afb41..2ea01c3 100644 --- a/core/classes/client.py +++ b/core/classes/client.py @@ -10,7 +10,11 @@ class Client: CLIENT_DB: list['MClient'] = [] def __init__(self, loader: 'Loader'): + """ + Args: + loader (Loader): The Loader instance. + """ self.Logs = loader.Logs self.Base = loader.Base @@ -34,12 +38,12 @@ class Client: return True - def update_nickname(self, uid: str, newNickname: str) -> bool: + def update_nickname(self, uid: str, new_nickname: str) -> bool: """Update the nickname starting from the UID Args: uid (str): UID of the user - newNickname (str): New nickname + new_nickname (str): New nickname Returns: bool: True if updated @@ -49,7 +53,7 @@ class Client: if user_obj is None: return False - user_obj.nickname = newNickname + user_obj.nickname = new_nickname return True @@ -181,7 +185,7 @@ class Client: return client_obj.to_dict() - def is_exist(self, uidornikname: str) -> bool: + def is_exist(self, uidornickname: str) -> bool: """Check if the UID or the nickname exist in the USER DB Args: @@ -190,7 +194,7 @@ class Client: Returns: bool: True if exist """ - user_obj = self.get_Client(uidornickname=uidornikname) + user_obj = self.get_Client(uidornickname=uidornickname) if user_obj is None: return False @@ -231,9 +235,9 @@ class Client: """ pattern = fr'[:|@|%|\+|~|\*]*' - parsed_UID = sub(pattern, '', uid) + parsed_uid = sub(pattern, '', uid) - if not parsed_UID: + if not parsed_uid: return None - return parsed_UID \ No newline at end of file + return parsed_uid \ No newline at end of file diff --git a/core/classes/commands.py b/core/classes/commands.py index f47bef4..29863a9 100644 --- a/core/classes/commands.py +++ b/core/classes/commands.py @@ -9,6 +9,10 @@ class Command: DB_COMMANDS: list['MCommand'] = [] def __init__(self, loader: 'Loader'): + """ + Args: + loader (Loader): The Loader instance. + """ self.Loader = loader self.Base = loader.Base self.Logs = loader.Logs diff --git a/core/classes/protocols/command_handler.py b/core/classes/protocols/command_handler.py index b06b9e6..4c02d93 100644 --- a/core/classes/protocols/command_handler.py +++ b/core/classes/protocols/command_handler.py @@ -10,6 +10,11 @@ class CommandHandler: DB_SUBSCRIBE: list = [] def __init__(self, loader: 'Loader'): + """Init method + + Args: + loader (Loader): The loader Object + """ self.__Logs = loader.Logs def register(self, ircd_command_model: 'MIrcdCommand') -> None: @@ -25,6 +30,7 @@ class CommandHandler: return None else: self.__Logs.debug(f'[IRCD COMMAND HANDLER] This IRCD command ({ircd_command.command_name}) already exist in the handler.') + return None def get_registred_ircd_command(self, command_name: str) -> Optional['MIrcdCommand']: """Get the registred IRCD command model diff --git a/core/classes/protocols/factory.py b/core/classes/protocols/factory.py index 32ac63a..7ccf267 100644 --- a/core/classes/protocols/factory.py +++ b/core/classes/protocols/factory.py @@ -9,6 +9,11 @@ if TYPE_CHECKING: class ProtocolFactorty: def __init__(self, uplink: 'Irc'): + """ProtocolFactory init. + + Args: + uplink (Irc): The Irc object + """ self.__Config = uplink.Config self.__uplink = uplink diff --git a/core/classes/protocols/inspircd.py b/core/classes/protocols/inspircd.py index 531227d..a4957b2 100644 --- a/core/classes/protocols/inspircd.py +++ b/core/classes/protocols/inspircd.py @@ -14,16 +14,21 @@ if TYPE_CHECKING: class Inspircd(IProtocol): - def __init__(self, ircInstance: 'Irc'): + def __init__(self, uplink: 'Irc'): + """ + + Args: + uplink (Irc): The Irc object + """ self.name = 'InspIRCd-4' self.protocol_version = 1206 - self.__Irc = ircInstance - self.__Config = ircInstance.Config - self.__Base = ircInstance.Base - self.__Utils = ircInstance.Loader.Utils - self.__Settings = ircInstance.Settings - self.__Logs = ircInstance.Loader.Logs + self.__Irc = uplink + self.__Config = uplink.Config + self.__Base = uplink.Base + self.__Utils = uplink.Loader.Utils + self.__Settings = uplink.Settings + self.__Logs = uplink.Loader.Logs self.known_protocol: set[str] = {'UID', 'ERROR', 'PRIVMSG', 'SINFO', 'FJOIN', 'PING', 'PONG', @@ -32,7 +37,7 @@ class Inspircd(IProtocol): 'MODE', 'QUIT', 'SQUIT', 'VERSION'} - self.Handler = CommandHandler(ircInstance.Loader) + self.Handler = CommandHandler(uplink.Loader) self.__Logs.info(f"[PROTOCOL] Protocol [{__name__}] loaded!") @@ -41,6 +46,7 @@ class Inspircd(IProtocol): Args: cmd (list[str]): The server response + log (bool): if True then print logs Returns: tuple[int, Optional[str]]: The position and the command. @@ -52,7 +58,7 @@ class Inspircd(IProtocol): if log: self.__Logs.debug(f"[IRCD LOGS] You need to handle this response: {cmd}") - return (-1, None) + return -1, None def register_command(self): m = self.__Irc.Loader.Definition.MIrcdCommand @@ -74,7 +80,8 @@ class Inspircd(IProtocol): """Envoit les commandes à envoyer au serveur. Args: - string (Str): contient la commande à envoyer au serveur. + message (str): The message to send to the socket. + print_log (bool): if True print the log. """ try: with self.__Base.lock: @@ -97,7 +104,7 @@ class Inspircd(IProtocol): except OSError as oe: self.__Logs.error(f"OSError: {oe} - {message}") if oe.errno == 10053: - sys.exit(oe) + sys.exit(oe.__str__()) except AttributeError as ae: self.__Logs.critical(f"Attribute Error: {ae}") @@ -111,23 +118,23 @@ class Inspircd(IProtocol): nick_to (str, optional): The reciever nickname. Defaults to None. """ try: - batch_size = self.__Config.BATCH_SIZE - User_from = self.__Irc.User.get_user(nick_from) - User_to = self.__Irc.User.get_user(nick_to) if nick_to is None else None + batch_size = self.__Config.BATCH_SIZE + user_from = self.__Irc.User.get_user(nick_from) + user_to = self.__Irc.User.get_user(nick_to) if nick_to is not None else None - if User_from is None: + if user_from is None: self.__Logs.error(f"The sender nickname [{nick_from}] do not exist") return None if not channel is None: for i in range(0, len(str(msg)), batch_size): batch = str(msg)[i:i+batch_size] - self.send2socket(f":{User_from.uid} PRIVMSG {channel} :{batch}") + self.send2socket(f":{user_from.uid} PRIVMSG {channel} :{batch}") if not nick_to is None: for i in range(0, len(str(msg)), batch_size): batch = str(msg)[i:i+batch_size] - self.send2socket(f":{nick_from} PRIVMSG {User_to.uid} :{batch}") + self.send2socket(f":{nick_from} PRIVMSG {user_to.uid} :{batch}") except Exception as err: self.__Logs.error(f"General Error: {err}") @@ -141,16 +148,16 @@ class Inspircd(IProtocol): """ try: batch_size = self.__Config.BATCH_SIZE - User_from = self.__Irc.User.get_user(nick_from) - User_to = self.__Irc.User.get_user(nick_to) + user_from = self.__Irc.User.get_user(nick_from) + user_to = self.__Irc.User.get_user(nick_to) - if User_from is None or User_to is None: + if user_from is None or user_to is None: self.__Logs.error(f"The sender [{nick_from}] or the Reciever [{nick_to}] do not exist") return None for i in range(0, len(str(msg)), batch_size): batch = str(msg)[i:i+batch_size] - self.send2socket(f":{User_from.uid} NOTICE {User_to.uid} :{batch}") + self.send2socket(f":{user_from.uid} NOTICE {user_to.uid} :{batch}") except Exception as err: self.__Logs.error(f"General Error: {err}") @@ -159,39 +166,34 @@ class Inspircd(IProtocol): """Créer le link et envoyer les informations nécessaires pour la connexion au serveur. """ - - nickname = self.__Config.SERVICE_NICKNAME - username = self.__Config.SERVICE_USERNAME - realname = self.__Config.SERVICE_REALNAME - chan = self.__Config.SERVICE_CHANLOG - info = self.__Config.SERVICE_INFO - smodes = self.__Config.SERVICE_SMODES - cmodes = self.__Config.SERVICE_CMODES - umodes = self.__Config.SERVICE_UMODES - host = self.__Config.SERVICE_HOST + service_id = self.__Config.SERVICE_ID + service_nickname = self.__Config.SERVICE_NICKNAME + service_username = self.__Config.SERVICE_USERNAME + service_realname = self.__Config.SERVICE_REALNAME + service_info = self.__Config.SERVICE_INFO + service_smodes = self.__Config.SERVICE_SMODES + service_hostname = self.__Config.SERVICE_HOST service_name = self.__Config.SERVICE_NAME - password = self.__Config.SERVEUR_PASSWORD - link = self.__Config.SERVEUR_LINK + server_password = self.__Config.SERVEUR_PASSWORD + server_link = self.__Config.SERVEUR_LINK server_id = self.__Config.SERVEUR_ID - service_id = self.__Config.SERVICE_ID - server_hostname = self.__Config.SERVEUR_HOSTNAME + server_hostname = self.__Settings.MAIN_SERVER_HOSTNAME = self.__Config.SERVEUR_HOSTNAME version = self.__Config.CURRENT_VERSION unixtime = self.__Utils.get_unixtime() - self.__Settings.MAIN_SERVER_HOSTNAME = server_hostname self.send2socket(f"CAPAB START {self.protocol_version}") self.send2socket(f"CAPAB MODULES :services") self.send2socket(f"CAPAB MODSUPPORT :") self.send2socket(f"CAPAB CAPABILITIES :NICKMAX=30 CHANMAX=64 MAXMODES=20 IDENTMAX=10 MAXQUIT=255 MAXTOPIC=307 MAXKICK=255 MAXREAL=128 MAXAWAY=200 MAXHOST=64 MAXLINE=512 CASEMAPPING=ascii GLOBOPS=0") self.send2socket(f"CAPAB END") - self.send2socket(f"SERVER {link} {password} {server_id} :{info}") + self.send2socket(f"SERVER {server_link} {server_password} {server_id} :{service_info}") self.send2socket(f"BURST {unixtime}") self.send2socket(f":{server_id} SINFO version :{service_name}-{version.split('.')[0]}. {server_hostname} :") - self.send2socket(f":{server_id} SINFO fullversion :{service_name}-{version}. {host} :") + self.send2socket(f":{server_id} SINFO fullversion :{service_name}-{version}. {service_hostname} :") self.send2socket(f":{server_id} SINFO rawversion :{service_name}-{version}") - self.send_uid(nickname, username, host, service_id, smodes, host, "127.0.0.1", realname) + self.send_uid(service_nickname, service_username, service_hostname, service_id, service_smodes, service_hostname, "127.0.0.1", service_realname) self.send2socket(f":{server_id} ENDBURST") # self.send_sjoin(chan) @@ -216,6 +218,7 @@ class Inspircd(IProtocol): modes (str): The selected mode nickname (Optional[str]): The nickname channel_name (Optional[str]): The channel name + params (Optional[str]): Params to pass to the mode """ service_id = self.__Config.SERVICE_ID params = '' if params is None else params @@ -304,22 +307,23 @@ class Inspircd(IProtocol): self.__Irc.Channel.insert(self.__Irc.Loader.Definition.MChannel(name=channel, uids=[service_id])) return None - def send_quit(self, uid: str, reason: str, print_log: True) -> None: + def send_quit(self, uid: str, reason: str, print_log: bool = True) -> None: """Send quit message Args: - uidornickname (str): The UID or the Nickname + uid (str): The UID. reason (str): The reason for the quit + print_log (bool): If True then print logs """ user_obj = self.__Irc.User.get_user(uidornickname=uid) - reputationObj = self.__Irc.Reputation.get_reputation(uidornickname=uid) + reputation_obj = self.__Irc.Reputation.get_reputation(uidornickname=uid) if not user_obj is None: self.send2socket(f":{user_obj.uid} QUIT :{reason}", print_log=print_log) self.__Irc.User.delete(user_obj.uid) - if not reputationObj is None: - self.__Irc.Reputation.delete(reputationObj.uid) + if not reputation_obj is None: + self.__Irc.Reputation.delete(reputation_obj.uid) if not self.__Irc.Channel.delete_user_from_all_channel(uid): self.__Logs.error(f"The UID [{uid}] has not been deleted from all channels") @@ -382,20 +386,20 @@ class Inspircd(IProtocol): print_log (bool, optional): Write logs. Defaults to True. """ - userObj = self.__Irc.User.get_user(uidornickname) - passwordChannel = password if not password is None else '' + user_obj = self.__Irc.User.get_user(uidornickname) + password_channel = password if not password is None else '' - if userObj is None: + if user_obj is None: return None if not self.__Irc.Channel.is_valid_channel(channel): self.__Logs.error(f"The channel [{channel}] is not valid") return None - self.send2socket(f":{userObj.uid} FJOIN {channel} {self.__Utils.get_unixtime()} :,{userObj.uid} {passwordChannel}", print_log=print_log) + self.send2socket(f":{user_obj.uid} FJOIN {channel} {self.__Utils.get_unixtime()} :,{user_obj.uid} {password_channel}", print_log=print_log) # Add defender to the channel uids list - self.__Irc.Channel.insert(self.__Irc.Loader.Definition.MChannel(name=channel, uids=[userObj.uid])) + self.__Irc.Channel.insert(self.__Irc.Loader.Definition.MChannel(name=channel, uids=[user_obj.uid])) return None def send_part_chan(self, uidornickname:str, channel: str, print_log: bool = True) -> None: @@ -407,9 +411,9 @@ class Inspircd(IProtocol): print_log (bool, optional): Write logs. Defaults to True. """ - userObj = self.__Irc.User.get_user(uidornickname) + user_obj = self.__Irc.User.get_user(uidornickname) - if userObj is None: + if user_obj is None: self.__Logs.error(f"The user [{uidornickname}] is not valid") return None @@ -417,10 +421,10 @@ class Inspircd(IProtocol): self.__Logs.error(f"The channel [{channel}] is not valid") return None - self.send2socket(f":{userObj.uid} PART {channel}", print_log=print_log) + self.send2socket(f":{user_obj.uid} PART {channel}", print_log=print_log) # Add defender to the channel uids list - self.__Irc.Channel.delete_user_from_channel(channel, userObj.uid) + self.__Irc.Channel.delete_user_from_channel(channel, user_obj.uid) return None def send_unkline(self, nickname:str, hostname: str) -> None: @@ -438,26 +442,23 @@ class Inspircd(IProtocol): # RECIEVED IRC MESSAGES # ------------------------------------------------------------------------ - def on_umode2(self, serverMsg: list[str]) -> None: + def on_umode2(self, server_msg: list[str]) -> None: """Handle umode2 coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ try: # [':adator_', 'UMODE2', '-iwx'] - userObj = self.__Irc.User.get_user(str(serverMsg[0]).lstrip(':')) - userMode = serverMsg[2] + user_obj = self.__Irc.User.get_user(str(server_msg[0]).lstrip(':')) + user_mode = server_msg[2] - if userObj is None: # If user is not created + if user_obj is None: # If user is not created return None - # save previous user modes - old_umodes = userObj.umodes - # TODO : User object should be able to update user modes - if self.__Irc.User.update_mode(userObj.uid, userMode): + if self.__Irc.User.update_mode(user_obj.uid, user_mode): return None # self.__Logs.debug(f"Updating user mode for [{userObj.nickname}] [{old_umodes}] => [{userObj.umodes}]") @@ -468,15 +469,15 @@ class Inspircd(IProtocol): except Exception as err: self.__Logs.error(f"{__name__} - General Error: {err}") - def on_quit(self, serverMsg: list[str]) -> None: + def on_quit(self, server_msg: list[str]) -> None: """Handle quit coming from a server >> [':97KAAAAAZ', 'QUIT', ':Quit:', '....'] Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ try: - uid_who_quit = str(serverMsg[0]).lstrip(':') + uid_who_quit = str(server_msg[0]).lstrip(':') self.__Irc.Channel.delete_user_from_all_channel(uid_who_quit) self.__Irc.User.delete(uid_who_quit) @@ -489,15 +490,15 @@ class Inspircd(IProtocol): except Exception as err: self.__Logs.error(f"{__name__} - General Error: {err}") - def on_squit(self, serverMsg: list[str]) -> None: + def on_squit(self, server_msg: list[str]) -> None: """Handle squit coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ # ['@msgid=QOEolbRxdhpVW5c8qLkbAU;time=2024-09-21T17:33:16.547Z', 'SQUIT', 'defender.deb.biz.st', ':Connection', 'closed'] - server_hostname = serverMsg[2] + server_hostname = server_msg[2] uid_to_delete = None for s_user in self.__Irc.User.UID_DB: if s_user.hostname == server_hostname and 'S' in s_user.umodes: @@ -511,17 +512,17 @@ class Inspircd(IProtocol): return None - def on_protoctl(self, serverMsg: list[str]) -> None: + def on_protoctl(self, server_msg: list[str]) -> None: """Handle CAPAB coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ # ['CAPAB', 'CHANMODES', ':list:ban=b', 'param-set:limit=l', 'param:key=k', 'prefix:10000:voice=+v', 'prefix:30000:op=@o', 'prefix:50000:founder=~q', # 'simple:c_registered=r', 'simple:inviteonly=i', 'simple:moderated=m', 'simple:noextmsg=n', 'simple:private=p', # 'simple:secret=s', 'simple:sslonly=z', 'simple:topiclock=t'] - scopy = serverMsg.copy() + scopy = server_msg.copy() # Get Chan modes. if scopy[1] == 'CHANMODES': @@ -558,18 +559,18 @@ class Inspircd(IProtocol): return None - def on_nick(self, serverMsg: list[str]) -> None: + def on_nick(self, server_msg: list[str]) -> None: """Handle nick coming from a server new nickname Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ try: # [':97KAAAAAF', 'NICK', 'test', '1757370509'] # Changement de nickname - scopy = serverMsg.copy() + scopy = server_msg.copy() if scopy[0].startswith('@'): scopy.pop(0) @@ -586,20 +587,20 @@ class Inspircd(IProtocol): except Exception as err: self.__Logs.error(f"{__name__} - General Error: {err}") - def on_sjoin(self, serverMsg: list[str]) -> None: + def on_sjoin(self, server_msg: list[str]) -> None: """Handle sjoin coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ try: # [':97K', 'FJOIN', '#services', '1757156589', '+nt', ':,97KAAAAA2:22', 'o,97KAAAAAA:2'] - channel = str(serverMsg[2]).lower() + channel = str(server_msg[2]).lower() list_users:list = [] # Find uid's - for uid in serverMsg: + for uid in server_msg: matches = findall(r',([0-9A-Z]+):', uid) list_users.extend(matches) @@ -619,15 +620,15 @@ class Inspircd(IProtocol): except Exception as err: self.__Logs.error(f"{__name__} - General Error: {err}") - def on_endburst(self, serverMsg: list[str]) -> None: + def on_endburst(self, server_msg: list[str]) -> None: """Handle EOS coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ try: # [':97K', 'ENDBURST'] - scopy = serverMsg.copy() + scopy = server_msg.copy() hsid = str(scopy[0]).replace(':','') if hsid == self.__Config.HSID: if self.__Config.DEFENDER_INIT == 1: @@ -693,18 +694,18 @@ class Inspircd(IProtocol): except Exception as err: self.__Logs.error(f"{__name__} - General Error: {err}") - def on_part(self, serverMsg: list[str]) -> None: + def on_part(self, server_msg: list[str]) -> None: """Handle part coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ try: # [':97KAAAAA2', 'PART', '#v', ':"Closing', 'Window"'] - uid = str(serverMsg[0]).lstrip(':') - channel = str(serverMsg[2]).lower() - reason = str(' '.join(serverMsg[3:])) + uid = str(server_msg[0]).lstrip(':') + channel = str(server_msg[2]).lower() + # reason = str(' '.join(server_msg[3:])) self.__Irc.Channel.delete_user_from_channel(channel, uid) return None @@ -714,39 +715,39 @@ class Inspircd(IProtocol): except Exception as err: self.__Logs.error(f"{__name__} - General Error: {err}") - def on_uid(self, serverMsg: list[str]) -> None: + def on_uid(self, server_msg: list[str]) -> None: """Handle uid message coming from the server [:] UID []+ : [':97K', 'UID', '97KAAAAAB', '1756928055', 'adator_', '172.18.128.1', '172.18.128.1', '...', '...', '172.18.128.1', '1756928055', '+', ':...'] Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ try: - RED = self.__Config.COLORS.red - GREEN = self.__Config.COLORS.green - NOGC = self.__Config.COLORS.nogc - isWebirc = True if 'webirc' in serverMsg[0] else False - isWebsocket = True if 'websocket' in serverMsg[0] else False + red = self.__Config.COLORS.red + green = self.__Config.COLORS.green + nogc = self.__Config.COLORS.nogc + is_webirc = True if 'webirc' in server_msg[0] else False + is_websocket = True if 'websocket' in server_msg[0] else False - uid = str(serverMsg[2]) - nickname = str(serverMsg[4]) - username = str(serverMsg[7]) - hostname = str(serverMsg[5]) - umodes = str(serverMsg[11]) - vhost = str(serverMsg[6]) + uid = str(server_msg[2]) + nickname = str(server_msg[4]) + username = str(server_msg[7]) + hostname = str(server_msg[5]) + umodes = str(server_msg[11]) + vhost = str(server_msg[6]) if not 'S' in umodes: # remote_ip = self.__Base.decode_ip(str(serverMsg[9])) - remote_ip = str(serverMsg[9]) + remote_ip = str(server_msg[9]) else: remote_ip = '127.0.0.1' # extract realname - realname = ' '.join(serverMsg[12:]).lstrip(':') + realname = ' '.join(server_msg[12:]).lstrip(':') # Extract Geoip information pattern = r'^.*geoip=cc=(\S{2}).*$' - geoip_match = match(pattern, serverMsg[0]) + geoip_match = match(pattern, server_msg[0]) if geoip_match: geoip = geoip_match.group(1) @@ -764,8 +765,8 @@ class Inspircd(IProtocol): hostname=hostname, umodes=umodes, vhost=vhost, - isWebirc=isWebirc, - isWebsocket=isWebsocket, + isWebirc=is_webirc, + isWebsocket=is_websocket, remote_ip=remote_ip, geoip=geoip, score_connexion=score_connexion, @@ -774,7 +775,7 @@ class Inspircd(IProtocol): ) for module in self.__Irc.ModuleUtils.model_get_loaded_modules().copy(): - module.class_instance.cmd(serverMsg) + module.class_instance.cmd(server_msg) # SASL authentication dnickname = self.__Config.SERVICE_NICKNAME @@ -786,12 +787,12 @@ class Inspircd(IProtocol): if sasl_obj.auth_success: self.__Irc.insert_db_admin(sasl_obj.client_uid, sasl_obj.username, sasl_obj.level, sasl_obj.language) self.send_priv_msg(nick_from=dnickname, - msg=tr("[ %sSASL AUTH%s ] - %s (%s) is now connected successfuly to %s", GREEN, NOGC, nickname, sasl_obj.username, dnickname), + msg=tr("[ %sSASL AUTH%s ] - %s (%s) is now connected successfuly to %s", green, nogc, nickname, sasl_obj.username, dnickname), channel=dchanlog) self.send_notice(nick_from=dnickname, nick_to=nickname, msg=tr("Successfuly connected to %s", dnickname)) else: self.send_priv_msg(nick_from=dnickname, - msg=tr("[ %sSASL AUTH%s ] - %s provided a wrong password for this username %s", RED, NOGC, nickname, sasl_obj.username), + msg=tr("[ %sSASL AUTH%s ] - %s provided a wrong password for this username %s", red, nogc, nickname, sasl_obj.username), channel=dchanlog) self.send_notice(nick_from=dnickname, nick_to=nickname, msg=tr("Wrong password!")) @@ -805,22 +806,22 @@ class Inspircd(IProtocol): except Exception as err: self.__Logs.error(f"{__name__} - General Error: {err}", exc_info=True) - def on_privmsg(self, serverMsg: list[str]) -> None: + def on_privmsg(self, server_msg: list[str]) -> None: """Handle PRIVMSG message coming from the server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ try: - srv_msg = serverMsg.copy() - cmd = serverMsg.copy() + srv_msg = server_msg.copy() + cmd = server_msg.copy() # Supprimer la premiere valeur si MTAGS activé if cmd[0].startswith('@'): cmd.pop(0) get_uid_or_nickname = str(cmd[0].replace(':','')) user_trigger = self.__Irc.User.get_nickname(get_uid_or_nickname) - dnickname = self.__Config.SERVICE_NICKNAME + # dnickname = self.__Config.SERVICE_NICKNAME pattern = fr'(:\{self.__Config.SERVICE_PREFIX})(.*)$' hcmds = search(pattern, ' '.join(cmd)) # va matcher avec tout les caractéres aprés le . @@ -828,7 +829,7 @@ class Inspircd(IProtocol): liste_des_commandes = list(hcmds.groups()) convert_to_string = ' '.join(liste_des_commandes) arg = convert_to_string.split() - arg.remove(f':{self.__Config.SERVICE_PREFIX}') + arg.remove(f":{self.__Config.SERVICE_PREFIX}") if not self.__Irc.Commands.is_command_exist(arg[0]): self.__Logs.debug(f"This command {arg[0]} is not available") self.send_notice( @@ -891,58 +892,58 @@ class Inspircd(IProtocol): except AttributeError as ae: self.__Logs.error(f"Attribute Error: {ae}") except Exception as err: - self.__Logs.error(f"General Error: {err} - {srv_msg}") + self.__Logs.error(f"General Error: {err}", exc_info=True) - def on_server_ping(self, serverMsg: list[str]) -> None: + def on_server_ping(self, server_msg: list[str]) -> None: """Send a PONG message to the server Args: - serverMsg (list[str]): List of str coming from the server + server_msg (list[str]): List of str coming from the server """ try: # InspIRCd 4: # <- :3IN PING 808 # -> :808 PONG 3IN - hsid = str(serverMsg[0]).replace(':','') + hsid = str(server_msg[0]).replace(':','') self.send2socket(f":{self.__Config.SERVEUR_ID} PONG {hsid}", print_log=False) return None except Exception as err: self.__Logs.error(f"{__name__} - General Error: {err}") - def on_server(self, serverMsg: list[str]) -> None: + def on_server(self, server_msg: list[str]) -> None: """_summary_ >>> [':97K', 'SINFO', 'customversion', ':'] >>> [':97K', 'SINFO', 'rawbranch', ':InspIRCd-4'] >>> [':97K', 'SINFO', 'rawversion', ':InspIRCd-4.8.0'] Args: - serverMsg (list[str]): The server message + server_msg (list[str]): The server message """ try: - param = str(serverMsg[2]) - self.__Config.HSID = self.__Settings.MAIN_SERVER_ID = str(serverMsg[0]).replace(':', '') + param = str(server_msg[2]) + self.__Config.HSID = self.__Settings.MAIN_SERVER_ID = str(server_msg[0]).replace(':', '') if param == 'rawversion': - self.__Logs.debug(f">> Server Version: {serverMsg[3].replace(':', '')}") + self.__Logs.debug(f">> Server Version: {server_msg[3].replace(':', '')}") elif param == 'rawbranch': - self.__Logs.debug(f">> Branch Version: {serverMsg[3].replace(':', '')}") + self.__Logs.debug(f">> Branch Version: {server_msg[3].replace(':', '')}") except Exception as err: self.__Logs.error(f'General Error: {err}') - def on_version(self, serverMsg: list[str]) -> None: + def on_version(self, server_msg: list[str]) -> None: """Sending Server Version to the server Args: - serverMsg (list[str]): List of str coming from the server + server_msg (list[str]): List of str coming from the server """ # ['@unrealircd.org/userhost=StatServ@stats.deb.biz.st;draft/bot;bot;msgid=ehfAq3m2yjMjhgWEfi1UCS;time=2024-10-26T13:49:06.299Z', ':00BAAAAAI', 'PRIVMSG', '12ZAAAAAB', ':\x01VERSION\x01'] # Réponse a un CTCP VERSION try: - nickname = self.__Irc.User.get_nickname(self.__Utils.clean_uid(serverMsg[1])) + nickname = self.__Irc.User.get_nickname(self.__Utils.clean_uid(server_msg[1])) dnickname = self.__Config.SERVICE_NICKNAME - arg = serverMsg[4].replace(':', '') + arg = server_msg[4].replace(':', '') if nickname is None: return None @@ -954,19 +955,19 @@ class Inspircd(IProtocol): except Exception as err: self.__Logs.error(f"{__name__} - General Error: {err}") - def on_time(self, serverMsg: list[str]) -> None: + def on_time(self, server_msg: list[str]) -> None: """Sending TIME answer to a requestor Args: - serverMsg (list[str]): List of str coming from the server + server_msg (list[str]): List of str coming from the server """ # ['@unrealircd.org/userhost=StatServ@stats.deb.biz.st;draft/bot;bot;msgid=ehfAq3m2yjMjhgWEfi1UCS;time=2024-10-26T13:49:06.299Z', ':00BAAAAAI', 'PRIVMSG', '12ZAAAAAB', ':\x01TIME\x01'] # Réponse a un CTCP VERSION try: - nickname = self.__Irc.User.get_nickname(self.__Utils.clean_uid(serverMsg[1])) + nickname = self.__Irc.User.get_nickname(self.__Utils.clean_uid(server_msg[1])) dnickname = self.__Config.SERVICE_NICKNAME - arg = serverMsg[4].replace(':', '') + arg = server_msg[4].replace(':', '') current_datetime = self.__Utils.get_sdatetime() if nickname is None: @@ -979,25 +980,25 @@ class Inspircd(IProtocol): except Exception as err: self.__Logs.error(f"{__name__} - General Error: {err}") - def on_ping(self, serverMsg: list[str]) -> None: + def on_ping(self, server_msg: list[str]) -> None: """Sending a PING answer to requestor Args: - serverMsg (list[str]): List of str coming from the server + server_msg (list[str]): List of str coming from the server """ # ['@unrealircd.org/userhost=StatServ@stats.deb.biz.st;draft/bot;bot;msgid=ehfAq3m2yjMjhgWEfi1UCS;time=2024-10-26T13:49:06.299Z', ':001INC60B', 'PRIVMSG', '12ZAAAAAB', ':\x01PING', '762382207\x01'] # Réponse a un CTCP VERSION try: - nickname = self.__Irc.User.get_nickname(self.__Utils.clean_uid(serverMsg[1])) + nickname = self.__Irc.User.get_nickname(self.__Utils.clean_uid(server_msg[1])) dnickname = self.__Config.SERVICE_NICKNAME - arg = serverMsg[4].replace(':', '') + arg = server_msg[4].replace(':', '') if nickname is None: return None if arg == '\x01PING': - recieved_unixtime = int(serverMsg[5].replace('\x01','')) + recieved_unixtime = int(server_msg[5].replace('\x01','')) current_unixtime = self.__Utils.get_unixtime() ping_response = current_unixtime - recieved_unixtime @@ -1012,37 +1013,38 @@ class Inspircd(IProtocol): except Exception as err: self.__Logs.error(f"{__name__} - General Error: {err}") - def on_version_msg(self, serverMsg: list[str]) -> None: + def on_version_msg(self, server_msg: list[str]) -> None: """Handle version coming from the server Args: - serverMsg (list[str]): Original message from the server + server_msg (list[str]): Original message from the server """ try: # ['@label=0073', ':0014E7P06', 'VERSION', 'PyDefender'] - getUser = self.__Irc.User.get_user(self.__Utils.clean_uid(serverMsg[1])) + user_obj = self.__Irc.User.get_user(self.__Utils.clean_uid(server_msg[1])) - if getUser is None: + if user_obj is None: return None response_351 = f"{self.__Config.SERVICE_NAME.capitalize()}-{self.__Config.CURRENT_VERSION} {self.__Config.SERVICE_HOST} {self.name}" - self.send2socket(f':{self.__Config.SERVICE_HOST} 351 {getUser.nickname} {response_351}') + self.send2socket(f':{self.__Config.SERVICE_HOST} 351 {user_obj.nickname} {response_351}') modules = self.__Irc.ModuleUtils.get_all_available_modules() response_005 = ' | '.join(modules) - self.send2socket(f':{self.__Config.SERVICE_HOST} 005 {getUser.nickname} {response_005} are supported by this server') + self.send2socket(f':{self.__Config.SERVICE_HOST} 005 {user_obj.nickname} {response_005} are supported by this server') return None except Exception as err: self.__Logs.error(f"{__name__} - General Error: {err}") - def on_sasl(self, serverMsg: list[str]) -> Optional['MSasl']: + def on_sasl(self, server_msg: list[str]) -> Optional['MSasl']: """Handle SASL coming from a server Args: - serverMsg (list[str]): Original server message - psasl (Sasl): The SASL process object + server_msg (list[str]): Original server message + Returns: + Optional[MSasl]: The MSasl object """ try: # [':97K', 'ENCAP', '98K', 'SASL', '97KAAAAAF', '*', 'H', '172.18.128.1', '172.18.128.1', 'P'] @@ -1061,10 +1063,10 @@ class Inspircd(IProtocol): if not sasl_enabled: return None - sCopy = serverMsg.copy() - client_uid = sCopy[4] if len(sCopy) >= 6 else None - sasl_obj = None - sasl_message_type = sCopy[6] if len(sCopy) >= 6 else None + scopy = server_msg.copy() + client_uid = scopy[4] if len(scopy) >= 6 else None + # sasl_obj = None + sasl_message_type = scopy[6] if len(scopy) >= 6 else None psasl.insert_sasl_client(self.__Irc.Loader.Definition.MSasl(client_uid=client_uid)) sasl_obj = psasl.get_sasl_obj(client_uid) @@ -1073,22 +1075,22 @@ class Inspircd(IProtocol): match sasl_message_type: case 'H': - sasl_obj.remote_ip = str(sCopy[8]) + sasl_obj.remote_ip = str(scopy[8]) sasl_obj.message_type = sasl_message_type return sasl_obj case 'S': sasl_obj.message_type = sasl_message_type - if str(sCopy[7]) in ['PLAIN', 'EXTERNAL']: - sasl_obj.mechanisme = str(sCopy[7]) + if str(scopy[7]) in ['PLAIN', 'EXTERNAL']: + sasl_obj.mechanisme = str(scopy[7]) if sasl_obj.mechanisme == "PLAIN": self.send2socket(f":{self.__Config.SERVEUR_ID} SASL {self.__Config.SERVEUR_HOSTNAME} {sasl_obj.client_uid} C +") elif sasl_obj.mechanisme == "EXTERNAL": - if str(sCopy[7]) == "+": + if str(scopy[7]) == "+": return None - sasl_obj.fingerprint = str(sCopy[8]) + sasl_obj.fingerprint = str(scopy[8]) self.send2socket(f":{self.__Config.SERVEUR_ID} SASL {self.__Config.SERVEUR_HOSTNAME} {sasl_obj.client_uid} C +") self.on_sasl_authentication_process(sasl_obj) @@ -1096,7 +1098,7 @@ class Inspircd(IProtocol): case 'C': if sasl_obj.mechanisme == "PLAIN": - credentials = sCopy[7] + credentials = scopy[7] decoded_credentials = b64decode(credentials).decode() user, username, password = decoded_credentials.split('\0') @@ -1114,7 +1116,7 @@ class Inspircd(IProtocol): except Exception as err: self.__Logs.error(f'General Error: {err}', exc_info=True) - def on_sasl_authentication_process(self, sasl_model: 'MSasl') -> bool: + def on_sasl_authentication_process(self, sasl_model: 'MSasl'): s = sasl_model server_id = self.__Config.SERVEUR_ID main_server_hostname = self.__Settings.MAIN_SERVER_HOSTNAME @@ -1164,22 +1166,23 @@ class Inspircd(IProtocol): self.send2socket(f":{server_id} SASL {main_server_hostname} {s.client_uid} D F") self.send2socket(f":{server_id} SASL {s.username} :SASL authentication failed") - def on_error(self, serverMsg: list[str]) -> None: - self.__Logs.debug(f"{serverMsg}") + def on_error(self, server_msg: list[str]) -> None: + self.__Logs.debug(f"{server_msg}") - def on_metedata(self, serverMsg: list[str]) -> None: + def on_metedata(self, server_msg: list[str]) -> None: """_summary_ Args: - serverMsg (list[str]): _description_ + server_msg (list[str]): _description_ """ # [':97K', 'METADATA', '97KAAAAAA', 'ssl_cert', ':vTrSe', 'fingerprint90753683519522875', # '/C=FR/OU=Testing/O=Test', 'Sasl/CN=localhost', '/C=FR/OU=Testing/O=Test', 'Sasl/CN=localhost'] - scopy = serverMsg.copy() + scopy = server_msg.copy() dnickname = self.__Config.SERVICE_NICKNAME dchanlog = self.__Config.SERVICE_CHANLOG - GREEN = self.__Config.COLORS.green - NOGC = self.__Config.COLORS.nogc + green = self.__Config.COLORS.green + nogc = self.__Config.COLORS.nogc + if 'ssl_cert' in scopy: fingerprint = scopy[5] uid = scopy[2] @@ -1190,7 +1193,7 @@ class Inspircd(IProtocol): admin = self.__Irc.Admin.get_admin(uid) account = admin.account if admin else '' self.send_priv_msg(nick_from=dnickname, - msg=tr("[ %sSASL AUTO AUTH%s ] - %s (%s) is now connected successfuly to %s", GREEN, NOGC, user_obj.nickname, account, dnickname), + msg=tr("[ %sSASL AUTO AUTH%s ] - %s (%s) is now connected successfuly to %s", green, nogc, user_obj.nickname, account, dnickname), channel=dchanlog) self.send_notice(nick_from=dnickname, nick_to=user_obj.nickname, msg=tr("Successfuly connected to %s", dnickname)) @@ -1198,46 +1201,46 @@ class Inspircd(IProtocol): # COMMON IRC PARSER # ------------------------------------------------------------------------ - def parse_uid(self, serverMsg: list[str]) -> dict[str, str]: + def parse_uid(self, server_msg: list[str]) -> dict[str, str]: """Parse UID and return dictionary. Args: - serverMsg (list[str]): _description_ + server_msg (list[str]): _description_ """ - umodes = str(serverMsg[11]) - remote_ip = serverMsg[9] if 'S' not in umodes else '127.0.0.1' + umodes = str(server_msg[11]) + remote_ip = server_msg[9] if 'S' not in umodes else '127.0.0.1' # Extract Geoip information pattern = r'^.*geoip=cc=(\S{2}).*$' - geoip_match = match(pattern, serverMsg[0]) + geoip_match = match(pattern, server_msg[0]) geoip = geoip_match.group(1) if geoip_match else None response = { - 'uid': str(serverMsg[2]), - 'nickname': str(serverMsg[4]), - 'username': str(serverMsg[7]), - 'hostname': str(serverMsg[5]), + 'uid': str(server_msg[2]), + 'nickname': str(server_msg[4]), + 'username': str(server_msg[7]), + 'hostname': str(server_msg[5]), 'umodes': umodes, - 'vhost': str(serverMsg[6]), + 'vhost': str(server_msg[6]), 'ip': remote_ip, - 'realname': ' '.join(serverMsg[12:]).lstrip(':'), + 'realname': ' '.join(server_msg[12:]).lstrip(':'), 'geoip': geoip, 'reputation_score': 0, - 'iswebirc': True if 'webirc' in serverMsg[0] else False, - 'iswebsocket': True if 'websocket' in serverMsg[0] else False + 'iswebirc': True if 'webirc' in server_msg[0] else False, + 'iswebsocket': True if 'websocket' in server_msg[0] else False } return response - def parse_quit(self, serverMsg: list[str]) -> dict[str, str]: + def parse_quit(self, server_msg: list[str]) -> dict[str, str]: """Parse quit and return dictionary. >>> [':97KAAAAAB', 'QUIT', ':Quit:', 'this', 'is', 'my', 'reason', 'to', 'quit'] Args: - serverMsg (list[str]): The server message to parse + server_msg (list[str]): The server message to parse Returns: dict[str, str]: The dictionary. """ - scopy = serverMsg.copy() + scopy = server_msg.copy() if scopy[0].startswith('@'): scopy.pop(0) @@ -1248,17 +1251,17 @@ class Inspircd(IProtocol): } return response - def parse_nick(self, serverMsg: list[str]) -> dict[str, str]: + def parse_nick(self, server_msg: list[str]) -> dict[str, str]: """Parse nick changes. >>> [':97KAAAAAC', 'NICK', 'testinspir', '1757360740'] Args: - serverMsg (list[str]): The server message to parse + server_msg (list[str]): The server message to parse Returns: dict[str, str]: The response as dictionary. """ - scopy = serverMsg.copy() + scopy = server_msg.copy() if scopy[0].startswith('@'): scopy.pop(0) @@ -1269,18 +1272,18 @@ class Inspircd(IProtocol): } return response - def parse_privmsg(self, serverMsg: list[str]) -> dict[str, str]: + def parse_privmsg(self, server_msg: list[str]) -> dict[str, str]: """Parse PRIVMSG message. >>> [':97KAAAAAE', 'PRIVMSG', '#welcome', ':This', 'is', 'my', 'public', 'message'] >>> [':97KAAAAAF', 'PRIVMSG', '98KAAAAAB', ':My','Message','...'] Args: - serverMsg (list[str]): The server message to parse + server_msg (list[str]): The server message to parse Returns: dict[str, str]: The response as dictionary. """ - scopy = serverMsg.copy() + scopy = server_msg.copy() if scopy[0].startswith('@'): scopy.pop(0) @@ -1307,15 +1310,15 @@ class Inspircd(IProtocol): ... def send_gline(self, nickname: str, hostname: str, set_by: str, expire_timestamp: int, set_at_timestamp: int, reason: str) -> None: - """_summary_ + """Send a gline command to the server Args: - nickname (str): _description_ - hostname (str): _description_ - set_by (str): _description_ - expire_timestamp (int): _description_ - set_at_timestamp (int): _description_ - reason (str): _description_ + nickname (str): The nickname of the client. + hostname (str): The hostname of the client. + set_by (str): The nickname who send the gline + expire_timestamp (int): Expire timestamp + set_at_timestamp (int): Set at timestamp + reason (str): The reason of the gline. """ ... @@ -1332,8 +1335,7 @@ class Inspircd(IProtocol): """_summary_ Args: - from_nick (str): _description_ - nick_to (str): _description_ + nick_to_sapart (str): _description_ channel_name (str): _description_ """ ... @@ -1370,7 +1372,7 @@ class Inspircd(IProtocol): """Logout a client from his account Args: - client_uid (str): The Client UID + client_obj (MClient): The Client Object Model """ ... @@ -1393,51 +1395,51 @@ class Inspircd(IProtocol): """ ... - def on_md(self, serverMsg: list[str]) -> None: + def on_md(self, server_msg: list[str]) -> None: """Handle MD responses [':001', 'MD', 'client', '001MYIZ03', 'certfp', ':d1235648...'] Args: - serverMsg (list[str]): The server reply + server_msg (list[str]): The server reply """ ... - def on_mode(self, serverMsg: list[str]) -> None: + def on_mode(self, server_msg: list[str]) -> None: """Handle mode coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ ... - def on_reputation(self, serverMsg: list[str]) -> None: + def on_reputation(self, server_msg: list[str]) -> None: """Handle REPUTATION coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ ... - def on_smod(self, serverMsg: list[str]) -> None: + def on_smod(self, server_msg: list[str]) -> None: """Handle SMOD message coming from the server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ ... - def on_svs2mode(self, serverMsg: list[str]) -> None: + def on_svs2mode(self, server_msg: list[str]) -> None: """Handle svs2mode coming from a server >>> [':00BAAAAAG', 'SVS2MODE', '001U01R03', '-r'] Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ ... - def on_eos(self, serverMsg: list[str]) -> None: + def on_eos(self, server_msg: list[str]) -> None: """Handle EOS coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ ... diff --git a/core/classes/protocols/interface.py b/core/classes/protocols/interface.py index 00c2d1f..676d383 100644 --- a/core/classes/protocols/interface.py +++ b/core/classes/protocols/interface.py @@ -1,15 +1,14 @@ from abc import ABC, abstractmethod from typing import Optional, TYPE_CHECKING +from core.classes.protocols.command_handler import CommandHandler if TYPE_CHECKING: - from core.classes.sasl import Sasl - from core.definition import MClient, MSasl, MRegister - from core.classes.protocols.command_handler import CommandHandler + from core.definition import MClient, MSasl + class IProtocol(ABC): - DB_REGISTER: list['MRegister'] = [] - Handler: Optional['CommandHandler'] = None + Handler: Optional[CommandHandler] = None @abstractmethod def get_ircd_protocol_poisition(self, cmd: list[str], log: bool = False) -> tuple[int, Optional[str]]: @@ -33,7 +32,8 @@ class IProtocol(ABC): """Envoit les commandes à envoyer au serveur. Args: - string (Str): contient la commande à envoyer au serveur. + message (str): contient la commande à envoyer au serveur. + print_log (bool): If True then print logs """ @abstractmethod @@ -65,15 +65,15 @@ class IProtocol(ABC): @abstractmethod def send_gline(self, nickname: str, hostname: str, set_by: str, expire_timestamp: int, set_at_timestamp: int, reason: str) -> None: - """_summary_ + """Send a gline command to the server Args: - nickname (str): _description_ - hostname (str): _description_ - set_by (str): _description_ - expire_timestamp (int): _description_ - set_at_timestamp (int): _description_ - reason (str): _description_ + nickname (str): The nickname of the client. + hostname (str): The hostname of the client. + set_by (str): The nickname who send the gline + expire_timestamp (int): Expire timestamp + set_at_timestamp (int): Set at timestamp + reason (str): The reason of the gline. """ @abstractmethod @@ -149,8 +149,7 @@ class IProtocol(ABC): """_summary_ Args: - from_nick (str): _description_ - nick_to (str): _description_ + nick_to_sapart (str): _description_ channel_name (str): _description_ """ @@ -215,18 +214,19 @@ class IProtocol(ABC): """Logout a client from his account Args: - client_uid (str): The Client UID + client_obj (MClient): The Client UID """ @abstractmethod - def send_quit(self, uid: str, reason: str, print_log: True) -> None: + def send_quit(self, uid: str, reason: str, print_log: bool = True) -> None: """Send quit message - Delete uid from User object - Delete uid from Reputation object Args: - uidornickname (str): The UID or the Nickname + uid (str): The UID or the Nickname reason (str): The reason for the quit + print_log (bool): If True then print logs """ @abstractmethod @@ -288,46 +288,46 @@ class IProtocol(ABC): # ------------------------------------------------------------------------ @abstractmethod - def parse_uid(self, serverMsg: list[str]) -> dict[str, str]: + def parse_uid(self, server_msg: list[str]) -> dict[str, str]: """Parse UID and return dictionary. Args: - serverMsg (list[str]): The UID IRCD message + server_msg (list[str]): The UID IRCD message Returns: dict[str, str]: The response as dictionary. """ @abstractmethod - def parse_quit(self, serverMsg: list[str]) -> dict[str, str]: + def parse_quit(self, server_msg: list[str]) -> dict[str, str]: """Parse quit and return dictionary. >>> [':97KAAAAAB', 'QUIT', ':Quit:', 'this', 'is', 'my', 'reason', 'to', 'quit'] Args: - serverMsg (list[str]): The server message to parse + server_msg (list[str]): The server message to parse Returns: dict[str, str]: The response as dictionary. """ @abstractmethod - def parse_nick(self, serverMsg: list[str]) -> dict[str, str]: + def parse_nick(self, server_msg: list[str]) -> dict[str, str]: """Parse nick changes and return dictionary. >>> [':97KAAAAAC', 'NICK', 'testinspir', '1757360740'] Args: - serverMsg (list[str]): The server message to parse + server_msg (list[str]): The server message to parse Returns: dict[str, str]: The response as dictionary. """ @abstractmethod - def parse_privmsg(self, serverMsg: list[str]) -> dict[str, str]: + def parse_privmsg(self, server_msg: list[str]) -> dict[str, str]: """Parse PRIVMSG message. >>> [':97KAAAAAE', 'PRIVMSG', '#welcome', ':This', 'is', 'my', 'public', 'message'] Args: - serverMsg (list[str]): The server message to parse + server_msg (list[str]): The server message to parse Returns: dict[str, str]: The response as dictionary. @@ -345,175 +345,177 @@ class IProtocol(ABC): # ------------------------------------------------------------------------ @abstractmethod - def on_svs2mode(self, serverMsg: list[str]) -> None: + def on_svs2mode(self, server_msg: list[str]) -> None: """Handle svs2mode coming from a server >>> [':00BAAAAAG', 'SVS2MODE', '001U01R03', '-r'] Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_mode(self, serverMsg: list[str]) -> None: + def on_mode(self, server_msg: list[str]) -> None: """Handle mode coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_umode2(self, serverMsg: list[str]) -> None: + def on_umode2(self, server_msg: list[str]) -> None: """Handle umode2 coming from a server >>> [':adator_', 'UMODE2', '-i'] Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_quit(self, serverMsg: list[str]) -> None: + def on_quit(self, server_msg: list[str]) -> None: """Handle quit coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_squit(self, serverMsg: list[str]) -> None: + def on_squit(self, server_msg: list[str]) -> None: """Handle squit coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_protoctl(self, serverMsg: list[str]) -> None: + def on_protoctl(self, server_msg: list[str]) -> None: """Handle protoctl coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_nick(self, serverMsg: list[str]) -> None: + def on_nick(self, server_msg: list[str]) -> None: """Handle nick coming from a server new nickname Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_sjoin(self, serverMsg: list[str]) -> None: + def on_sjoin(self, server_msg: list[str]) -> None: """Handle sjoin coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_part(self, serverMsg: list[str]) -> None: + def on_part(self, server_msg: list[str]) -> None: """Handle part coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_eos(self, serverMsg: list[str]) -> None: + def on_eos(self, server_msg: list[str]) -> None: """Handle EOS coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_reputation(self, serverMsg: list[str]) -> None: + def on_reputation(self, server_msg: list[str]) -> None: """Handle REPUTATION coming from a server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_uid(self, serverMsg: list[str]) -> None: + def on_uid(self, server_msg: list[str]) -> None: """Handle uid message coming from the server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_privmsg(self, serverMsg: list[str]) -> None: + def on_privmsg(self, server_msg: list[str]) -> None: """Handle PRIVMSG message coming from the server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_server_ping(self, serverMsg: list[str]) -> None: + def on_server_ping(self, server_msg: list[str]) -> None: """Send a PONG message to the server Args: - serverMsg (list[str]): List of str coming from the server + server_msg (list[str]): List of str coming from the server """ @abstractmethod - def on_server(self, serverMsg: list[str]) -> None: + def on_server(self, server_msg: list[str]) -> None: """_summary_ Args: - serverMsg (list[str]): _description_ + server_msg (list[str]): _description_ """ @abstractmethod - def on_version(self, serverMsg: list[str]) -> None: + def on_version(self, server_msg: list[str]) -> None: """Sending Server Version to the server Args: - serverMsg (list[str]): List of str coming from the server + server_msg (list[str]): List of str coming from the server """ @abstractmethod - def on_time(self, serverMsg: list[str]) -> None: + def on_time(self, server_msg: list[str]) -> None: """Sending TIME answer to a requestor Args: - serverMsg (list[str]): List of str coming from the server + server_msg (list[str]): List of str coming from the server """ @abstractmethod - def on_ping(self, serverMsg: list[str]) -> None: + def on_ping(self, server_msg: list[str]) -> None: """Sending a PING answer to requestor Args: - serverMsg (list[str]): List of str coming from the server + server_msg (list[str]): List of str coming from the server """ @abstractmethod - def on_version_msg(self, serverMsg: list[str]) -> None: + def on_version_msg(self, server_msg: list[str]) -> None: """Handle version coming from the server \n ex. /version Defender Args: - serverMsg (list[str]): Original message from the server + server_msg (list[str]): Original message from the server """ @abstractmethod - def on_smod(self, serverMsg: list[str]) -> None: + def on_smod(self, server_msg: list[str]) -> None: """Handle SMOD message coming from the server Args: - serverMsg (list[str]): Original server message + server_msg (list[str]): Original server message """ @abstractmethod - def on_sasl(self, serverMsg: list[str], psasl: 'Sasl') -> Optional['MSasl']: + def on_sasl(self, server_msg: list[str]) -> Optional['MSasl']: """Handle SASL coming from a server Args: - serverMsg (list[str]): Original server message - psasl (Sasl): The SASL process object + server_msg (list[str]): Original server message + + Returns: + """ @abstractmethod @@ -528,9 +530,9 @@ class IProtocol(ABC): """ @abstractmethod - def on_md(self, serverMsg: list[str]) -> None: + def on_md(self, server_msg: list[str]) -> None: """Handle MD responses [':001', 'MD', 'client', '001MYIZ03', 'certfp', ':d1235648...'] Args: - serverMsg (list[str]): The server reply + server_msg (list[str]): The server reply """ diff --git a/core/classes/protocols/unreal6.py b/core/classes/protocols/unreal6.py index 8e10746..0c94362 100644 --- a/core/classes/protocols/unreal6.py +++ b/core/classes/protocols/unreal6.py @@ -202,43 +202,52 @@ class Unrealircd6(IProtocol): """Créer le link et envoyer les informations nécessaires pour la connexion au serveur. """ - - nickname = self.__Config.SERVICE_NICKNAME - username = self.__Config.SERVICE_USERNAME - realname = self.__Config.SERVICE_REALNAME - chan = self.__Config.SERVICE_CHANLOG - info = self.__Config.SERVICE_INFO - smodes = self.__Config.SERVICE_SMODES - cmodes = self.__Config.SERVICE_CMODES - umodes = self.__Config.SERVICE_UMODES - host = self.__Config.SERVICE_HOST + service_id = self.__Config.SERVICE_ID + service_nickname = self.__Config.SERVICE_NICKNAME + service_username = self.__Config.SERVICE_USERNAME + service_realname = self.__Config.SERVICE_REALNAME + service_channel_log = self.__Config.SERVICE_CHANLOG + service_info = self.__Config.SERVICE_INFO + service_smodes = self.__Config.SERVICE_SMODES + service_cmodes = self.__Config.SERVICE_CMODES + service_umodes = self.__Config.SERVICE_UMODES + service_hostname = self.__Config.SERVICE_HOST service_name = self.__Config.SERVICE_NAME protocolversion = self.protocol_version - password = self.__Config.SERVEUR_PASSWORD - link = self.__Config.SERVEUR_LINK + server_password = self.__Config.SERVEUR_PASSWORD + server_link = self.__Config.SERVEUR_LINK server_id = self.__Config.SERVEUR_ID - service_id = self.__Config.SERVICE_ID version = self.__Config.CURRENT_VERSION unixtime = self.__Utils.get_unixtime() - self.send2socket(f":{server_id} PASS :{password}", print_log=False) + self.send2socket(f":{server_id} PASS :{server_password}", print_log=False) self.send2socket(f":{server_id} PROTOCTL SID NOQUIT NICKv2 SJOIN SJ3 NICKIP TKLEXT2 NEXTBANS CLK EXTSWHOIS MLOCK MTAGS") - self.send2socket(f":{server_id} PROTOCTL EAUTH={link},{protocolversion},,{service_name}-v{version}") + self.send2socket(f":{server_id} PROTOCTL EAUTH={server_link},{protocolversion},,{service_name}-v{version}") self.send2socket(f":{server_id} PROTOCTL SID={server_id}") self.send2socket(f":{server_id} PROTOCTL BOOTED={unixtime}") - self.send2socket(f":{server_id} SERVER {link} 1 :{info}") + self.send2socket(f":{server_id} SERVER {server_link} 1 :{service_info}") self.send2socket("EOS") - self.send2socket(f":{server_id} {nickname} :Reserved for services") - self.send2socket(f":{server_id} UID {nickname} 1 {unixtime} {username} {host} {service_id} * {smodes} * * fwAAAQ== :{realname}") - self.send_sjoin(chan) - self.send2socket(f":{server_id} TKL + Q * {nickname} {host} 0 {unixtime} :Reserved for services") - self.send2socket(f":{service_id} MODE {chan} {cmodes}") + self.send2socket(f":{server_id} {service_nickname} :Reserved for services") + self.send2socket(f":{server_id} UID {service_nickname} 1 {unixtime} {service_username} {service_hostname} {service_id} * {service_smodes} * * fwAAAQ== :{service_realname}") + self.send_sjoin(service_channel_log) + self.send2socket(f":{server_id} TKL + Q * {service_nickname} {service_hostname} 0 {unixtime} :Reserved for services") + self.send2socket(f":{service_id} MODE {service_channel_log} {service_cmodes}") self.__Logs.debug(f'>> {__name__} Link information sent to the server') def send_gline(self, nickname: str, hostname: str, set_by: str, expire_timestamp: int, set_at_timestamp: int, reason: str) -> None: + """Send a gline command to the server + + Args: + nickname (str): The nickname of the client. + hostname (str): The hostname of the client. + set_by (str): The nickname who send the gline + expire_timestamp (int): Expire timestamp + set_at_timestamp (int): Set at timestamp + reason (str): The reason of the gline. + """ # TKL + G user host set_by expire_timestamp set_at_timestamp :reason self.send2socket(f":{self.__Config.SERVEUR_ID} TKL + G {nickname} {hostname} {set_by} {expire_timestamp} {set_at_timestamp} :{reason}") @@ -1286,7 +1295,7 @@ class Unrealircd6(IProtocol): except AttributeError as ae: self.__Logs.error(f"Attribute Error: {ae}") except Exception as err: - self.__Logs.error(f"General Error: {err} - {srv_msg}") + self.__Logs.error(f"General Error: {err} - {srv_msg}" , exc_info=True) def on_server_ping(self, serverMsg: list[str]) -> None: """Send a PONG message to the server diff --git a/core/classes/rehash.py b/core/classes/rehash.py index 3f85ed3..da8cd61 100644 --- a/core/classes/rehash.py +++ b/core/classes/rehash.py @@ -22,7 +22,12 @@ REHASH_MODULES = [ def restart_service(uplink: 'Irc', reason: str = "Restarting with no reason!") -> None: + """ + Args: + uplink (Irc): The Irc instance + reason (str): The reason of the restart. + """ # reload modules. for module in uplink.ModuleUtils.model_get_loaded_modules().copy(): uplink.ModuleUtils.unload_one_module(uplink, module.module_name) @@ -34,7 +39,7 @@ def restart_service(uplink: 'Irc', reason: str = "Restarting with no reason!") - uplink.Base.garbage_collector_thread() uplink.Logs.debug(f'[{uplink.Config.SERVICE_NICKNAME} RESTART]: Reloading configuration!') - uplink.Protocol.send_squit(server_id=uplink.Config.SERVEUR_ID, server_link=uplink.Config.SERVEUR_LINK, reason="Defender Power off") + uplink.Protocol.send_squit(server_id=uplink.Config.SERVEUR_ID, server_link=uplink.Config.SERVEUR_LINK, reason=reason) uplink.Logs.debug('Restarting Defender ...') uplink.IrcSocket.shutdown(socket.SHUT_RDWR) uplink.IrcSocket.close() @@ -72,13 +77,13 @@ def rehash_service(uplink: 'Irc', nickname: str) -> None: channel=uplink.Config.SERVICE_CHANLOG ) uplink.Utils = sys.modules['core.utils'] - uplink.Loader.Config = uplink.Loader.ConfModule.Configuration(uplink.Loader).get_config_model() - uplink.Loader.Config.HSID = config_model_bakcup.HSID - uplink.Loader.Config.DEFENDER_INIT = config_model_bakcup.DEFENDER_INIT - uplink.Loader.Config.DEFENDER_RESTART = config_model_bakcup.DEFENDER_RESTART - uplink.Loader.Config.SSL_VERSION = config_model_bakcup.SSL_VERSION - uplink.Loader.Config.CURRENT_VERSION = config_model_bakcup.CURRENT_VERSION - uplink.Loader.Config.LATEST_VERSION = config_model_bakcup.LATEST_VERSION + uplink.Config = uplink.Loader.ConfModule.Configuration(uplink.Loader).get_config_model() + uplink.Config.HSID = config_model_bakcup.HSID + uplink.Config.DEFENDER_INIT = config_model_bakcup.DEFENDER_INIT + uplink.Config.DEFENDER_RESTART = config_model_bakcup.DEFENDER_RESTART + uplink.Config.SSL_VERSION = config_model_bakcup.SSL_VERSION + uplink.Config.CURRENT_VERSION = config_model_bakcup.CURRENT_VERSION + uplink.Config.LATEST_VERSION = config_model_bakcup.LATEST_VERSION conf_bkp_dict: dict = config_model_bakcup.to_dict() config_dict: dict = uplink.Config.to_dict() diff --git a/core/classes/reputation.py b/core/classes/reputation.py index 3ee0d47..242290a 100644 --- a/core/classes/reputation.py +++ b/core/classes/reputation.py @@ -9,9 +9,14 @@ class Reputation: UID_REPUTATION_DB: list[MReputation] = [] def __init__(self, loader: 'Loader'): + """ + + Args: + loader (Loader): The Loader instance. + """ self.Logs = loader.Logs - self.MReputation: MReputation = MReputation + self.MReputation: Optional[MReputation] = None def insert(self, new_reputation_user: MReputation) -> bool: """Insert a new Reputation User object @@ -47,7 +52,7 @@ class Reputation: Args: uid (str): UID of the user - newNickname (str): New nickname + new_nickname (str): New nickname Returns: bool: True if updated diff --git a/core/classes/sasl.py b/core/classes/sasl.py index 8595cd9..a249a06 100644 --- a/core/classes/sasl.py +++ b/core/classes/sasl.py @@ -1,4 +1,4 @@ -from typing import Optional, Union, TYPE_CHECKING +from typing import Optional, TYPE_CHECKING if TYPE_CHECKING: from core.definition import MSasl @@ -9,13 +9,18 @@ class Sasl: DB_SASL: list['MSasl'] = [] def __init__(self, loader: 'Loader'): + """ + + Args: + loader (Loader): The Loader instance. + """ self.Logs = loader.Logs # logger def insert_sasl_client(self, psasl: 'MSasl') -> bool: """Insert a new Sasl authentication Args: - new_user (UserModel): New userModel object + psasl (MSasl): New userModel object Returns: bool: True if inserted @@ -38,7 +43,7 @@ class Sasl: """Delete the User starting from the UID Args: - uid (str): UID of the user + client_uid (str): UID of the user Returns: bool: True if deleted diff --git a/core/classes/settings.py b/core/classes/settings.py index fa503aa..913fbbc 100644 --- a/core/classes/settings.py +++ b/core/classes/settings.py @@ -1,5 +1,5 @@ -'''This class should never be reloaded. -''' +"""This class should never be reloaded. +""" from logging import Logger from threading import Timer, Thread, RLock from socket import socket @@ -18,7 +18,7 @@ class Settings: RUNNING_TIMERS: list[Timer] = [] RUNNING_THREADS: list[Thread] = [] RUNNING_SOCKETS: list[socket] = [] - PERIODIC_FUNC: dict[object] = {} + PERIODIC_FUNC: dict[str, Any] = {} LOCK: RLock = RLock() CONSOLE: bool = False diff --git a/core/classes/translation.py b/core/classes/translation.py index 19849ea..6e0bad7 100644 --- a/core/classes/translation.py +++ b/core/classes/translation.py @@ -11,9 +11,13 @@ if TYPE_CHECKING: class Translation: def __init__(self, loader: 'Loader') -> None: + """ + + Args: + loader (Loader): The Loader instance. + """ self.Logs = loader.Logs self.Settings = loader.Settings - return None def get_translation(self) -> dict[str, list[list[str]]]: try: diff --git a/core/irc.py b/core/irc.py index 3239c1b..08b4263 100644 --- a/core/irc.py +++ b/core/irc.py @@ -1014,7 +1014,7 @@ class Irc: except KeyError as ke: self.Logs.error(f"Key Error: {ke} - list recieved: {cmd}") except Exception as err: - self.Logs.error(f"General Error: {ke} - list recieved: {cmd}") + self.Logs.error(f"General Error: {err} - list recieved: {cmd}", exc_info=True) case 'unload': # unload mod_defender diff --git a/core/module.py b/core/module.py index 97438fa..e4317e4 100644 --- a/core/module.py +++ b/core/module.py @@ -206,6 +206,7 @@ class Module: module = self.model_get_module(module_name) if module is None: self.__Logs.debug(f"[ UNLOAD MODULE ERROR ] This module {module_name} is not loaded!") + self.db_delete_module(module_name) uplink.Protocol.send_priv_msg( nick_from=self.__Config.SERVICE_NICKNAME, msg=f"[ {red}UNLOAD MODULE ERROR{nogc} ] This module {module_name} is not loaded!", diff --git a/mods/jsonrpc/mod_jsonrpc.py b/mods/jsonrpc/mod_jsonrpc.py index 9cb324e..1b7bcea 100644 --- a/mods/jsonrpc/mod_jsonrpc.py +++ b/mods/jsonrpc/mod_jsonrpc.py @@ -1,13 +1,13 @@ import logging import asyncio +from unrealircd_rpc_py.objects.Definition import LiveRPCResult import mods.jsonrpc.utils as utils import mods.jsonrpc.threads as thds from time import sleep -from types import SimpleNamespace from typing import TYPE_CHECKING from dataclasses import dataclass -from unrealircd_rpc_py.Live import LiveWebsocket, LiveUnixSocket -from unrealircd_rpc_py.Loader import Loader +from unrealircd_rpc_py.ConnectionFactory import ConnectionFactory +from unrealircd_rpc_py.LiveConnectionFactory import LiveConnectionFactory if TYPE_CHECKING: from core.irc import Irc @@ -85,43 +85,24 @@ class Jsonrpc(): self.__load_module_configuration() # End of mandatory methods you can start your customization # - self.UnrealIrcdRpcLive: LiveWebsocket = LiveWebsocket( - url=self.Config.JSONRPC_URL, - username=self.Config.JSONRPC_USER, - password=self.Config.JSONRPC_PASSWORD, - callback_object_instance=self, - callback_method_or_function_name='callback_sent_to_irc' - ) - - if self.UnrealIrcdRpcLive.get_error.code != 0: - self.Logs.error(f"{self.UnrealIrcdRpcLive.get_error.message} ({self.UnrealIrcdRpcLive.get_error.code})") + try: + self.Rpc = ConnectionFactory(self.Config.DEBUG_LEVEL).get(self.Config.JSONRPC_METHOD) + self.LiveRpc = LiveConnectionFactory(self.Config.DEBUG_LEVEL).get(self.Config.JSONRPC_METHOD) + self.Rpc.setup({'url': self.Config.JSONRPC_URL, 'username': self.Config.JSONRPC_USER, 'password': self.Config.JSONRPC_PASSWORD}) + self.LiveRpc.setup({'url': self.Config.JSONRPC_URL, 'username': self.Config.JSONRPC_USER, 'password': self.Config.JSONRPC_PASSWORD, + 'callback_object_instance' : self, 'callback_method_or_function_name': 'callback_sent_to_irc'}) + + if self.ModConfig.jsonrpc == 1: + self.Base.create_thread(func=self.Threads.thread_subscribe, func_args=(self, ), run_once=True) + + return None + except Exception as err: self.Protocol.send_priv_msg( nick_from=self.Config.SERVICE_NICKNAME, - msg=f"[{self.Config.COLORS.red}ERROR{self.Config.COLORS.nogc}] {self.UnrealIrcdRpcLive.get_error.message}", + msg=f"[{self.Config.COLORS.red}JSONRPC ERROR{self.Config.COLORS.nogc}] {err.__str__()}", channel=self.Config.SERVICE_CHANLOG - ) - raise Exception(f"[LIVE-JSONRPC ERROR] {self.UnrealIrcdRpcLive.get_error.message}") - - self.Rpc: Loader = Loader( - req_method=self.Config.JSONRPC_METHOD, - url=self.Config.JSONRPC_URL, - username=self.Config.JSONRPC_USER, - password=self.Config.JSONRPC_PASSWORD - ) - - if self.Rpc.get_error.code != 0: - self.Logs.error(f"{self.Rpc.get_error.message} ({self.Rpc.get_error.code})") - self.Protocol.send_priv_msg( - nick_from=self.Config.SERVICE_NICKNAME, - msg=f"[{self.Config.COLORS.red}JSONRPC ERROR{self.Config.COLORS.nogc}] {self.Rpc.get_error.message}", - channel=self.Config.SERVICE_CHANLOG - ) - raise Exception(f"[JSONRPC ERROR] {self.Rpc.get_error.message}") - - if self.ModConfig.jsonrpc == 1: - self.Base.create_thread(func=self.Threads.thread_subscribe, func_args=(self, ), run_once=True) - - return None + ) + self.Logs.error(f"JSONRPC ERROR: {err.__str__()}") def __create_tables(self) -> None: """Methode qui va créer la base de donnée si elle n'existe pas. @@ -143,7 +124,7 @@ class Jsonrpc(): self.Base.db_execute_query(table_logs) return None - def callback_sent_to_irc(self, response: SimpleNamespace) -> None: + def callback_sent_to_irc(self, response: LiveRPCResult) -> None: dnickname = self.Config.SERVICE_NICKNAME dchanlog = self.Config.SERVICE_CHANLOG @@ -152,29 +133,19 @@ class Jsonrpc(): bold = self.Config.COLORS.bold red = self.Config.COLORS.red - if self.UnrealIrcdRpcLive.get_error.code != 0: + if response.error.code != 0: self.Protocol.send_priv_msg(nick_from=dnickname, - msg=f"[{bold}{red}JSONRPC ERROR{nogc}{bold}] {self.UnrealIrcdRpcLive.get_error.message}", + msg=f"[{bold}{red}JSONRPC ERROR{nogc}{bold}] {response.error.message} ({response.error.code})", channel=dchanlog) return None - if hasattr(response, 'error'): - if response.error.code != 0: + if isinstance(response.result, bool): + if response.result: self.Protocol.send_priv_msg( - nick_from=self.Config.SERVICE_NICKNAME, - msg=f"[{bold}{red}JSONRPC{nogc}{bold}] JSONRPC Event activated on {self.Config.JSONRPC_URL}", - channel=dchanlog) - - return None - - if hasattr(response, 'result'): - if isinstance(response.result, bool): - if response.result: - self.Protocol.send_priv_msg( nick_from=self.Config.SERVICE_NICKNAME, msg=f"[{bold}{green}JSONRPC{nogc}{bold}] JSONRPC Event activated on {self.Config.JSONRPC_URL}", channel=dchanlog) - return None + return None level = response.result.level if hasattr(response.result, 'level') else '' subsystem = response.result.subsystem if hasattr(response.result, 'subsystem') else '' @@ -278,18 +249,13 @@ class Jsonrpc(): match option: case 'get': nickname = str(cmd[2]) - uid_to_get = self.User.get_uid(nickname) - if uid_to_get is None: - return None - rpc = self.Rpc - UserInfo = rpc.User.get(uid_to_get) - if rpc.get_error.code != 0: - self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f'{rpc.get_error.message}') + UserInfo = rpc.User.get(nickname) + if UserInfo.error.code != 0: + self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f'{UserInfo.error.message}') return None - self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f'UID : {UserInfo.id}') self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f'NICKNAME : {UserInfo.name}') self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f'USERNAME : {UserInfo.user.username}') @@ -321,9 +287,8 @@ class Jsonrpc(): case 'jrinstances': try: self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"GC Collect: {self.MainUtils.run_python_garbage_collector()}") - self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Nombre d'instance LiveWebsock: {self.MainUtils.get_number_gc_objects(LiveWebsocket)}") - self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Nombre d'instance LiveUnixSocket: {self.MainUtils.get_number_gc_objects(LiveUnixSocket)}") - self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Nombre d'instance Loader: {self.MainUtils.get_number_gc_objects(Loader)}") + self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Nombre d'instance LiveWebsock: {self.MainUtils.get_number_gc_objects(LiveConnectionFactory)}") + self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Nombre d'instance ConnectionFactory: {self.MainUtils.get_number_gc_objects(ConnectionFactory)}") self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Nombre de toute les instances: {self.MainUtils.get_number_gc_objects()}") except Exception as err: self.Logs.error(f"Unknown Error: {err}") \ No newline at end of file diff --git a/mods/jsonrpc/threads.py b/mods/jsonrpc/threads.py index f35b902..1585acd 100644 --- a/mods/jsonrpc/threads.py +++ b/mods/jsonrpc/threads.py @@ -5,24 +5,20 @@ if TYPE_CHECKING: from mods.jsonrpc.mod_jsonrpc import Jsonrpc def thread_subscribe(uplink: 'Jsonrpc') -> None: - response: dict[str, dict] = {} + snickname = uplink.Config.SERVICE_NICKNAME schannel = uplink.Config.SERVICE_CHANLOG + uplink.is_streaming = True + response = asyncio.run(uplink.LiveRpc.subscribe(["all"])) - if uplink.UnrealIrcdRpcLive.get_error.code == 0: - uplink.is_streaming = True - response = asyncio.run(uplink.UnrealIrcdRpcLive.subscribe(["all"])) - else: + if response.error.code != 0: uplink.Protocol.send_priv_msg(nick_from=snickname, - msg=f"[{uplink.Config.COLORS.red}JSONRPC ERROR{uplink.Config.COLORS.nogc}] {uplink.UnrealIrcdRpcLive.get_error.message}", + msg=f"[{uplink.Config.COLORS.red}JSONRPC ERROR{uplink.Config.COLORS.nogc}] {response.error.message}", channel=schannel ) - if response is None: - return - - code = response.get('error', {}).get('code', 0) - message = response.get('error', {}).get('message', None) + code = response.error.code + message = response.error.message if code == 0: uplink.Protocol.send_priv_msg( @@ -39,18 +35,15 @@ def thread_subscribe(uplink: 'Jsonrpc') -> None: def thread_unsubscribe(uplink: 'Jsonrpc') -> None: - response: dict[str, dict] = asyncio.run(uplink.UnrealIrcdRpcLive.unsubscribe()) + response = asyncio.run(uplink.LiveRpc.unsubscribe()) uplink.Logs.debug("[JSONRPC UNLOAD] Unsubscribe from the stream!") uplink.is_streaming = False uplink.update_configuration('jsonrpc', 0) snickname = uplink.Config.SERVICE_NICKNAME schannel = uplink.Config.SERVICE_CHANLOG - if response is None: - return None - - code = response.get('error', {}).get('code', 0) - message = response.get('error', {}).get('message', None) + code = response.error.code + message = response.error.message if code != 0: uplink.Protocol.send_priv_msg(