fix pylint

Author: 6C656C65

.pylintrc

@@ -1,2 +1,2 @@
 [MESSAGES CONTROL]
-disable=too-many-instance-attributes, too-many-arguments, too-many-positional-arguments
+disable=too-many-instance-attributes, too-many-arguments, too-many-positional-arguments, R0801

README.md

@@ -84,7 +84,6 @@ If you encounter any problems, or if you want to use the program in a particular
 - Proxy authentication
 - Benchmark
 - Admin mode, statistiques and real time request
-- Shortcut
 - Custom header
 
 ---

utils/proxy.py

@@ -34,7 +34,8 @@ class ProxyServer:
     # pylint: disable=too-many-locals
     def __init__(self, host, port, debug, access_log, block_log,
                  html_403, no_filter, filter_mode, no_logging_access, no_logging_block, ssl_inspect,
-                 blocked_sites, blocked_url, shortcuts, inspect_ca_cert, inspect_ca_key, inspect_certs_folder):
+                 blocked_sites, blocked_url, shortcuts, inspect_ca_cert,
+                 inspect_ca_key, inspect_certs_folder):
         """
         Initializes the ProxyServer instance with the provided configurations.
         """
@@ -204,12 +205,12 @@ def handle_http_request(self, client_socket, request):
             print(shortcut_url)
             if shortcut_url:
                 response = (
-                    "HTTP/1.1 302 Found\r\n"
-                    "Location: {shortcut_url}\r\n"
-                    "Content-Length: 0\r\n"
+                    f"HTTP/1.1 302 Found\r\n"
+                    f"Location: {shortcut_url}\r\n"
+                    f"Content-Length: 0\r\n"
                     "\r\n"
-                ).format(shortcut_url=shortcut_url)
-                
+                )
+
                 client_socket.sendall(response.encode())
                 client_socket.close()
                 return
@@ -268,16 +269,16 @@ def forward_request_to_server(self, client_socket, request, url):
                     client_socket.send(response)
                 else:
                     break
-        except Exception as e:
-            self.console_logger.error(f"Error connecting to the server {server_host}: {e}")
+        except (socket.timeout, socket.gaierror, ConnectionRefusedError, OSError) as e:
+            self.console_logger.error("Error connecting to the server %s : %s", server_host, e)
             response = (
                 f"HTTP/1.1 502 Bad Gateway\r\n"
                 f"Content-Length: {len('Bad Gateway')} \r\n"
-                f"\r\n"
+                "\r\n"
                 f"Bad Gateway"
             )
             client_socket.sendall(response.encode())
-            client_socket.close()            
+            client_socket.close()
 
     def parse_url(self, url):
         """
@@ -443,16 +444,16 @@ def handle_https_connection(self, client_socket, first_line):
                         first_line
                     )
                 self.transfer_data_between_sockets(client_socket, server_socket)
-            except Exception as e:
-                self.console_logger.error(f"Error connecting to the server {server_host}: {e}")
+            except (socket.timeout, socket.gaierror, ConnectionRefusedError, OSError) as e:
+                self.console_logger.error("Error connecting to the server %s: %s", server_host, e)
                 response = (
                     f"HTTP/1.1 502 Bad Gateway\r\n"
                     f"Content-Length: {len('Bad Gateway')} \r\n"
                     f"\r\n"
                     f"Bad Gateway"
                 )
                 client_socket.sendall(response.encode())
-                client_socket.close()  
+                client_socket.close()
 
     def transfer_data_between_sockets(self, client_socket, server_socket):
         """

utils/shortcuts.py

@@ -1,40 +1,37 @@
 """
-filter.py
+shortcuts.py
 
-This module contains functions and a process to filter and block domains and URLs.
-It loads blocked domain names and URLs from specified files, then listens for 
-incoming requests to check if the domain or URL should be blocked.
+This module contains functions and a process to load and manage URL shortcuts.
+It loads shortcuts (alias to URL mappings) from a specified file, and provides
+a process that listens for requests to resolve an alias to its corresponding URL.
 
 Functions:
-- load_blacklist: Loads blocked FQDNs and URLs from files into sets for fast lookup.
-- filter_process: The process that checks whether a domain or URL is blocked.
+- load_shortcuts: Loads URL alias mappings from a file into a dictionary for fast lookup.
+- shortcuts_process: The process that listens for alias requests and resolves them to URLs.
 """
 
 import multiprocessing
 import time
 import sys
 import threading
-import requests
 
 def load_shortcuts(shortcuts_path: str) -> dict:
     """
-    Loads blocked FQDNs or URLs from a file or URL into a set for fast lookup.
+    Loads URL alias mappings from a file into a dictionary for fast lookup.
     
     Args:
-        blocked_sites_path (str): The path or URL to the file containing blocked FQDNs.
-        blocked_url_path (str): The path or URL to the file containing blocked URLs.
-        filter_mode (str): Mode to determine if we load from local file or HTTP URL.
+        shortcuts_path (str): The path to the file containing alias=URL mappings.
     
     Returns:
-        set: A set of blocked domains/URLs.
+        dict: A dictionary mapping aliases to URLs.
     """
     shortcuts = {}
 
     with open(shortcuts_path, 'r', encoding='utf-8') as f:
         for line in f:
             line = line.strip()
             if "=" in line:
-                alias, url = line.split("=", 1) 
+                alias, url = line.split("=", 1)
                 shortcuts[alias.strip()] = url.strip()
 
     return shortcuts
@@ -46,15 +43,12 @@ def shortcuts_process(
     shortcuts_path: str
 ) -> None:
     """
-    Process that listens for requests and checks if the domain/URL should be blocked.
+    Process that listens for alias requests and resolves them to URLs.
     
     Args:
-        queue (multiprocessing.Queue): A queue to receive URL/domain for checking.
-        result_queue (multiprocessing.Queue): A queue to send back the result of
-                the filtering (blocked or allowed).
-        filter_mode (str): Filter list mode (local or http).
-        blocked_sites_path (str): The path to the file containing blocked FQDNs.
-        blocked_url_path (str): The path to the file containing blocked URLs.
+        queue (multiprocessing.Queue): A queue to receive alias for URL resolution.
+        result_queue (multiprocessing.Queue): A queue to send back the resolved URL.
+        shortcuts_path (str): The path to the file containing alias=URL mappings.
     """
     manager = multiprocessing.Manager()
     shortcuts_data = manager.dict({