using brotli 1.2 from pypi, fixed tests to py 3.14, removed from experimental pyproxy

This commit is contained in:
Domingo Dirutigliano
2025-11-11 23:30:48 +01:00
parent 49c6c14fe5
commit 16f96aa6f6
8 changed files with 1611 additions and 1311 deletions

View File

@@ -4,5 +4,5 @@ uvicorn[standard]
psutil psutil
python-jose[cryptography] python-jose[cryptography]
python-socketio python-socketio
git+https://github.com/google/brotli.git brotli
#git+https://salsa.debian.org/pkg-netfilter-team/pkg-nftables#egg=nftables&subdirectory=py #git+https://salsa.debian.org/pkg-netfilter-team/pkg-nftables#egg=nftables&subdirectory=py

View File

@@ -9,12 +9,12 @@ import { getMainPath } from "../../js/utils";
import { BsRegex } from "react-icons/bs"; import { BsRegex } from "react-icons/bs";
function NavBarButton({ navigate, closeNav, name, icon, color, disabled, onClick }: function NavBarButton({ navigate, closeNav, name, icon, color, disabled, onClick }:
{ navigate?: string, closeNav: () => void, name:string, icon:any, color:MantineColor, disabled?:boolean, onClick?:CallableFunction }) { { navigate?: string, closeNav: () => void, name: string, icon: any, color: MantineColor, disabled?: boolean, onClick?: CallableFunction }) {
const navigator = useNavigate() const navigator = useNavigate()
return <UnstyledButton return <UnstyledButton
className={`firegex__navbar__unstyled_button${navigate==getMainPath()?" selected":""}${disabled?" disabled":""}`} className={`firegex__navbar__unstyled_button${navigate == getMainPath() ? " selected" : ""}${disabled ? " disabled" : ""}`}
onClick={()=>{ onClick={() => {
if(navigate){navigator(`/${navigate}`);closeNav()} if (navigate) { navigator(`/${navigate}`); closeNav() }
if (onClick) onClick() if (onClick) onClick()
}} disabled={disabled}> }} disabled={disabled}>
<Group> <Group>
@@ -35,16 +35,16 @@ export default function NavBar() {
<Title order={4}>Options </Title> <Title order={4}>Options </Title>
</Box> </Box>
<Divider my="xs" /> <Divider my="xs" />
<Box style={{flexGrow: 1}} component={ScrollArea} px="xs" mt="xs"> <Box style={{ flexGrow: 1 }} component={ScrollArea} px="xs" mt="xs">
<NavBarButton navigate="nfregex" closeNav={closeNav} name="Netfilter Regex" color="grape" icon={<BsRegex size={19} />} /> <NavBarButton navigate="nfregex" closeNav={closeNav} name="Netfilter Regex" color="grape" icon={<BsRegex size={19} />} />
<NavBarButton navigate="firewall" closeNav={closeNav} name="Firewall Rules" color="red" icon={<PiWallLight size={19} />} /> <NavBarButton navigate="firewall" closeNav={closeNav} name="Firewall Rules" color="red" icon={<PiWallLight size={19} />} />
<NavBarButton navigate="porthijack" closeNav={closeNav} name="Hijack Port to Proxy" color="blue" icon={<GrDirections size={19} />} /> <NavBarButton navigate="porthijack" closeNav={closeNav} name="Hijack Port to Proxy" color="blue" icon={<GrDirections size={19} />} />
<Box px="xs" mt="lg"> <NavBarButton navigate="nfproxy" closeNav={closeNav} name="Netfilter Proxy" color="lime" icon={<TbPlugConnected size={19} />} />
{/* <Box px="xs" mt="lg">
<Title order={5}>Experimental Features 🧪</Title> <Title order={5}>Experimental Features 🧪</Title>
</Box> </Box>
<Text></Text> <Text></Text>
<Divider my="xs" /> <Divider my="xs" /> */}
<NavBarButton navigate="nfproxy" closeNav={closeNav} name="Netfilter Proxy" color="lime" icon={<TbPlugConnected size={19} />} />
</Box> </Box>
</AppShell.Navbar> </AppShell.Navbar>

View File

@@ -4,92 +4,126 @@ from utils.firegexapi import FiregexAPI
import argparse import argparse
import secrets import secrets
parser = argparse.ArgumentParser() if __name__ == "__main__":
parser.add_argument("--address", "-a", type=str , required=False, help='Address of firegex backend', default="http://127.0.0.1:4444/") parser = argparse.ArgumentParser()
parser.add_argument("--password", "-p", type=str, required=True, help='Firegex password') parser.add_argument(
args = parser.parse_args() "--address",
sep() "-a",
puts("Testing will start on ", color=colors.cyan, end="") type=str,
puts(f"{args.address}", color=colors.yellow) required=False,
help="Address of firegex backend",
default="http://127.0.0.1:4444/",
)
parser.add_argument(
"--password", "-p", type=str, required=True, help="Firegex password"
)
args = parser.parse_args()
sep()
puts("Testing will start on ", color=colors.cyan, end="")
puts(f"{args.address}", color=colors.yellow)
firegex = FiregexAPI(args.address) firegex = FiregexAPI(args.address)
#Connect to Firegex # Connect to Firegex
if firegex.status()["status"] == "init": if firegex.status()["status"] == "init":
if (firegex.set_password(args.password)): if firegex.set_password(args.password):
puts(f"Sucessfully set password to {args.password}", color=colors.green) puts(f"Sucessfully set password to {args.password}", color=colors.green)
else: else:
puts("Test Failed: Unknown response or password already put ✗", color=colors.red) puts(
"Test Failed: Unknown response or password already put ✗",
color=colors.red,
)
exit(1) exit(1)
else: else:
if (firegex.login(args.password)): if firegex.login(args.password):
puts("Sucessfully logged in ✔", color=colors.green) puts("Sucessfully logged in ✔", color=colors.green)
else: else:
puts("Test Failed: Unknown response or wrong passowrd ✗", color=colors.red) puts("Test Failed: Unknown response or wrong passowrd ✗", color=colors.red)
exit(1) exit(1)
if(firegex.status()["loggined"]): if firegex.status()["loggined"]:
puts("Correctly received status ✔", color=colors.green) puts("Correctly received status ✔", color=colors.green)
else: else:
puts("Test Failed: Unknown response or not logged in✗", color=colors.red) puts("Test Failed: Unknown response or not logged in✗", color=colors.red)
exit(1) exit(1)
#Prepare second instance # Prepare second instance
firegex2 = FiregexAPI(args.address) firegex2 = FiregexAPI(args.address)
if (firegex2.login(args.password)): if firegex2.login(args.password):
puts("Sucessfully logged in on second instance ✔", color=colors.green) puts("Sucessfully logged in on second instance ✔", color=colors.green)
else: else:
puts("Test Failed: Unknown response or wrong passowrd on second instance ✗", color=colors.red) puts(
"Test Failed: Unknown response or wrong passowrd on second instance ✗",
color=colors.red,
)
exit(1) exit(1)
if(firegex2.status()["loggined"]): if firegex2.status()["loggined"]:
puts("Correctly received status on second instance✔", color=colors.green) puts("Correctly received status on second instance✔", color=colors.green)
else: else:
puts("Test Failed: Unknown response or not logged in on second instance✗", color=colors.red) puts(
"Test Failed: Unknown response or not logged in on second instance✗",
color=colors.red,
)
exit(1) exit(1)
#Change password # Change password
new_password = secrets.token_hex(10) new_password = secrets.token_hex(10)
if (firegex.change_password(new_password,expire=True)): if firegex.change_password(new_password, expire=True):
puts(f"Sucessfully changed password to {new_password}", color=colors.green) puts(f"Sucessfully changed password to {new_password}", color=colors.green)
else: else:
puts("Test Failed: Coundl't change the password ✗", color=colors.red) puts("Test Failed: Coundl't change the password ✗", color=colors.red)
exit(1) exit(1)
#Check if we are still logged in # Check if we are still logged in
if(firegex.status()["loggined"]): if firegex.status()["loggined"]:
puts("Correctly received status after password change ✔", color=colors.green) puts("Correctly received status after password change ✔", color=colors.green)
else: else:
puts("Test Failed: Unknown response or not logged after password change ✗", color=colors.red) puts(
"Test Failed: Unknown response or not logged after password change ✗",
color=colors.red,
)
exit(1) exit(1)
#Check if second session expired and relog # Check if second session expired and relog
if(not firegex2.status()["loggined"]): if not firegex2.status()["loggined"]:
puts("Second instance was expired currectly ✔", color=colors.green) puts("Second instance was expired currectly ✔", color=colors.green)
else: else:
puts("Test Failed: Still logged in on second instance, expire expected ✗", color=colors.red) puts(
"Test Failed: Still logged in on second instance, expire expected ✗",
color=colors.red,
)
exit(1) exit(1)
if (firegex2.login(new_password)): if firegex2.login(new_password):
puts("Sucessfully logged in on second instance ✔", color=colors.green) puts("Sucessfully logged in on second instance ✔", color=colors.green)
else: else:
puts("Test Failed: Unknown response or wrong passowrd on second instance ✗", color=colors.red) puts(
"Test Failed: Unknown response or wrong passowrd on second instance ✗",
color=colors.red,
)
exit(1) exit(1)
#Change it back # Change it back
if (firegex.change_password(args.password,expire=False)): if firegex.change_password(args.password, expire=False):
puts("Sucessfully restored the password ✔", color=colors.green) puts("Sucessfully restored the password ✔", color=colors.green)
else: else:
puts("Test Failed: Coundl't change the password ✗", color=colors.red) puts("Test Failed: Coundl't change the password ✗", color=colors.red)
exit(1) exit(1)
#Check if we are still logged in # Check if we are still logged in
if(firegex2.status()["loggined"]): if firegex2.status()["loggined"]:
puts("Correctly received status after password change ✔", color=colors.green) puts("Correctly received status after password change ✔", color=colors.green)
else: else:
puts("Test Failed: Unknown response or not logged after password change ✗", color=colors.red) puts(
"Test Failed: Unknown response or not logged after password change ✗",
color=colors.red,
)
exit(1) exit(1)
puts("List of available interfaces:", color=colors.yellow) puts("List of available interfaces:", color=colors.yellow)
for interface in firegex.get_interfaces(): for interface in firegex.get_interfaces():
puts("name: {}, address: {}".format(interface["name"], interface["addr"]), color=colors.yellow) puts(
"name: {}, address: {}".format(interface["name"], interface["addr"]),
color=colors.yellow,
)

File diff suppressed because it is too large Load Diff

View File

@@ -8,140 +8,224 @@ import secrets
import base64 import base64
import time import time
parser = argparse.ArgumentParser() if __name__ == "__main__":
parser.add_argument("--address", "-a", type=str , required=False, help='Address of firegex backend', default="http://127.0.0.1:4444/") parser = argparse.ArgumentParser()
parser.add_argument("--password", "-p", type=str, required=True, help='Firegex password') parser.add_argument(
parser.add_argument("--service_name", "-n", type=str , required=False, help='Name of the test service', default="Test Service") "--address",
parser.add_argument("--port", "-P", type=int , required=False, help='Port of the test service', default=1337) "-a",
parser.add_argument("--ipv6", "-6" , action="store_true", help='Test Ipv6', default=False) type=str,
parser.add_argument("--proto", "-m" , type=str, required=False, choices=["tcp","udp"], help='Select the protocol', default="tcp") required=False,
help="Address of firegex backend",
default="http://127.0.0.1:4444/",
)
parser.add_argument(
"--password", "-p", type=str, required=True, help="Firegex password"
)
parser.add_argument(
"--service_name",
"-n",
type=str,
required=False,
help="Name of the test service",
default="Test Service",
)
parser.add_argument(
"--port",
"-P",
type=int,
required=False,
help="Port of the test service",
default=1337,
)
parser.add_argument(
"--ipv6", "-6", action="store_true", help="Test Ipv6", default=False
)
parser.add_argument(
"--proto",
"-m",
type=str,
required=False,
choices=["tcp", "udp"],
help="Select the protocol",
default="tcp",
)
args = parser.parse_args() args = parser.parse_args()
sep() sep()
puts("Testing will start on ", color=colors.cyan, end="") puts("Testing will start on ", color=colors.cyan, end="")
puts(f"{args.address}", color=colors.yellow) puts(f"{args.address}", color=colors.yellow)
firegex = FiregexAPI(args.address) firegex = FiregexAPI(args.address)
#Login # Login
if (firegex.login(args.password)): if firegex.login(args.password):
puts("Sucessfully logged in ✔", color=colors.green) puts("Sucessfully logged in ✔", color=colors.green)
else: else:
puts("Test Failed: Unknown response or wrong passowrd ✗", color=colors.red) puts("Test Failed: Unknown response or wrong passowrd ✗", color=colors.red)
exit(1) exit(1)
#Create server # Create server
server = (TcpServer if args.proto == "tcp" else UdpServer)(args.port,ipv6=args.ipv6) server = (TcpServer if args.proto == "tcp" else UdpServer)(
args.port, ipv6=args.ipv6
)
def exit_test(code): def exit_test(code):
if service_id: if service_id:
server.stop() server.stop()
if(firegex.nfregex_delete_service(service_id)): if firegex.nfregex_delete_service(service_id):
puts("Sucessfully deleted service ✔", color=colors.green) puts("Sucessfully deleted service ✔", color=colors.green)
else: else:
puts("Test Failed: Coulnd't delete serivce ✗", color=colors.red) puts("Test Failed: Coulnd't delete serivce ✗", color=colors.red)
exit_test(1) exit_test(1)
exit(code) exit(code)
srvs = firegex.nfregex_get_services() srvs = firegex.nfregex_get_services()
for ele in srvs: for ele in srvs:
if ele['name'] == args.service_name: if ele["name"] == args.service_name:
firegex.nfregex_delete_service(ele['service_id']) firegex.nfregex_delete_service(ele["service_id"])
service_id = firegex.nfregex_add_service(args.service_name, args.port, args.proto , "::1" if args.ipv6 else "127.0.0.1" ) service_id = firegex.nfregex_add_service(
if service_id: args.service_name, args.port, args.proto, "::1" if args.ipv6 else "127.0.0.1"
)
if service_id:
puts(f"Sucessfully created service {service_id}", color=colors.green) puts(f"Sucessfully created service {service_id}", color=colors.green)
else: else:
puts("Test Failed: Failed to create service ✗", color=colors.red) puts("Test Failed: Failed to create service ✗", color=colors.red)
exit(1) exit(1)
if(firegex.nfregex_start_service(service_id)): if firegex.nfregex_start_service(service_id):
puts("Sucessfully started service ✔", color=colors.green) puts("Sucessfully started service ✔", color=colors.green)
else: else:
puts("Test Failed: Failed to start service ✗", color=colors.red) puts("Test Failed: Failed to start service ✗", color=colors.red)
exit_test(1) exit_test(1)
server.start() server.start()
time.sleep(0.5) time.sleep(0.5)
try: try:
if server.sendCheckData(secrets.token_bytes(432)): if server.sendCheckData(secrets.token_bytes(432)):
puts("Successfully tested first proxy with no regex ✔", color=colors.green) puts("Successfully tested first proxy with no regex ✔", color=colors.green)
else: else:
puts("Test Failed: Data was corrupted ", color=colors.red) puts("Test Failed: Data was corrupted ", color=colors.red)
exit_test(1) exit_test(1)
except Exception: except Exception:
puts("Test Failed: Couldn't send data to the server ", color=colors.red) puts("Test Failed: Couldn't send data to the server ", color=colors.red)
exit_test(1) exit_test(1)
#Add new regex # Add new regex
secret = bytes(secrets.token_hex(16).encode()) secret = bytes(secrets.token_hex(16).encode())
if firegex.nfregex_add_regex(service_id,secret,"B",active=True,is_case_sensitive=True): if firegex.nfregex_add_regex(
service_id, secret, "B", active=True, is_case_sensitive=True
):
puts(f"Sucessfully added regex {str(secret)}", color=colors.green) puts(f"Sucessfully added regex {str(secret)}", color=colors.green)
else: else:
puts(f"Test Failed: Couldn't add the regex {str(secret)}", color=colors.red) puts(f"Test Failed: Couldn't add the regex {str(secret)}", color=colors.red)
exit_test(1) exit_test(1)
# Check if regex is present in the service
n_blocked = 0
#Check if regex is present in the service def getMetric(metric_name, regex):
n_blocked = 0
def getMetric(metric_name, regex):
for metric in firegex.nfregex_get_metrics().split("\n"): for metric in firegex.nfregex_get_metrics().split("\n"):
if metric.startswith(metric_name + "{") and f'regex="{regex}"' in metric: if metric.startswith(metric_name + "{") and f'regex="{regex}"' in metric:
return int(metric.split(" ")[-1]) return int(metric.split(" ")[-1])
def checkRegex(regex, should_work=True, upper=False, deleted=False): def checkRegex(regex, should_work=True, upper=False, deleted=False):
if should_work: if should_work:
global n_blocked global n_blocked
for r in firegex.nfregex_get_service_regexes(service_id): for r in firegex.nfregex_get_service_regexes(service_id):
if r["regex"] == secret: if r["regex"] == secret:
#Test the regex # Test the regex
s = regex.upper() if upper else regex s = regex.upper() if upper else regex
if not server.sendCheckData(secrets.token_bytes(40) + s + secrets.token_bytes(40)): if not server.sendCheckData(
puts("The malicious request was successfully blocked ✔", color=colors.green) secrets.token_bytes(40) + s + secrets.token_bytes(40)
):
puts(
"The malicious request was successfully blocked ✔",
color=colors.green,
)
n_blocked += 1 n_blocked += 1
time.sleep(1) time.sleep(1)
if firegex.nfregex_get_regex(r["id"])["n_packets"] == n_blocked: if firegex.nfregex_get_regex(r["id"])["n_packets"] == n_blocked:
puts("The packet was reported as blocked in the API ✔", color=colors.green) puts(
"The packet was reported as blocked in the API ✔",
color=colors.green,
)
else: else:
puts("Test Failed: The packet wasn't reported as blocked in the API ✗", color=colors.red) puts(
"Test Failed: The packet wasn't reported as blocked in the API ✗",
color=colors.red,
)
exit_test(1) exit_test(1)
if getMetric("firegex_blocked_packets", secret.decode()) == n_blocked: if (
puts("The packet was reported as blocked in the metrics ✔", color=colors.green) getMetric("firegex_blocked_packets", secret.decode())
== n_blocked
):
puts(
"The packet was reported as blocked in the metrics ✔",
color=colors.green,
)
else: else:
puts("Test Failed: The packet wasn't reported as blocked in the metrics ✗", color=colors.red) puts(
"Test Failed: The packet wasn't reported as blocked in the metrics ✗",
color=colors.red,
)
exit_test(1) exit_test(1)
if getMetric("firegex_active", secret.decode()) == 1: if getMetric("firegex_active", secret.decode()) == 1:
puts("The regex was reported as active in the metrics ✔", color=colors.green) puts(
"The regex was reported as active in the metrics ✔",
color=colors.green,
)
else: else:
puts("Test Failed: The regex wasn't reported as active in the metrics ✗", color=colors.red) puts(
"Test Failed: The regex wasn't reported as active in the metrics ✗",
color=colors.red,
)
exit_test(1) exit_test(1)
else: else:
puts("Test Failed: The request wasn't blocked ✗", color=colors.red) puts(
"Test Failed: The request wasn't blocked ✗",
color=colors.red,
)
exit_test(1) exit_test(1)
return return
puts("Test Failed: The regex wasn't found ✗", color=colors.red) puts("Test Failed: The regex wasn't found ✗", color=colors.red)
exit_test(1) exit_test(1)
else: else:
if server.sendCheckData(secrets.token_bytes(40) + base64.b64decode(regex) + secrets.token_bytes(40)): if server.sendCheckData(
secrets.token_bytes(40)
+ base64.b64decode(regex)
+ secrets.token_bytes(40)
):
puts("The request wasn't blocked ✔", color=colors.green) puts("The request wasn't blocked ✔", color=colors.green)
else: else:
puts("Test Failed: The request was blocked when it shouldn't have", color=colors.red) puts(
"Test Failed: The request was blocked when it shouldn't have",
color=colors.red,
)
exit_test(1) exit_test(1)
if not deleted: if not deleted:
if getMetric("firegex_active", secret.decode()) == 0: if getMetric("firegex_active", secret.decode()) == 0:
puts("The regex was reported as inactive in the metrics ✔", color=colors.green) puts(
"The regex was reported as inactive in the metrics ✔",
color=colors.green,
)
else: else:
puts("Test Failed: The regex wasn't reported as inactive in the metrics ✗", color=colors.red) puts(
"Test Failed: The regex wasn't reported as inactive in the metrics ✗",
color=colors.red,
)
exit_test(1) exit_test(1)
def clear_regexes(): def clear_regexes():
global n_blocked global n_blocked
n_blocked = 0 n_blocked = 0
for r in firegex.nfregex_get_service_regexes(service_id): for r in firegex.nfregex_get_service_regexes(service_id):
if r["regex"] == secret: if r["regex"] == secret:
if(firegex.nfregex_delete_regex(r["id"])): if firegex.nfregex_delete_regex(r["id"]):
puts(f"Sucessfully deleted regex with id {r['id']}", color=colors.green) puts(
f"Sucessfully deleted regex with id {r['id']}",
color=colors.green,
)
else: else:
puts("Test Failed: Coulnd't delete the regex ✗", color=colors.red) puts("Test Failed: Coulnd't delete the regex ✗", color=colors.red)
exit_test(1) exit_test(1)
@@ -149,106 +233,141 @@ def clear_regexes():
if f'regex="{secret.decode()}"' not in firegex.nfregex_get_metrics(): if f'regex="{secret.decode()}"' not in firegex.nfregex_get_metrics():
puts("No regex metrics after deletion ✔", color=colors.green) puts("No regex metrics after deletion ✔", color=colors.green)
else: else:
puts("Test Failed: Metrics found after deleting the regex ✗", color=colors.red) puts(
"Test Failed: Metrics found after deleting the regex ✗",
color=colors.red,
)
exit_test(1) exit_test(1)
checkRegex(secret) checkRegex(secret)
#Pause the proxy # Pause the proxy
if(firegex.nfregex_stop_service(service_id)): if firegex.nfregex_stop_service(service_id):
puts(f"Sucessfully paused service with id {service_id}", color=colors.green) puts(f"Sucessfully paused service with id {service_id}", color=colors.green)
else: else:
puts("Test Failed: Coulnd't pause the service ✗", color=colors.red) puts("Test Failed: Coulnd't pause the service ✗", color=colors.red)
exit_test(1) exit_test(1)
#Check if it's actually paused # Check if it's actually paused
checkRegex(secret,should_work=False) checkRegex(secret, should_work=False)
#Start firewall # Start firewall
if(firegex.nfregex_start_service(service_id)): if firegex.nfregex_start_service(service_id):
puts(f"Sucessfully started service with id {service_id}", color=colors.green) puts(f"Sucessfully started service with id {service_id}", color=colors.green)
else: else:
puts("Test Failed: Coulnd't start the service ✗", color=colors.red) puts("Test Failed: Coulnd't start the service ✗", color=colors.red)
exit_test(1) exit_test(1)
checkRegex(secret) checkRegex(secret)
#Disable regex # Disable regex
for r in firegex.nfregex_get_service_regexes(service_id): for r in firegex.nfregex_get_service_regexes(service_id):
if r["regex"] == secret: if r["regex"] == secret:
if(firegex.nfregex_disable_regex(r["id"])): if firegex.nfregex_disable_regex(r["id"]):
puts(f"Sucessfully disabled regex with id {r['id']}", color=colors.green) puts(
f"Sucessfully disabled regex with id {r['id']}",
color=colors.green,
)
else: else:
puts("Test Failed: Coulnd't disable the regex ✗", color=colors.red) puts("Test Failed: Coulnd't disable the regex ✗", color=colors.red)
exit_test(1) exit_test(1)
break break
#Check if it's actually disabled # Check if it's actually disabled
checkRegex(secret,should_work=False) checkRegex(secret, should_work=False)
#Enable regex # Enable regex
for r in firegex.nfregex_get_service_regexes(service_id): for r in firegex.nfregex_get_service_regexes(service_id):
if r["regex"] == secret: if r["regex"] == secret:
if(firegex.nfregex_enable_regex(r["id"])): if firegex.nfregex_enable_regex(r["id"]):
puts(f"Sucessfully enabled regex with id {r['id']}", color=colors.green) puts(
f"Sucessfully enabled regex with id {r['id']}", color=colors.green
)
else: else:
puts("Test Failed: Coulnd't enable the regex ✗", color=colors.red) puts("Test Failed: Coulnd't enable the regex ✗", color=colors.red)
exit_test(1) exit_test(1)
break break
checkRegex(secret) checkRegex(secret)
#Delete regex # Delete regex
clear_regexes() clear_regexes()
#Check if it's actually deleted # Check if it's actually deleted
checkRegex(secret,should_work=False,deleted=True) checkRegex(secret, should_work=False, deleted=True)
#Add case insensitive regex # Add case insensitive regex
if(firegex.nfregex_add_regex(service_id,secret,"B",active=True, is_case_sensitive=False)): if firegex.nfregex_add_regex(
puts(f"Sucessfully added case insensitive regex {str(secret)}", color=colors.green) service_id, secret, "B", active=True, is_case_sensitive=False
else: ):
puts(f"Test Failed: Coulnd't add the case insensitive regex {str(secret)}", color=colors.red) puts(
f"Sucessfully added case insensitive regex {str(secret)}",
color=colors.green,
)
else:
puts(
f"Test Failed: Coulnd't add the case insensitive regex {str(secret)}",
color=colors.red,
)
exit_test(1) exit_test(1)
checkRegex(secret, upper=True) checkRegex(secret, upper=True)
checkRegex(secret) checkRegex(secret)
clear_regexes() clear_regexes()
#Rename service # Rename service
if(firegex.nfregex_rename_service(service_id,f"{args.service_name}2")): if firegex.nfregex_rename_service(service_id, f"{args.service_name}2"):
puts(f"Sucessfully renamed service to {args.service_name}2 ✔", color=colors.green) puts(
else: f"Sucessfully renamed service to {args.service_name}2 ✔", color=colors.green
)
else:
puts("Test Failed: Coulnd't rename service ✗", color=colors.red) puts("Test Failed: Coulnd't rename service ✗", color=colors.red)
exit_test(1) exit_test(1)
#Check if service was renamed correctly # Check if service was renamed correctly
service = firegex.nfregex_get_service(service_id) service = firegex.nfregex_get_service(service_id)
if service["name"] == f"{args.service_name}2": if service["name"] == f"{args.service_name}2":
puts("Checked that service was renamed correctly ✔", color=colors.green) puts("Checked that service was renamed correctly ✔", color=colors.green)
else: else:
puts("Test Failed: Service wasn't renamed correctly ✗", color=colors.red) puts("Test Failed: Service wasn't renamed correctly ✗", color=colors.red)
exit_test(1) exit_test(1)
#Rename back service # Rename back service
if(firegex.nfregex_rename_service(service_id,f"{args.service_name}")): if firegex.nfregex_rename_service(service_id, f"{args.service_name}"):
puts(f"Sucessfully renamed service to {args.service_name}", color=colors.green) puts(
else: f"Sucessfully renamed service to {args.service_name}", color=colors.green
)
else:
puts("Test Failed: Coulnd't rename service ✗", color=colors.red) puts("Test Failed: Coulnd't rename service ✗", color=colors.red)
exit_test(1) exit_test(1)
#Change settings # Change settings
opposite_proto = "udp" if args.proto == "tcp" else "tcp" opposite_proto = "udp" if args.proto == "tcp" else "tcp"
if(firegex.nfregex_settings_service(service_id, 1338, opposite_proto, "::dead:beef" if args.ipv6 else "123.123.123.123", True)): if firegex.nfregex_settings_service(
service_id,
1338,
opposite_proto,
"::dead:beef" if args.ipv6 else "123.123.123.123",
True,
):
srv_updated = firegex.nfregex_get_service(service_id) srv_updated = firegex.nfregex_get_service(service_id)
if srv_updated["port"] == 1338 and srv_updated["proto"] == opposite_proto and ("::dead:beef" if args.ipv6 else "123.123.123.123") in srv_updated["ip_int"] and srv_updated["fail_open"]: if (
srv_updated["port"] == 1338
and srv_updated["proto"] == opposite_proto
and ("::dead:beef" if args.ipv6 else "123.123.123.123")
in srv_updated["ip_int"]
and srv_updated["fail_open"]
):
puts("Sucessfully changed service settings ✔", color=colors.green) puts("Sucessfully changed service settings ✔", color=colors.green)
else: else:
puts("Test Failed: Service settings weren't updated correctly ✗", color=colors.red) puts(
"Test Failed: Service settings weren't updated correctly ✗",
color=colors.red,
)
exit_test(1) exit_test(1)
else: else:
puts("Test Failed: Coulnd't change service settings ✗", color=colors.red) puts("Test Failed: Coulnd't change service settings ✗", color=colors.red)
exit_test(1) exit_test(1)
exit_test(0) exit_test(0)

View File

@@ -7,65 +7,108 @@ import argparse
import secrets import secrets
import time import time
parser = argparse.ArgumentParser() if __name__ == "__main__":
parser.add_argument("--address", "-a", type=str , required=False, help='Address of firegex backend', default="http://127.0.0.1:4444/") parser = argparse.ArgumentParser()
parser.add_argument("--password", "-p", type=str, required=True, help='Firegex password') parser.add_argument(
parser.add_argument("--service_name", "-n", type=str , required=False, help='Name of the test service', default="Test Service") "--address",
parser.add_argument("--port", "-P", type=int , required=False, help='Port of the test service', default=1337) "-a",
parser.add_argument("--ipv6", "-6" , action="store_true", help='Test Ipv6', default=False) type=str,
parser.add_argument("--proto", "-m" , type=str, required=False, choices=["tcp","udp"], help='Select the protocol', default="tcp") required=False,
help="Address of firegex backend",
default="http://127.0.0.1:4444/",
)
parser.add_argument(
"--password", "-p", type=str, required=True, help="Firegex password"
)
parser.add_argument(
"--service_name",
"-n",
type=str,
required=False,
help="Name of the test service",
default="Test Service",
)
parser.add_argument(
"--port",
"-P",
type=int,
required=False,
help="Port of the test service",
default=1337,
)
parser.add_argument(
"--ipv6", "-6", action="store_true", help="Test Ipv6", default=False
)
parser.add_argument(
"--proto",
"-m",
type=str,
required=False,
choices=["tcp", "udp"],
help="Select the protocol",
default="tcp",
)
args = parser.parse_args() args = parser.parse_args()
sep() sep()
puts("Testing will start on ", color=colors.cyan, end="") puts("Testing will start on ", color=colors.cyan, end="")
puts(f"{args.address}", color=colors.yellow) puts(f"{args.address}", color=colors.yellow)
firegex = FiregexAPI(args.address) firegex = FiregexAPI(args.address)
#Login # Login
if (firegex.login(args.password)): if firegex.login(args.password):
puts("Sucessfully logged in ✔", color=colors.green) puts("Sucessfully logged in ✔", color=colors.green)
else: else:
puts("Test Failed: Unknown response or wrong passowrd ✗", color=colors.red) puts("Test Failed: Unknown response or wrong passowrd ✗", color=colors.red)
exit(1) exit(1)
#Create server # Create server
server = (TcpServer if args.proto == "tcp" else UdpServer)(args.port+1,ipv6=args.ipv6,proxy_port=args.port) server = (TcpServer if args.proto == "tcp" else UdpServer)(
args.port + 1, ipv6=args.ipv6, proxy_port=args.port
)
def exit_test(code): def exit_test(code):
if service_id: if service_id:
server.stop() server.stop()
if(firegex.ph_delete_service(service_id)): if firegex.ph_delete_service(service_id):
puts("Sucessfully deleted service ✔", color=colors.green) puts("Sucessfully deleted service ✔", color=colors.green)
else: else:
puts("Test Failed: Coulnd't delete serivce ✗", color=colors.red) puts("Test Failed: Coulnd't delete serivce ✗", color=colors.red)
exit_test(1) exit_test(1)
exit(code) exit(code)
srvs = firegex.ph_get_services() srvs = firegex.ph_get_services()
for ele in srvs: for ele in srvs:
if ele['name'] == args.service_name: if ele["name"] == args.service_name:
firegex.ph_delete_service(ele['service_id']) firegex.ph_delete_service(ele["service_id"])
#Create and start serivce # Create and start serivce
service_id = firegex.ph_add_service(args.service_name, args.port, args.port+1, args.proto , "::1" if args.ipv6 else "127.0.0.1", "::1" if args.ipv6 else "127.0.0.1") service_id = firegex.ph_add_service(
if service_id: args.service_name,
args.port,
args.port + 1,
args.proto,
"::1" if args.ipv6 else "127.0.0.1",
"::1" if args.ipv6 else "127.0.0.1",
)
if service_id:
puts(f"Sucessfully created service {service_id}", color=colors.green) puts(f"Sucessfully created service {service_id}", color=colors.green)
else: else:
puts("Test Failed: Failed to create service ✗", color=colors.red) puts("Test Failed: Failed to create service ✗", color=colors.red)
exit(1) exit(1)
if(firegex.ph_start_service(service_id)): if firegex.ph_start_service(service_id):
puts("Sucessfully started service ✔", color=colors.green) puts("Sucessfully started service ✔", color=colors.green)
else: else:
puts("Test Failed: Failed to start service ✗", color=colors.red) puts("Test Failed: Failed to start service ✗", color=colors.red)
exit_test(1) exit_test(1)
server.start() server.start()
time.sleep(0.5) time.sleep(0.5)
#Check if it started # Check if it started
def checkData(should_work): def checkData(should_work):
res = None res = None
try: try:
res = server.sendCheckData(secrets.token_bytes(432)) res = server.sendCheckData(secrets.token_bytes(432))
@@ -84,54 +127,60 @@ def checkData(should_work):
else: else:
puts("Successfully blocked connection ✔", color=colors.green) puts("Successfully blocked connection ✔", color=colors.green)
checkData(True) checkData(True)
#Pause the proxy # Pause the proxy
if(firegex.ph_stop_service(service_id)): if firegex.ph_stop_service(service_id):
puts(f"Sucessfully paused service with id {service_id}", color=colors.green) puts(f"Sucessfully paused service with id {service_id}", color=colors.green)
else: else:
puts("Test Failed: Coulnd't pause the service ✗", color=colors.red) puts("Test Failed: Coulnd't pause the service ✗", color=colors.red)
exit_test(1) exit_test(1)
checkData(False) checkData(False)
#Start firewall # Start firewall
if(firegex.ph_start_service(service_id)): if firegex.ph_start_service(service_id):
puts(f"Sucessfully started service with id {service_id}", color=colors.green) puts(f"Sucessfully started service with id {service_id}", color=colors.green)
else: else:
puts("Test Failed: Coulnd't start the service ✗", color=colors.red) puts("Test Failed: Coulnd't start the service ✗", color=colors.red)
exit_test(1) exit_test(1)
checkData(True) checkData(True)
#Change port # Change port
if(firegex.ph_change_destination(service_id, "::1" if args.ipv6 else "127.0.0.1", args.port+2)): if firegex.ph_change_destination(
service_id, "::1" if args.ipv6 else "127.0.0.1", args.port + 2
):
puts("Sucessfully changed port ✔", color=colors.green) puts("Sucessfully changed port ✔", color=colors.green)
else: else:
puts("Test Failed: Coulnd't change destination ✗", color=colors.red) puts("Test Failed: Coulnd't change destination ✗", color=colors.red)
exit_test(1) exit_test(1)
checkData(False) checkData(False)
server.stop() server.stop()
server = (TcpServer if args.proto == "tcp" else UdpServer)(args.port+2,ipv6=args.ipv6,proxy_port=args.port) server = (TcpServer if args.proto == "tcp" else UdpServer)(
server.start() args.port + 2, ipv6=args.ipv6, proxy_port=args.port
time.sleep(0.5) )
server.start()
time.sleep(0.5)
checkData(True) checkData(True)
#Rename service # Rename service
if(firegex.ph_rename_service(service_id,f"{args.service_name}2")): if firegex.ph_rename_service(service_id, f"{args.service_name}2"):
puts(f"Sucessfully renamed service to {args.service_name}2 ✔", color=colors.green) puts(
else: f"Sucessfully renamed service to {args.service_name}2 ✔", color=colors.green
)
else:
puts("Test Failed: Coulnd't rename service ✗", color=colors.red) puts("Test Failed: Coulnd't rename service ✗", color=colors.red)
exit_test(1) exit_test(1)
#Check if service was renamed correctly # Check if service was renamed correctly
for services in firegex.ph_get_services(): for services in firegex.ph_get_services():
if services["name"] == f"{args.service_name}2": if services["name"] == f"{args.service_name}2":
puts("Checked that service was renamed correctly ✔", color=colors.green) puts("Checked that service was renamed correctly ✔", color=colors.green)
exit_test(0) exit_test(0)
puts("Test Failed: Service wasn't renamed correctly ✗", color=colors.red) puts("Test Failed: Service wasn't renamed correctly ✗", color=colors.red)
exit_test(1) exit_test(1)

View File

@@ -1,9 +1,46 @@
import queue
from multiprocessing import Process, Queue from multiprocessing import Process, Queue
import socket import socket
import traceback import traceback
def _start_tcp_server(port, server_queue: Queue, ipv6, verbose):
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(("::1" if ipv6 else "127.0.0.1", port))
sock.listen(8)
while True:
connection, address = sock.accept()
while True:
try:
buf = connection.recv(4096)
if buf == b"":
break
reply = buf # Default to echo
try:
# See if there is a custom reply, but don't block
custom_reply = server_queue.get(block=False)
reply = custom_reply
except queue.Empty:
pass # No custom reply, just echo
if verbose:
print("SERVER: ", reply)
connection.sendall(reply)
except (ConnectionResetError, BrokenPipeError):
break # Client closed connection
except Exception:
if verbose:
traceback.print_exc()
break # Exit on other errors
connection.close()
class TcpServer: class TcpServer:
def __init__(self,port,ipv6,proxy_port=None, verbose=False): def __init__(self, port, ipv6, proxy_port=None, verbose=False):
self.proxy_port = proxy_port self.proxy_port = proxy_port
self.ipv6 = ipv6 self.ipv6 = ipv6
self.port = port self.port = port
@@ -12,30 +49,10 @@ class TcpServer:
self._regen_process() self._regen_process()
def _regen_process(self): def _regen_process(self):
def _startServer(port, server_queue:Queue): self.server = Process(
sock = socket.socket(socket.AF_INET6 if self.ipv6 else socket.AF_INET, socket.SOCK_STREAM) target=_start_tcp_server,
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) args=[self.port, self._server_data_queue, self.ipv6, self.verbose],
sock.bind(('::1' if self.ipv6 else '127.0.0.1', port)) )
sock.listen(8)
while True:
connection,address = sock.accept()
while True:
try:
buf = connection.recv(4096)
if buf == b'':
break
try:
buf = server_queue.get(block=False)
except Exception:
pass
if self.verbose:
print("SERVER: ", buf)
connection.sendall(buf)
except Exception:
if self.verbose:
traceback.print_exc()
connection.close()
self.server = Process(target=_startServer,args=[self.port, self._server_data_queue])
def start(self): def start(self):
self.server.start() self.server.start()
@@ -46,9 +63,16 @@ class TcpServer:
self._regen_process() self._regen_process()
def connect_client(self): def connect_client(self):
self.client_sock = socket.socket(socket.AF_INET6 if self.ipv6 else socket.AF_INET, socket.SOCK_STREAM) self.client_sock = socket.socket(
socket.AF_INET6 if self.ipv6 else socket.AF_INET, socket.SOCK_STREAM
)
self.client_sock.settimeout(1) self.client_sock.settimeout(1)
self.client_sock.connect(('::1' if self.ipv6 else '127.0.0.1', self.proxy_port if self.proxy_port else self.port)) self.client_sock.connect(
(
"::1" if self.ipv6 else "127.0.0.1",
self.proxy_port if self.proxy_port else self.port,
)
)
def close_client(self): def close_client(self):
if self.client_sock: if self.client_sock:

View File

@@ -1,35 +1,94 @@
from multiprocessing import Process from multiprocessing import Process, Queue
import socket import socket
import queue
import traceback
class UdpServer:
def __init__(self,port,ipv6, proxy_port = None): def _start_udp_server(port, server_queue: Queue, ipv6, verbose):
def _startServer(port):
sock = socket.socket(socket.AF_INET6 if ipv6 else socket.AF_INET, socket.SOCK_DGRAM) 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.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.bind(('::1' if ipv6 else '127.0.0.1', port)) sock.bind(("::1" if ipv6 else "127.0.0.1", port))
while True: while True:
bytesAddressPair = sock.recvfrom(432) try:
bytesAddressPair = sock.recvfrom(4096)
message = bytesAddressPair[0] message = bytesAddressPair[0]
address = bytesAddressPair[1] address = bytesAddressPair[1]
sock.sendto(message, address)
self.ipv6 = ipv6 reply = message # Default to echo
try:
# See if there is a custom reply, but don't block
custom_reply = server_queue.get(block=False)
reply = custom_reply
except queue.Empty:
pass # No custom reply, just echo
if verbose:
print(f"SERVER: sending {reply} to {address}")
sock.sendto(reply, address)
except Exception:
if verbose:
traceback.print_exc()
class UdpServer:
def __init__(self, port, ipv6, proxy_port=None, verbose=False):
self.port = port self.port = port
self.ipv6 = ipv6
self.proxy_port = proxy_port self.proxy_port = proxy_port
self.server = Process(target=_startServer,args=[port]) self.verbose = verbose
self._server_data_queue = Queue()
self._regen_process()
def _regen_process(self):
self.server = Process(
target=_start_udp_server,
args=[self.port, self._server_data_queue, self.ipv6, self.verbose],
)
def start(self): def start(self):
self.server.start() self.server.start()
def stop(self): def stop(self):
self.server.terminate() self.server.terminate()
self.server.join()
self._regen_process()
def sendCheckData(self,data): def connect_client(self):
s = socket.socket(socket.AF_INET6 if self.ipv6 else socket.AF_INET, socket.SOCK_DGRAM) self.client_sock = socket.socket(
s.settimeout(2) socket.AF_INET6 if self.ipv6 else socket.AF_INET, socket.SOCK_DGRAM
s.sendto(data, ('::1' if self.ipv6 else '127.0.0.1', self.proxy_port if self.proxy_port else self.port)) )
self.client_sock.settimeout(1)
self.client_sock.connect(
(
"::1" if self.ipv6 else "127.0.0.1",
self.proxy_port if self.proxy_port else self.port,
)
)
def close_client(self):
if self.client_sock:
self.client_sock.close()
def send_packet(self, packet, server_reply=None):
if self.verbose:
print("CLIENT: ", packet)
if server_reply:
self._server_data_queue.put(server_reply)
self.client_sock.sendall(packet)
def recv_packet(self):
try: try:
received_data = s.recvfrom(432) return self.client_sock.recv(4096)
except Exception: except (TimeoutError, ConnectionResetError):
if self.verbose:
traceback.print_exc()
return False return False
return received_data[0] == data
def sendCheckData(self, data, get_data=False):
self.connect_client()
self.send_packet(data)
received_data = self.recv_packet()
self.close_client()
if get_data:
return received_data
return received_data == data