diff --git a/backend/modules/sqlite.py b/backend/modules/sqlite.py index f0fbf93..73051b3 100644 --- a/backend/modules/sqlite.py +++ b/backend/modules/sqlite.py @@ -117,7 +117,7 @@ class Service: class Regex: def __init__(self, id: int, regex: str, mode: str, service_id: str, is_blacklist: bool, blocked_packets: int, is_case_sensitive: bool, active: bool): - self.regex = base64.b64decode(regex) + self.regex = regex self.mode = mode self.service_id = service_id self.is_blacklist = is_blacklist @@ -128,4 +128,4 @@ class Regex: @classmethod def from_dict(cls, var: dict): - return cls(id=var["regex_id"], regex=var["regex"], mode=var["mode"], service_id=var["service_id"], is_blacklist=var["is_blacklist"], blocked_packets=var["blocked_packets"], is_case_sensitive=var["is_case_sensitive"], active=var["active"]) \ No newline at end of file + return cls(id=var["regex_id"], regex=base64.b64decode(var["regex"]), mode=var["mode"], service_id=var["service_id"], is_blacklist=var["is_blacklist"], blocked_packets=var["blocked_packets"], is_case_sensitive=var["is_case_sensitive"], active=var["active"]) \ No newline at end of file diff --git a/tests/firegexapi.py b/tests/firegexapi.py index 8ac35ef..1c94672 100644 --- a/tests/firegexapi.py +++ b/tests/firegexapi.py @@ -27,7 +27,6 @@ class FiregexAPI: def login(self,password): req = self.s.post(f"{self.address}api/login", data=f"username=login&password={password}") - print(req.text) try : self.s.set_token(req.json()["access_token"]) return True @@ -46,8 +45,8 @@ class FiregexAPI: except Exception: return False - def create_service(self,service_name,service_port, ipv6 = False): - req = self.s.post(f"{self.address}api/services/add" , json={"name":service_name,"port":service_port, "ipv6": ipv6}) + def create_service(self,service_name,service_port, proto, ip_int): + req = self.s.post(f"{self.address}api/services/add" , json={"name":service_name,"port":service_port, "ip_int": ip_int, "proto": proto}) return req.json()["service_id"] if req.json()["status"] == "ok" else None def get_service(self,service_id): diff --git a/tests/test.py b/tests/test.py index 4685a57..231a1a5 100755 --- a/tests/test.py +++ b/tests/test.py @@ -50,7 +50,7 @@ else: puts(f"Test Failed: Coundl't change the password ✗", color=colors.red); #Create new Service -service = firegex.create_service(args.service_name,args.service_port) +service = firegex.create_service(args.service_name,args.service_port,"tcp","127.0.0.1/24") if service: puts(f"Sucessfully created service {args.service_name} with public port {args.service_port} ✔", color=colors.green) service_created = True