pyproxytools 0.4.5__tar.gz → 0.5.0__tar.gz

pyproxytools-0.5.0/MANIFEST.in

@@ -0,0 +1,2 @@
+include pyproxy/monitoring/messages.pot
+recursive-include pyproxy/monitoring/translations *

{pyproxytools-0.4.5/pyproxytools.egg-info → pyproxytools-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyproxytools
-Version: 0.4.5
+Version: 0.5.0
 Summary: Lightweight and fast python web proxy
 Author: pyproxytools
 License-Expression: MIT
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
@@ -22,12 +23,13 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: rich-argparse>=1.7.0
-Requires-Dist: pyOpenSSL>=25.0.0
-Requires-Dist: requests>=2.31.0
-Requires-Dist: Flask>=3.1.0
+Requires-Dist: rich-argparse>=1.7.1
+Requires-Dist: pyOpenSSL>=25.3.0
+Requires-Dist: requests>=2.32.5
+Requires-Dist: Flask>=3.1.2
 Requires-Dist: Flask-HTTPAuth>=4.8.0
-Requires-Dist: psutil>=5.9.8
+Requires-Dist: Flask-Babel>=4.0.0
+Requires-Dist: psutil>=7.1.0
 Requires-Dist: colorlog>=6.9.0
 Dynamic: license-file
 
@@ -118,7 +120,7 @@ If you encounter any problems, or if you want to use the program in a particular
 
 ## 🏎️ **Benchmark**
 
-If you're interested in benchmarking the performance of the proxy or comparing request times with and without a proxy, please refer to the [Benchmark README](benchmark/README.md) for detailed instructions on how to run the benchmarking tests and generate reports.
+If you're interested in benchmarking the performance of the proxy or comparing request times with and without a proxy, please refer to the [Benchmark repository](https://github.com/pyproxytools/pyproxy-benchmark) for detailed instructions on how to run the benchmarking tests and generate reports.
 
 ## 📄 **License**
 
@@ -138,4 +140,9 @@ If you want to deploy **pyproxy** automatically to remote servers (via source or
 
 👉 Check out the [pyproxy-ansible](https://github.com/pyproxytools/pyproxy-ansible) repository for more details and usage instructions.
 
+## 🧩 **Python SDK for Administration and Monitoring**
+
+A dedicated Python SDK is available to interact programmatically with the **pyproxy** administration and monitoring interface: [**pyproxy-sdk-py**](https://github.com/pyproxytools/pyproxy-sdk-py).
+This SDK provides a simple and consistent API to manage your proxy configuration remotely — allowing you to add or delete domains, manage URLs, create and remove clients, and perform other administrative tasks. It is designed to integrate easily into automation scripts, dashboards, or backend systems that need to control and monitor pyproxy instances.
+
 ---

{pyproxytools-0.4.5 → pyproxytools-0.5.0}/README.md

@@ -85,7 +85,7 @@ If you encounter any problems, or if you want to use the program in a particular
 
 ## 🏎️ **Benchmark**
 
-If you're interested in benchmarking the performance of the proxy or comparing request times with and without a proxy, please refer to the [Benchmark README](benchmark/README.md) for detailed instructions on how to run the benchmarking tests and generate reports.
+If you're interested in benchmarking the performance of the proxy or comparing request times with and without a proxy, please refer to the [Benchmark repository](https://github.com/pyproxytools/pyproxy-benchmark) for detailed instructions on how to run the benchmarking tests and generate reports.
 
 ## 📄 **License**
 
@@ -105,4 +105,9 @@ If you want to deploy **pyproxy** automatically to remote servers (via source or
 
 👉 Check out the [pyproxy-ansible](https://github.com/pyproxytools/pyproxy-ansible) repository for more details and usage instructions.
 
+## 🧩 **Python SDK for Administration and Monitoring**
+
+A dedicated Python SDK is available to interact programmatically with the **pyproxy** administration and monitoring interface: [**pyproxy-sdk-py**](https://github.com/pyproxytools/pyproxy-sdk-py).
+This SDK provides a simple and consistent API to manage your proxy configuration remotely — allowing you to add or delete domains, manage URLs, create and remove clients, and perform other administrative tasks. It is designed to integrate easily into automation scripts, dashboards, or backend systems that need to control and monitor pyproxy instances.
+
 ---

{pyproxytools-0.4.5 → pyproxytools-0.5.0}/pyproject.toml

@@ -17,6 +17,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Internet",
     "Topic :: Software Development :: Libraries",
     "Topic :: Software Development :: Libraries :: Python Modules",
@@ -35,6 +36,27 @@ find = {}
 [tool.setuptools.dynamic]
 dependencies = { file = "requirements.txt" }
 
+[tool.ruff]
+line-length = 100
+src = ["pyproxy", "tests"]
+exclude = [
+    ".git",
+    "__pycache__",
+    "build",
+    "dist",
+    "venv",
+    "setup.py",
+]
+
+[tool.ruff.lint]
+select = ["E", "F", "W", "S"]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+line-ending = "auto"
+skip-magic-trailing-comma = false
+
 [project.scripts]
 pyproxy = "pyproxy.pyproxy:main"
 

{pyproxytools-0.4.5 → pyproxytools-0.5.0}/pyproxy/__init__.py

@@ -5,7 +5,7 @@ that holds the current version number of the application.
 
 import os
 
-__version__ = "0.4.5"
+__version__ = "0.5.0"
 
 if os.path.isdir("pyproxy/monitoring"):
     __slim__ = False

{pyproxytools-0.4.5 → pyproxytools-0.5.0}/pyproxy/handlers/http.py

@@ -62,9 +62,7 @@ class HttpHandler:
             new_headers = self.custom_header_result_queue.get(timeout=5)
             headers.update(new_headers)
         except Exception:
-            self.console_logger.warning(
-                "Timeout while getting custom headers for %s", url
-            )
+            self.console_logger.warning("Timeout while getting custom headers for %s", url)
         return headers
 
     def _rebuild_http_request(self, request_line, headers, body=""):
@@ -86,9 +84,7 @@ class HttpHandler:
             try:
                 return self.shortcuts_result_queue.get(timeout=5)
             except Exception:
-                self.console_logger.warning(
-                    "Timeout while getting shortcut for %s", url
-                )
+                self.console_logger.warning("Timeout while getting shortcut for %s", url)
         return None
 
     def _is_blocked(self, url: str) -> bool:
@@ -150,10 +146,7 @@ class HttpHandler:
             shortcut_url = self._apply_shortcut(url)
             if shortcut_url:
                 response = (
-                    f"HTTP/1.1 302 Found\r\n"
-                    f"Location: {shortcut_url}\r\n"
-                    f"Content-Length: 0\r\n"
-                    "\r\n"
+                    f"HTTP/1.1 302 Found\r\nLocation: {shortcut_url}\r\nContent-Length: 0\r\n\r\n"
                 )
 
                 client_socket.sendall(response.encode())
@@ -170,16 +163,10 @@ class HttpHandler:
             request_lines = request_text.split("\r\n")
             headers = self._get_modified_headers(url, request_text)
             request_line = request_lines[0]
-            body = (
-                request_text.split("\r\n\r\n", 1)[1]
-                if "\r\n\r\n" in request_text
-                else ""
-            )
+            body = request_text.split("\r\n\r\n", 1)[1] if "\r\n\r\n" in request_text else ""
             modified_request = self._rebuild_http_request(request_line, headers, body)
 
-            self.forward_request_to_server(
-                client_socket, modified_request, url, first_line
-            )
+            self.forward_request_to_server(client_socket, modified_request, url, first_line)
 
         else:
             self.forward_request_to_server(client_socket, request, url, first_line)
@@ -199,9 +186,7 @@ class HttpHandler:
         else:
             parsed_url = urlparse(url)
             server_host = parsed_url.hostname
-            server_port = parsed_url.port or (
-                443 if parsed_url.scheme == "https" else 80
-            )
+            server_port = parsed_url.port or (443 if parsed_url.scheme == "https" else 80)
 
         try:
             ip_address = socket.gethostbyname(server_host)
@@ -233,17 +218,13 @@ class HttpHandler:
                     response = server_socket.recv(4096)
                     if response:
                         client_socket.send(response)
-                        self.active_connections[thread_id]["bytes_received"] += len(
-                            response
-                        )
+                        self.active_connections[thread_id]["bytes_received"] += len(response)
                     else:
                         break
                 except socket.timeout:
                     break
         except (socket.timeout, socket.gaierror, ConnectionRefusedError, OSError) as e:
-            self.console_logger.error(
-                "Error connecting to the server %s : %s", server_host, 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"

{pyproxytools-0.4.5 → pyproxytools-0.5.0}/pyproxy/handlers/https.py

@@ -271,12 +271,8 @@ class HttpsHandler:
 
                 tls_version = ssl_client_socket.version() or "unknown"
 
-                server_socket = self._establish_server_connection(
-                    server_host, server_port
-                )
-                ssl_server_socket = self._wrap_server_socket_with_ssl(
-                    server_socket, server_host
-                )
+                server_socket = self._establish_server_connection(server_host, server_port)
+                ssl_server_socket = self._wrap_server_socket_with_ssl(server_socket, server_host)
 
                 first_request, full_url, is_blocked = self._process_first_ssl_request(
                     ssl_client_socket, server_host, first_line
@@ -324,9 +320,7 @@ class HttpsHandler:
 
         else:
             try:
-                server_socket = self._establish_server_connection(
-                    server_host, server_port
-                )
+                server_socket = self._establish_server_connection(server_host, server_port)
                 client_socket.sendall(b"HTTP/1.1 200 Connection Established\r\n\r\n")
 
                 client_ip = client_socket.getpeername()[0]
@@ -355,9 +349,7 @@ class HttpsHandler:
                 ConnectionRefusedError,
                 OSError,
             ) as e:
-                self.console_logger.error(
-                    "Error connecting to the server %s: %s", server_host, 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"
@@ -401,9 +393,7 @@ class HttpsHandler:
                         client_socket.close()
                         server_socket.close()
                         bytes_sent = self.active_connections[thread_id]["bytes_sent"]
-                        bytes_received = self.active_connections[thread_id][
-                            "bytes_received"
-                        ]
+                        bytes_received = self.active_connections[thread_id]["bytes_received"]
                         self.active_connections.pop(threading.get_ident(), None)
                         return bytes_sent, bytes_received
                     if sock is client_socket:
@@ -411,11 +401,8 @@ class HttpsHandler:
                         self.active_connections[thread_id]["bytes_sent"] += len(data)
                     else:
                         client_socket.sendall(data)
-                        self.active_connections[thread_id]["bytes_received"] += len(
-                            data
-                        )
+                        self.active_connections[thread_id]["bytes_received"] += len(data)
         except (socket.error, OSError):
-            self.logger_config.console_logger("error")
             client_socket.close()
             server_socket.close()
             self.active_connections.pop(threading.get_ident(), None)

{pyproxytools-0.4.5 → pyproxytools-0.5.0}/pyproxy/modules/filter.py

@@ -18,9 +18,7 @@ from urllib.parse import urlparse
 import requests
 
 
-def load_blacklist(
-    blocked_sites_path: str, blocked_url_path: str, filter_mode: str
-) -> set:
+def load_blacklist(blocked_sites_path: str, blocked_url_path: str, filter_mode: str) -> set:
     """
     Loads blocked FQDNs or URLs from a file or URL into a set for fast lookup.
 
@@ -50,9 +48,7 @@ def load_blacklist(
             for line in response.text.splitlines():
                 data.add(line.strip())
         except requests.exceptions.RequestException as e:
-            raise requests.exceptions.RequestException(
-                f"Failed to load data from {url}: {e}"
-            )
+            raise requests.exceptions.RequestException(f"Failed to load data from {url}: {e}")
         return data
 
     if filter_mode == "local":
@@ -88,12 +84,8 @@ def filter_process(
     manager = multiprocessing.Manager()
     blocked_data = manager.dict(
         {
-            "sites": load_blacklist(blocked_sites_path, blocked_url_path, filter_mode)[
-                0
-            ],
-            "urls": load_blacklist(blocked_sites_path, blocked_url_path, filter_mode)[
-                1
-            ],
+            "sites": load_blacklist(blocked_sites_path, blocked_url_path, filter_mode)[0],
+            "urls": load_blacklist(blocked_sites_path, blocked_url_path, filter_mode)[1],
         }
     )
 
@@ -136,13 +128,10 @@ def filter_process(
                 full_url = server_host
 
             if "*" in blocked_data["sites"] or any(
-                server_host.startswith(blocked_host)
-                for blocked_host in blocked_data["sites"]
+                server_host.startswith(blocked_host) for blocked_host in blocked_data["sites"]
             ):
                 result_queue.put((server_host, "Blocked"))
-            elif any(
-                full_url.startswith(blocked_url) for blocked_url in blocked_data["urls"]
-            ):
+            elif any(full_url.startswith(blocked_url) for blocked_url in blocked_data["urls"]):
                 result_queue.put((full_url, "Blocked"))
             else:
                 result_queue.put((server_host, "Allowed"))

{pyproxytools-0.4.5 → pyproxytools-0.5.0}/pyproxy/monitoring/__init__.py

@@ -7,7 +7,8 @@ server using Flask to provide monitoring endpoints.
 """
 
 import logging
-from flask import Flask
+from flask import Flask, request
+from flask_babel import Babel
 from .monitor import ProxyMonitor
 from .auth import create_basic_auth
 from .routes import register_routes
@@ -30,9 +31,27 @@ def start_flask_server(proxy_server, flask_port, flask_pass, debug) -> None:
     auth = create_basic_auth(flask_pass)
 
     app = Flask(__name__, static_folder="static")
+    app.config["BABEL_DEFAULT_LOCALE"] = "en"
+    app.config["BABEL_SUPPORTED_LOCALES"] = ["fr", "en"]
+    app.config["BABEL_DEFAULT_TIMEZONE"] = "Europe/London"
+
+    def select_locale():
+        lang = request.args.get("lang")
+        if lang in app.config["BABEL_SUPPORTED_LOCALES"]:
+            return lang
+        return request.accept_languages.best_match(app.config["BABEL_SUPPORTED_LOCALES"])
+
+    Babel(app, locale_selector=select_locale)
+
+    @app.context_processor
+    def inject_globals():
+        from flask_babel import get_locale
+
+        return {"get_locale": get_locale}
+
     if not debug:
         log = logging.getLogger("werkzeug")
         log.setLevel(logging.ERROR)
 
     register_routes(app, auth, proxy_server, ProxyMonitor)
-    app.run(host="0.0.0.0", port=flask_port)  # nosec
+    app.run(host="0.0.0.0", port=flask_port)  # noqa: S104

pyproxytools-0.5.0/pyproxy/monitoring/messages.pot

@@ -0,0 +1,235 @@
+# Translations template for PROJECT.
+# Copyright (C) 2025 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2025.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2025-10-12 16:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.17.0\n"
+
+#: routes.py:34 templates/index.html:19
+msgid "Next refresh in:"
+msgstr ""
+
+#: routes.py:35 templates/index.html:31 templates/index.html:36
+msgid "Loading..."
+msgstr ""
+
+#: routes.py:36
+msgid "Main Process"
+msgstr ""
+
+#: routes.py:37
+msgid "Subprocesses"
+msgstr ""
+
+#: routes.py:38 templates/index.html:23
+msgid "Status"
+msgstr ""
+
+#: routes.py:39
+msgid "Configuration"
+msgstr ""
+
+#: routes.py:40 templates/index.html:41
+msgid "Active Connections"
+msgstr ""
+
+#: routes.py:41 templates/index.html:42
+msgid "Search client or target..."
+msgstr ""
+
+#: routes.py:42
+msgid "Blocked sites"
+msgstr ""
+
+#: routes.py:43
+msgid "Blocked URLs"
+msgstr ""
+
+#: routes.py:44 templates/index.html:62
+msgid "Add"
+msgstr ""
+
+#: routes.py:45 templates/index.html:51
+msgid "Add a domain or URL to block"
+msgstr ""
+
+#: routes.py:46 templates/index.html:55
+msgid "Domain"
+msgstr ""
+
+#: routes.py:47 templates/index.html:56
+msgid "URL"
+msgstr ""
+
+#: routes.py:48 templates/index.html:59
+msgid "Value :"
+msgstr ""
+
+#: routes.py:49 templates/index.html:26 templates/index.html:49
+msgid "Filtering"
+msgstr ""
+
+#: routes.py:50
+msgid "No active connections."
+msgstr ""
+
+#: routes.py:51
+msgid "No blocked sites."
+msgstr ""
+
+#: routes.py:52
+msgid "No URLs blocked."
+msgstr ""
+
+#: routes.py:53
+msgid "Error while deleting :"
+msgstr ""
+
+#: routes.py:54
+msgid "Error adding :"
+msgstr ""
+
+#: routes.py:55
+msgid "Please enter a value to block."
+msgstr ""
+
+#: routes.py:56 routes.py:84
+msgid "Network error"
+msgstr ""
+
+#: routes.py:57
+msgid "Error loading data:"
+msgstr ""
+
+#: routes.py:58
+msgid "Name:"
+msgstr ""
+
+#: routes.py:59
+msgid "PID:"
+msgstr ""
+
+#: routes.py:60
+msgid "Status:"
+msgstr ""
+
+#: routes.py:61
+msgid "Start Time:"
+msgstr ""
+
+#: routes.py:62
+msgid "Client"
+msgstr ""
+
+#: routes.py:63
+msgid "Target"
+msgstr ""
+
+#: routes.py:64
+msgid "Sent"
+msgstr ""
+
+#: routes.py:65
+msgid "Received"
+msgstr ""
+
+#: routes.py:66
+msgid "bytes"
+msgstr ""
+
+#: routes.py:67
+msgid "Port:"
+msgstr ""
+
+#: routes.py:68
+msgid "Flask Port:"
+msgstr ""
+
+#: routes.py:69
+msgid "HTML 403:"
+msgstr ""
+
+#: routes.py:70
+msgid "Filter Configuration"
+msgstr ""
+
+#: routes.py:71
+msgid "Blocked Sites File:"
+msgstr ""
+
+#: routes.py:72
+msgid "Blocked URL File:"
+msgstr ""
+
+#: routes.py:73
+msgid "Filter Mode:"
+msgstr ""
+
+#: routes.py:74
+msgid "Logger Configuration"
+msgstr ""
+
+#: routes.py:75
+msgid "Access Log:"
+msgstr ""
+
+#: routes.py:76
+msgid "Block Log:"
+msgstr ""
+
+#: routes.py:77
+msgid "SSL Inspection"
+msgstr ""
+
+#: routes.py:78
+msgid "Inspect CA Cert:"
+msgstr ""
+
+#: routes.py:79
+msgid "Inspect CA Key:"
+msgstr ""
+
+#: routes.py:80
+msgid "Inspect certs folder:"
+msgstr ""
+
+#: routes.py:81
+msgid "Cancel inspect:"
+msgstr ""
+
+#: routes.py:82
+msgid "Action"
+msgstr ""
+
+#: routes.py:83
+msgid "Unblock"
+msgstr ""
+
+#: templates/index.html:24
+msgid "Settings"
+msgstr ""
+
+#: templates/index.html:25
+msgid "Connections"
+msgstr ""
+
+#: templates/index.html:60
+msgid "e.g.: example.com or http://example.com/page"
+msgstr ""
+
+#: templates/index.html:65
+msgid "Search domain or URLs..."
+msgstr ""
+