Proxy Regex tests complete

This commit is contained in:
nik012003
2022-08-02 12:54:28 +02:00
parent 92be4e306b
commit b4af7f150d
4 changed files with 268 additions and 9 deletions

View File

@@ -159,11 +159,15 @@ class FiregexAPI:
req = self.s.get(f"{self.address}api/regexproxy/service/{service_id}/delete")
return verify(req)
def px_change_service_port(self,service_id, port, internalPort):
def px_regen_service_port(self,service_id):
req = self.s.get(f"{self.address}api/regexproxy/service/{service_id}/regen-port")
return verify(req)
def px_change_service_port(self,service_id, port=None, internalPort=None):
payload = {}
if port: payload["port"] = port
if internalPort: payload["internalPort"] = internalPort
req = self.s.post(f"{self.address}api/regexproxy/service/{service_id}/start", json=payload)
req = self.s.post(f"{self.address}api/regexproxy/service/{service_id}/change-ports", json=payload)
return req.json() if verify(req) else False
def px_get_service_regexes(self,service_id):
@@ -195,7 +199,11 @@ class FiregexAPI:
req = self.s.post(f"{self.address}api/regexproxy/service/{service_id}/rename" , json={"name":newname})
return verify(req)
def px_add_service(self, name: str, port: int, internalPort: [int,None]):
req = self.s.post(f"{self.address}api/regexproxy/services/add" ,
json={"name":name,"port":port, "internalPort": internalPort})
return req.json()["service_id"] if verify(req) else False
def px_add_service(self, name: str, port: int, internalPort = None):
payload = {}
payload["name"] = name
payload["port"] = port
if internalPort:
payload["internalPort"] = internalPort
req = self.s.post(f"{self.address}api/regexproxy/services/add" , json=payload)
return req.json()["id"] if verify(req) else False

View File

@@ -2,7 +2,7 @@ from multiprocessing import Process
import socket
class TcpServer:
def __init__(self,port,ipv6):
def __init__(self,port,ipv6,proxy_port=None):
def _startServer(port):
sock = socket.socket(socket.AF_INET6 if ipv6 else socket.AF_INET, socket.SOCK_STREAM)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
@@ -13,6 +13,7 @@ class TcpServer:
buf = connection.recv(4096)
connection.send(buf)
connection.close()
self.proxy_port = proxy_port
self.ipv6 = ipv6
self.port = port
self.server = Process(target=_startServer,args=[port])
@@ -25,7 +26,7 @@ class TcpServer:
def sendCheckData(self,data):
s = socket.socket(socket.AF_INET6 if self.ipv6 else socket.AF_INET, socket.SOCK_STREAM)
s.connect(('::1' if self.ipv6 else '127.0.0.1', self.port))
s.connect(('::1' if self.ipv6 else '127.0.0.1', self.proxy_port if self.proxy_port else self.port))
s.sendall(data)
received_data = s.recv(4096)
s.close()