iio/DEFENDER
1
0
Fork 0
mirror of https://github.com/iio612/DEFENDER.git synced 2026-02-13 19:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to version 6.0.3

Browse Source
This commit is contained in:
adator
2024-11-17 21:09:14 +01:00
parent b81f502b95
commit d37c152160
5 changed files with 77 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/classes/channel.py
View File

@@ -2,6 +2,8 @@ from re import findall
from typing import Union, Literal, TYPE_CHECKING from typing import Union, Literal, TYPE_CHECKING
from dataclasses import asdict from dataclasses import asdict
from core.classes import user
if TYPE_CHECKING: if TYPE_CHECKING:
from core.definition import MChannel from core.definition import MChannel
from core.base import Base from core.base import Base
@@ -31,6 +33,10 @@ class Channel:
result = False result = False
exist = False exist = False
if not self.Is_Channel(newChan.name):
self.Logs.error(f"The channel {newChan.name} is not valid, channel must start with #")
return False
for record in self.UID_CHANNEL_DB: for record in self.UID_CHANNEL_DB:
if record.name.lower() == newChan.name.lower(): if record.name.lower() == newChan.name.lower():
# If the channel exist, update the user list and do not go further # If the channel exist, update the user list and do not go further
@@ -129,6 +135,29 @@ class Channel:
except Exception as err: except Exception as err:
self.Logs.error(f'{err}') self.Logs.error(f'{err}')
def is_user_present_in_channel(self, channel_name: str, uid: str) -> bool:
"""Check if a user is present in the channel
Args:
channel_name (str): The channel to check
uid (str): The UID
Returns:
bool: True if the user is present in the channel
"""
user_found = False
chan = self.get_Channel(channel_name=channel_name)
if chan is None:
return user_found
clean_uid = self.Base.clean_uid(uid=uid)
for chan_uid in chan.uids:
if self.Base.clean_uid(chan_uid) == clean_uid:
user_found = True
break
return user_found
def clean_channel(self) -> None: def clean_channel(self) -> None:
"""Remove Channels if empty """Remove Channels if empty
""" """

16
core/classes/protocols/unreal6.py
View File

@@ -476,6 +476,17 @@ class Unrealircd6:
except Exception as err: except Exception as err:
self.__Base.logs.error(f"{__name__} - General Error: {err}") self.__Base.logs.error(f"{__name__} - General Error: {err}")
def on_mode(self, serverMsg: list[str]) -> None:
"""Handle mode coming from a server
Args:
serverMsg (list[str]): Original server message
"""
#['@msgid=d0ySx56Yd0nc35oHts2SkC-/J9mVUA1hfM6...', ':001', 'MODE', '#a', '+nt', '1723207536']
#['@unrealircd.org/userhost=adator@localhost;...', ':001LQ0L0C', 'MODE', '#services', '-l']
return None
def on_umode2(self, serverMsg: list[str]) -> None: def on_umode2(self, serverMsg: list[str]) -> None:
"""Handle umode2 coming from a server """Handle umode2 coming from a server
@@ -622,8 +633,11 @@ class Unrealircd6:
# ':001T6VU3F', '001JGWB2K', '@11ZAAAAAB', # ':001T6VU3F', '001JGWB2K', '@11ZAAAAAB',
# '001F16WGR', '001X9YMGQ', '*+001DYPFGP', '@00BAAAAAJ', '001AAGOG9', '001FMFVG8', '001DAEEG7', # '001F16WGR', '001X9YMGQ', '*+001DYPFGP', '@00BAAAAAJ', '001AAGOG9', '001FMFVG8', '001DAEEG7',
# '&~G:unknown-users', '"~G:websocket-users', '"~G:known-users', '"~G:webirc-users'] # '&~G:unknown-users', '"~G:websocket-users', '"~G:known-users', '"~G:webirc-users']
# [':00B', 'SJOIN', '1731872579', '#services', '+', ':00BAAAAAB']
serverMsg_copy = serverMsg.copy() serverMsg_copy = serverMsg.copy()
serverMsg_copy.pop(0) if serverMsg_copy[0].startswith('@'):
serverMsg_copy.pop(0)
channel = str(serverMsg_copy[3]).lower() channel = str(serverMsg_copy[3]).lower()
len_cmd = len(serverMsg_copy) len_cmd = len(serverMsg_copy)
list_users:list = [] list_users:list = []

54
core/irc.py
View File

@@ -750,12 +750,12 @@ class Irc:
case 'PING': case 'PING':
self.Protocol.on_server_ping(serverMsg=original_response) self.Protocol.on_server_ping(serverMsg=original_response)
# print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
return None return None
case 'SJOIN': case 'SJOIN':
self.Protocol.on_sjoin(serverMsg=original_response) self.Protocol.on_sjoin(serverMsg=original_response)
# print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case 'EOS': # TODO case 'EOS': # TODO
hsid = str(original_response[0]).replace(':','') hsid = str(original_response[0]).replace(':','')
@@ -810,7 +810,7 @@ class Irc:
classe_object.cmd(original_response) classe_object.cmd(original_response)
# Stop here When EOS # Stop here When EOS
# print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
return None return None
case 'UID': case 'UID':
@@ -820,44 +820,44 @@ class Irc:
for classe_name, classe_object in self.loaded_classes.items(): for classe_name, classe_object in self.loaded_classes.items():
classe_object.cmd(original_response) classe_object.cmd(original_response)
# print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
except Exception as err: except Exception as err:
self.Logs.error(f'General Error: {err}') self.Logs.error(f'General Error: {err}')
case 'QUIT': case 'QUIT':
self.Protocol.on_quit(serverMsg=original_response) self.Protocol.on_quit(serverMsg=original_response)
# print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case 'PROTOCTL': case 'PROTOCTL':
self.Protocol.on_protoctl(serverMsg=original_response) self.Protocol.on_protoctl(serverMsg=original_response)
# print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case 'SVS2MODE': case 'SVS2MODE':
# >> [':00BAAAAAG', 'SVS2MODE', '001U01R03', '-r'] # >> [':00BAAAAAG', 'SVS2MODE', '001U01R03', '-r']
self.Protocol.on_svs2mode(serverMsg=original_response) self.Protocol.on_svs2mode(serverMsg=original_response)
# print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case 'SQUIT': case 'SQUIT':
self.Protocol.on_squit(serverMsg=original_response) self.Protocol.on_squit(serverMsg=original_response)
# print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case 'PART': case 'PART':
self.Protocol.on_part(serverMsg=parsed_protocol) self.Protocol.on_part(serverMsg=parsed_protocol)
# print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case 'VERSION': case 'VERSION':
self.Protocol.on_version_msg(serverMsg=original_response) self.Protocol.on_version_msg(serverMsg=original_response)
# print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case 'UMODE2': case 'UMODE2':
# [':adator_', 'UMODE2', '-i'] # [':adator_', 'UMODE2', '-i']
self.Protocol.on_umode2(serverMsg=original_response) self.Protocol.on_umode2(serverMsg=original_response)
# print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case 'NICK': case 'NICK':
self.Protocol.on_nick(serverMsg=original_response) self.Protocol.on_nick(serverMsg=original_response)
# print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case 'REPUTATION': # TODO case 'REPUTATION': # TODO
# :001 REPUTATION 127.0.0.1 118 # :001 REPUTATION 127.0.0.1 118
@@ -875,7 +875,7 @@ class Irc:
else: else:
self.first_score = int(original_response[3]) self.first_score = int(original_response[3])
# print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
# Possibilité de déclancher les bans a ce niveau. # Possibilité de déclancher les bans a ce niveau.
except IndexError as ie: except IndexError as ie:
self.Logs.error(f'{ie}') self.Logs.error(f'{ie}')
@@ -884,10 +884,10 @@ class Irc:
self.Logs.error(f'Impossible to convert first_score: {ve}') self.Logs.error(f'Impossible to convert first_score: {ve}')
case 'SLOG': # TODO case 'SLOG': # TODO
print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case 'MD': # TODO case 'MD': # TODO
print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case 'PRIVMSG': # TODO case 'PRIVMSG': # TODO
try: try:
@@ -974,24 +974,23 @@ class Irc:
self.Logs.error(f'{io}') self.Logs.error(f'{io}')
case 'PONG': # TODO case 'PONG': # TODO
print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case 'MODE': # TODO case 'MODE': # TODO
#['@msgid=d0ySx56Yd0nc35oHts2SkC-/J9mVUA1hfM6+Z4494xWUg;time=2024-08-09T12:45:36.651Z', #['@msgid=d0ySx56Yd0nc35oHts2SkC-/J9mVUA1hfM6...', ':001', 'MODE', '#a', '+nt', '1723207536']
# ':001', 'MODE', '#a', '+nt', '1723207536'] #['@unrealircd.org/userhost=adator@localhost;...', ':001LQ0L0C', 'MODE', '#services', '-l']
# [':adator_', 'UMODE2', '-i'] self.Logs.debug(f"** handle {parsed_protocol}")
print(f"** handle {parsed_protocol}")
case '320': # TODO case '320': # TODO
#:irc.deb.biz.st 320 PyDefender IRCParis07 :is in security-groups: known-users,webirc-users,tls-and-known-users,tls-users #:irc.deb.biz.st 320 PyDefender IRCParis07 :is in security-groups: known-users,webirc-users,tls-and-known-users,tls-users
print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case '318': # TODO case '318': # TODO
#:irc.deb.biz.st 318 PyDefender IRCParis93 :End of /WHOIS list. #:irc.deb.biz.st 318 PyDefender IRCParis93 :End of /WHOIS list.
print(f"** handle {parsed_protocol}") self.Logs.debug(f"** handle {parsed_protocol}")
case None: case None:
print(f"** TO BE HANDLE {original_response}") self.Logs.debug(f"** TO BE HANDLE {original_response}")
if len(original_response) == 7: if len(original_response) == 7:
if original_response[2] == 'PRIVMSG' and original_response[4] == ':auth': if original_response[2] == 'PRIVMSG' and original_response[4] == ':auth':
@@ -1003,10 +1002,11 @@ class Irc:
else: else:
self.Logs.debug(f">> {original_response}") self.Logs.debug(f">> {original_response}")
if original_response[2] != 'UID': if len(original_response) > 2:
# Envoyer la commande aux classes dynamiquement chargées if original_response[2] != 'UID':
for classe_name, classe_object in self.loaded_classes.items(): # Envoyer la commande aux classes dynamiquement chargées
classe_object.cmd(original_response) for classe_name, classe_object in self.loaded_classes.items():
classe_object.cmd(original_response)
except IndexError as ie: except IndexError as ie:
self.Logs.error(f"{ie} / {original_response} / length {str(len(original_response))}") self.Logs.error(f"{ie} / {original_response} / length {str(len(original_response))}")

8
mods/mod_command.py
View File

@@ -252,7 +252,7 @@ class Command:
if userObj is None: if userObj is None:
return None return None
if 'r' not in userObj.umodes: if 'r' not in userObj.umodes and 'o' not in userObj.umodes:
return None return None
db_data: dict[str, str] = {"nickname": userObj.nickname, "channel": channel_name} db_data: dict[str, str] = {"nickname": userObj.nickname, "channel": channel_name}
@@ -285,12 +285,13 @@ class Command:
option: str = str(cmd[1]).lower() option: str = str(cmd[1]).lower()
match option: match option:
case 'set': case 'set':
allowed_modes: list[str] = self.Base.Settings.PROTOCTL_PREFIX # ['q','a','o','h','v']
if len(cmd) < 5: if len(cmd) < 5:
self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"/msg {dnickname} {command.upper()} [nickname] [+/-mode] [#channel]") self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"/msg {dnickname} {command.upper()} [nickname] [+/-mode] [#channel]")
self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"AutoModes available: {' / '.join(allowed_modes)}") self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"AutoModes available: {' / '.join(allowed_modes)}")
return None return None
allowed_modes: list[str] = self.Base.Settings.PROTOCTL_PREFIX # ['q','a','o','h','v']
# userObj: MUser = self.User.get_User(str(cmd[2])) # userObj: MUser = self.User.get_User(str(cmd[2]))
nickname = str(cmd[2]) nickname = str(cmd[2])
mode = str(cmd[3]) mode = str(cmd[3])
@@ -342,7 +343,8 @@ class Command:
if db_query.rowcount > 0: if db_query.rowcount > 0:
self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Automode {mode} applied to {nickname} in {chan}") self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Automode {mode} applied to {nickname} in {chan}")
self.Protocol.send2socket(f":{service_id} MODE {chan} {mode} {nickname}") if self.Channel.is_user_present_in_channel(chan, self.User.get_uid(nickname)):
self.Protocol.send2socket(f":{service_id} MODE {chan} {mode} {nickname}")
else: else:
self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"AUTOMODE {mode} cannot be added to {nickname} in {chan} because it doesn't exist") self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"AUTOMODE {mode} cannot be added to {nickname} in {chan} because it doesn't exist")

2
version.json
View File

@@ -1,5 +1,5 @@
{ {
"version": "6.0.1", "version": "6.0.3",
"requests": "2.32.3", "requests": "2.32.3",
"psutil": "6.0.0", "psutil": "6.0.0",