Netfilter Regex tests complete

tests/utils/firegexapi.py

@@ -96,8 +96,8 @@ class FiregexAPI:
         req = self.s.get(f"{self.address}api/nfregex/service/{service_id}/delete")
         return verify(req)
 
-    def nf_rename_service(self,newname):
-        req = self.s.post(f"{self.address}api/nfregex/services/add" , json={"name":service_name,"port":service_port, "ip_int": ip_int, "proto": proto})
+    def nf_rename_service(self,service_id,newname):
+        req = self.s.post(f"{self.address}api/nfregex/service/{service_id}/rename" , json={"name":newname})
         return verify(req)
 
     def nf_get_service_regexes(self,service_id):
@@ -191,8 +191,8 @@ class FiregexAPI:
             json={"service_id": service_id, "regex": regex, "mode": mode, "active": active, "is_blacklist": is_blacklist, "is_case_sensitive": is_case_sensitive})
         return verify(req)
 
-    def px_rename_service(self,newname):
-        req = self.s.post(f"{self.address}api/regexproxy/services/add" , json={"name":service_name,"port":service_port, "ip_int": ip_int, "proto": proto})
+    def px_rename_service(self,service_id,newname):
+        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]):

tests/utils/tcpserver.py

@@ -2,17 +2,18 @@ from multiprocessing import Process
 import socket
 
 class TcpServer:
-    def __init__(self,port):
+    def __init__(self,port,ipv6):
         def _startServer(port):
-            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            sock = socket.socket(socket.AF_INET6 if ipv6 else socket.AF_INET, socket.SOCK_STREAM)
             sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-            sock.bind(('127.0.0.1', port))
+            sock.bind(('::1' if ipv6 else '127.0.0.1', port))
             sock.listen(8)
             while True:  
                 connection,address = sock.accept()  
                 buf = connection.recv(4096)  
                 connection.send(buf)    		
                 connection.close()
+        self.ipv6 = ipv6
         self.port = port
         self.server = Process(target=_startServer,args=[port])
 
@@ -23,8 +24,8 @@ class TcpServer:
         self.server.terminate()
 
     def sendCheckData(self,data):
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        s.connect(('localhost', self.port))
+        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.sendall(data)
         received_data = s.recv(4096)
         s.close()

tests/utils/udpserver.py

@@ -0,0 +1,34 @@
+from multiprocessing import Process
+import socket
+
+class UdpServer:
+    def __init__(self,port,ipv6):
+        def _startServer(port):
+            sock = socket.socket(socket.AF_INET6 if ipv6 else socket.AF_INET, socket.SOCK_DGRAM)
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            sock.bind(('::1' if ipv6 else '127.0.0.1', port))
+            while True:
+                bytesAddressPair = sock.recvfrom(432)
+                message = bytesAddressPair[0]
+                address = bytesAddressPair[1]
+                sock.sendto(message, address)
+                
+        self.ipv6 = ipv6
+        self.port = port
+        self.server = Process(target=_startServer,args=[port])
+
+    def start(self):
+        self.server.start()
+    
+    def stop(self):
+        self.server.terminate()
+
+    def sendCheckData(self,data):
+        s = socket.socket(socket.AF_INET6 if self.ipv6 else socket.AF_INET, socket.SOCK_DGRAM)
+        s.settimeout(2)
+        s.sendto(data, ('::1' if self.ipv6 else '127.0.0.1', self.port))
+        try:
+            received_data = s.recvfrom(432)
+        except Exception:
+            return False
+        return received_data[0] == data