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

V5.3.9

core/installation.py

@@ -37,6 +37,7 @@ class Install:
         self.set_configuration()
 
         if self.skip_install:
+            self.check_packages_version()
             return None
 
         self.check_packages_version()
@@ -85,11 +86,13 @@ class Install:
 
         if not os.path.exists(os.path.join(self.config.defender_install_folder, 'core', 'configuration.json')):
             # If configuration file do not exist
-            exit("/!\\ Configuration file (core/configuration.json) doesn't exist /!\\")
+            exit("/!\\ Configuration file (core/configuration.json) doesn't exist! please create it /!\\")
 
         # Exclude Windows OS from the installation
         if os.name == 'nt':
-            #print('/!\\ Skip installation /!\\')
+            # If windows, modify pip and python virtual environment executable
+            self.config.venv_pip_executable = f'{os.path.join(defender_install_folder, venv_folder, "Scripts")}{os.sep}pip.exe'
+            self.config.venv_python_executable = f'{os.path.join(defender_install_folder, venv_folder, "Scripts")}{os.sep}python.exe'
             self.skip_install = True
             return False
 

core/irc.py

@@ -313,7 +313,7 @@ class Irc:
 
     def send_response(self, responses:list[bytes]) -> None:
         try:
-            # print(data)
+            # print(responses)
             for data in responses:
                 response = data.decode(self.CHARSET[0]).split()
                 self.cmd(response)

mods/mod_command.py

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

mods/mod_jsonrpc.py

@@ -263,6 +263,9 @@ class Jsonrpc():
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CLIENT PORT          : {UserInfo.client_port}')
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :SERVER PORT          : {UserInfo.server_port}')
                             
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CERTFP               : {UserInfo.tls.certfp}')
+                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CIPHER               : {UserInfo.tls.cipher}')
+
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :IDLE SINCE           : {UserInfo.idle_since}')
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CONNECTED SINCE      : {UserInfo.connected_since}')
 

version.json

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