Added option to autodetect blocked domains (closed #35)

Author: GVCoder09

README.md

@@ -124,10 +124,8 @@ Please report any problems and malfunctions to us on [the Issues page](https://g
 
 ## Supported arguments / Поддерживаемые аргументы командной строки
 ```
-usage: nodpi [-h] [--host HOST] [--port PORT] 
-             [--blacklist BLACKLIST | --no_blacklist] 
-             [--log_access LOG_ACCESS] [--log_error LOG_ERROR] 
-             [-q] [-v] [--install | --uninstall]
+usage: nodpi [-h] [--host HOST] [--port PORT] [--blacklist BLACKLIST | --no_blacklist | --autoblacklist] 
+                  [--log_access LOG_ACCESS] [--log_error LOG_ERROR] [-q] [-v] [--install | --uninstall]
 
 options:
   -h, --help            show this help message and exit
@@ -136,6 +134,7 @@ options:
   --blacklist BLACKLIST
                         Path to blacklist file
   --no_blacklist        Use fragmentation for all domains
+  --autoblacklist       Automatic detection of blocked domains
   --log_access LOG_ACCESS
                         Path to the access control log
   --log_error LOG_ERROR

src/main.py

@@ -6,11 +6,12 @@
 import logging
 import os
 import sys
+import requests
 from datetime import datetime
 import time
 import traceback
 
-__version__ = "1.8.2"
+__version__ = "1.9"
 
 os.system("")
 
@@ -30,14 +31,15 @@ def __init__(self, src_ip, dst_domain, method):
 
 class ProxyServer:
 
-    def __init__(self, host, port, blacklist, log_access, log_err, no_blacklist, quiet, verbose):
+    def __init__(self, host, port, blacklist, log_access, log_err, no_blacklist, auto_blacklist, quiet, verbose):
 
         self.host = host
         self.port = port
         self.blacklist = blacklist
         self.log_access_file = log_access
         self.log_err_file = log_err
         self.no_blacklist = no_blacklist
+        self.auto_blacklist = auto_blacklist
         self.quiet = quiet
         self.verbose = verbose
 
@@ -61,6 +63,7 @@ def __init__(self, host, port, blacklist, log_access, log_err, no_blacklist, qui
         self.tasks_lock = asyncio.Lock()
 
         self.blocked = []
+        self.whitelist = []
         self.tasks = []
         self.server = None
 
@@ -289,6 +292,16 @@ async def handle_connection(self, reader, writer):
             conn_info = ConnectionInfo(
                 client_ip, host.decode(), method.decode())
 
+            if method == b"CONNECT" and self.auto_blacklist:
+                try:
+                    if host not in self.blocked and host not in self.whitelist:
+                        requests.get('https://' + host.decode(), timeout=3)
+                        self.whitelist.append(host)
+                except Exception:  # pylint: disable=broad-except
+                    self.blocked.append(host)
+                    with open(self.blacklist, "a", encoding="utf-8") as f:
+                        f.write(host.decode() + "\n")
+
             async with self.connections_lock:
                 self.active_connections[conn_key] = conn_info
 
@@ -465,6 +478,9 @@ def parse_args():
         blacklist_group.add_argument(
             "--no_blacklist", action="store_true", help="Use fragmentation for all domains"
         )
+        blacklist_group.add_argument(
+            "--autoblacklist", action="store_true", help="Automatic detection of blocked domains"
+        )
 
         parser.add_argument(
             "--log_access", required=False, help="Path to the access control log"
@@ -563,6 +579,7 @@ async def run(cls):
             args.log_access,
             args.log_error,
             args.no_blacklist,
+            args.autoblacklist,
             args.quiet,
             args.verbose,
         )