0xb00b5/firegex-traffic-viewer
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated test to the new API

Browse Source
This commit is contained in:
nik012003
2022-07-12 23:23:08 +02:00
parent e331a31530
commit d25c8d9df6
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/modules/sqlite.py
View File

@@ -117,7 +117,7 @@ class Service:
class Regex: 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): 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.mode = mode
self.service_id = service_id self.service_id = service_id
self.is_blacklist = is_blacklist self.is_blacklist = is_blacklist
@@ -128,4 +128,4 @@ class Regex:
@classmethod @classmethod
def from_dict(cls, var: dict): 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"]) 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"])

5
tests/firegexapi.py
View File

@@ -27,7 +27,6 @@ class FiregexAPI:
def login(self,password): def login(self,password):
req = self.s.post(f"{self.address}api/login", data=f"username=login&password={password}") req = self.s.post(f"{self.address}api/login", data=f"username=login&password={password}")
print(req.text)
try : try :
self.s.set_token(req.json()["access_token"]) self.s.set_token(req.json()["access_token"])
return True return True
@@ -46,8 +45,8 @@ class FiregexAPI:
except Exception: except Exception:
return False return False
def create_service(self,service_name,service_port, ipv6 = False): 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, "ipv6": ipv6}) 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 return req.json()["service_id"] if req.json()["status"] == "ok" else None
def get_service(self,service_id): def get_service(self,service_id):

2
tests/test.py
View File

@@ -50,7 +50,7 @@ else: puts(f"Test Failed: Coundl't change the password ✗", color=colors.red);
#Create new Service #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: if service:
puts(f"Sucessfully created service {args.service_name} with public port {args.service_port} ✔", color=colors.green) puts(f"Sucessfully created service {args.service_name} with public port {args.service_port} ✔", color=colors.green)
service_created = True service_created = True