Bug fixes and better regex checks

backend/app.py

@@ -1,3 +1,4 @@
+from base64 import b64decode
 import sqlite3, subprocess, sys, threading, bcrypt, secrets, time, re
 from flask import Flask, jsonify, request, abort, session
 from functools import wraps
@@ -262,7 +263,6 @@ def get_regex_delete(regex_id):
     
     return {'status': 'ok'}
 
-
 @app.route('/api/regexes/add', methods = ['POST'])
 @login_required
 def post_regexes_add():
@@ -283,9 +283,17 @@ def post_regexes_add():
             return abort(400)
     except Exception:
         return abort(400)
-    db.query("INSERT INTO regexes (service_id, regex, is_blacklist, mode) VALUES (?, ?, ?, ?);", 
+
+    try:
+        re.compile(b64decode(req["regex"]))
+    except Exception:
+        return {"status":"Invalid regex"}
+    try:
+        db.query("INSERT INTO regexes (service_id, regex, is_blacklist, mode) VALUES (?, ?, ?, ?);", 
                 (req['service_id'], req['regex'], req['is_blacklist'], req['mode']))
-    
+    except sqlite3.IntegrityError:
+        return {'status': 'An identical regex already exists'}
+
     firewall.fire_update(req['service_id'])
     return {'status': 'ok'}
 
@@ -345,6 +353,7 @@ if __name__ == '__main__':
             'value': 'VARCHAR(100) NOT NULL',
         },
     })
+    db.query("CREATE UNIQUE INDEX IF NOT EXISTS unique_regex_service ON regexes (regex,service_id,is_blacklist,mode);")
 
     if DEBUG:
         app.run(host="0.0.0.0", port=8080 ,debug=True)

backend/utils.py

@@ -1,6 +1,6 @@
 from asyncore import file_dispatcher
 from proxy import Filter, Proxy
-import random, string, os, threading, sqlite3, time
+import random, string, os, threading, sqlite3, time, atexit
 from kthread import KThread
 from base64 import b64decode
 
@@ -68,12 +68,13 @@ class STATUS:
     STOP = "stop"
     PAUSE = "pause"
     ACTIVE = "active"
-
+ 
 class ProxyManager:
     def __init__(self, db:SQLite):
         self.db = db
         self.proxy_table = {}
         self.lock = threading.Lock()
+        atexit.register(self.clear)
 
     def __clear_proxy_table(self):
         with self.lock:
@@ -81,6 +82,13 @@ class ProxyManager:
                 if not self.proxy_table[key]["thread"].is_alive():
                     del self.proxy_table[key]
 
+    def clear(self):
+        with self.lock:
+            for key in list(self.proxy_table.keys()):
+                if self.proxy_table[key]["thread"].is_alive():
+                    self.proxy_table[key]["thread"].kill()
+                del self.proxy_table[key]
+
     def reload(self):
         self.__clear_proxy_table()
         with self.lock: