0.4.6

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.5
+current_version = 0.4.6
 commit = True
 tag = True
 

CHANGELOG.md

@@ -1,3 +1,21 @@
+## [0.4.6] - 2025-06-12
+### Added
+- Monitoring : Actions connections table
+- Monitoring : Add & Delete blocked domains/URLs
+- Monitoring : Searchbar (filerting & Actives connections)
+### Change
+- Monitoring : change routes
+
+## [0.4.5] - 2025-06-09
+### Added
+- Monitoring : refresh timer
+### Change
+- Rework monitoring code
+
+## [0.4.4] - 2025-06-08
+### Change
+- Repository migration
+
 ## [0.4.3] - 2025-06-08
 ### Added
 - Docs: installation from compose

pyproxy/__init__.py

@@ -5,7 +5,7 @@
 
 import os
 
-__version__ = "0.4.5"
+__version__ = "0.4.6"
 
 if os.path.isdir("pyproxy/monitoring"):
     __slim__ = False

pyproxy/handlers/https.py

@@ -415,7 +415,6 @@ def transfer_data_between_sockets(self, client_socket, server_socket):
                             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)

pyproxy/monitoring/routes.py

@@ -6,7 +6,7 @@
 HTML-based index page.
 """
 
-from flask import jsonify, render_template
+from flask import jsonify, render_template, request
 
 
 def register_routes(app, auth, proxy_server, ProxyMonitor):
@@ -31,7 +31,7 @@ def index():
         """
         return render_template("index.html")
 
-    @app.route("/monitoring", methods=["GET"])
+    @app.route("/api/status", methods=["GET"])
     @auth.login_required
     def monitoring():
         """
@@ -44,13 +44,20 @@ def monitoring():
         monitor = ProxyMonitor(proxy_server)
         return jsonify(monitor.get_process_info())
 
-    @app.route("/config", methods=["GET"])
+    @app.route("/api/settings", methods=["GET"])
     @auth.login_required
     def config():
         """
-        Returns the current configuration of the ProxyServer, including
-        host, port, debug mode, and optional components like logger, filter,
-        and SSL configuration.
+        Returns the current configuration of the ProxyServer.
+
+        The configuration includes:
+            - Host and port
+            - Debug mode
+            - 403 HTML page usage
+            - Logger configuration (if present)
+            - Filter configuration (if present)
+            - SSL configuration (if present)
+            - Flask monitoring port
 
         Returns:
             Response: JSON object containing configuration data.
@@ -76,3 +83,129 @@ def config():
             "flask_port": proxy_server.monitoring_config.flask_port,
         }
         return jsonify(config_data)
+
+    @app.route("/api/filtering", methods=["GET", "POST", "DELETE"])
+    @auth.login_required
+    def blocked():
+        """
+        Manages the blocked sites and URLs list.
+
+        GET:
+            Reads and returns the current blocked domains and URLs from the corresponding files.
+            Returns:
+                Response: JSON object with 'blocked_sites' and 'blocked_url' lists.
+
+        POST:
+            Adds a new domain or URL to the blocked lists based on
+                        'type' and 'value' from JSON input.
+            Request JSON:
+                {
+                    "type": "domain" | "url",
+                    "value": "<value_to_block>"
+                }
+            Returns:
+                201: Successfully added.
+                400: Invalid input.
+                409: Value already blocked.
+
+        DELETE:
+            Removes a domain or URL from the blocked lists based on
+                        'type' and 'value' from JSON input.
+            Request JSON:
+                {
+                    "type": "domain" | "url",
+                    "value": "<value_to_unblock>"
+                }
+            Returns:
+                200: Successfully removed.
+                400: Invalid input.
+                404: Value not found.
+                500: Server error.
+        """
+        if request.method == "GET":
+            blocked_sites_content = ""
+            blocked_url_content = ""
+
+            with open(
+                proxy_server.filter_config.blocked_sites, "r", encoding="utf-8"
+            ) as f:
+                blocked_sites_content = [line.strip() for line in f if line.strip()]
+            with open(
+                proxy_server.filter_config.blocked_url, "r", encoding="utf-8"
+            ) as f:
+                blocked_url_content = [line.strip() for line in f if line.strip()]
+
+            blocked_data = {
+                "blocked_sites": blocked_sites_content,
+                "blocked_url": blocked_url_content,
+            }
+            return jsonify(blocked_data)
+
+        elif request.method == "POST":
+            data = request.get_json()
+            typ = data.get("type")
+            val = data.get("value", "").strip()
+            if not val or typ not in ["domain", "url"]:
+                return jsonify({"error": "Invalid input"}), 400
+
+            filename = (
+                proxy_server.filter_config.blocked_sites
+                if typ == "domain"
+                else proxy_server.filter_config.blocked_url
+            )
+
+            with open(filename, "r+", encoding="utf-8") as f:
+                lines = [line.strip() for line in f if line.strip()]
+                if val in lines:
+                    return jsonify({"message": "Already blocked"}), 409
+                lines.append(val)
+                f.seek(0)
+                f.truncate()
+                f.write("\n".join(lines) + "\n")
+            return jsonify({"message": "Added successfully"}), 201
+
+        elif request.method == "DELETE":
+            data = request.get_json()
+            if not data or "type" not in data or "value" not in data:
+                return (
+                    jsonify({"error": "Missing 'type' or 'value' in request body"}),
+                    400,
+                )
+
+            block_type = data["type"]
+            value = data["value"].strip()
+
+            if block_type == "domain":
+                filepath = proxy_server.filter_config.blocked_sites
+            elif block_type == "url":
+                filepath = proxy_server.filter_config.blocked_url
+            else:
+                return (
+                    jsonify({"error": "Invalid type, must be 'domain' or 'url'"}),
+                    400,
+                )
+
+            try:
+                with open(filepath, "r", encoding="utf-8") as f:
+                    lines = [line.strip() for line in f if line.strip()]
+
+                if value not in lines:
+                    return (
+                        jsonify({"error": f"{value} not found in {block_type} list"}),
+                        404,
+                    )
+
+                lines = [line for line in lines if line != value]
+
+                with open(filepath, "w", encoding="utf-8") as f:
+                    for line in lines:
+                        f.write(line + "\n")
+
+                return (
+                    jsonify(
+                        {"message": f"{block_type} '{value}' removed successfully"}
+                    ),
+                    200,
+                )
+            except Exception as e:
+                return jsonify({"error": f"Server error: {str(e)}"}), 500