marcus/mitm-webserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test
All checks were successful
Build and Deploy MITM Webserver / build (push) Successful in 8s
Details

Browse Source
This commit is contained in:
malmert
2026-02-28 23:03:54 +01:00
parent 6183e18045
commit 9af9be92a1
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/api/nft_manager.py
View File

@@ -63,6 +63,18 @@ class NftManager:
except json.JSONDecodeError as e: except json.JSONDecodeError as e:
raise NftError(f"json decode error: {e}") raise NftError(f"json decode error: {e}")
def list_rules_text(self) -> str:
"""
Obtain nft list ruleset in textual form. This is a fallback if JSON parsing fails.
Returns raw textual output on success, raises NftError on failure.
"""
self.nft.set_json_output(False) # best-effort attempt to disable JSON output
res = self.cmd("list ruleset")
self.nft.set_json_output(True) # restore JSON output preference
if res["rc"] != 0:
raise NftError(f"nft list ruleset failed: {res['stderr']}")
return res["stdout"] or ""
def list_chain_text(self, family: str, table: str, chain: str) -> str: def list_chain_text(self, family: str, table: str, chain: str) -> str:
""" """
Return textual output of `nft list chain <family> <table> <chain>`. Return textual output of `nft list chain <family> <table> <chain>`.
@@ -696,6 +708,8 @@ def list_rules():
try: try:
try: try:
nft_json = mgr.list_rules_json() nft_json = mgr.list_rules_json()
nft_text = mgr.list_rules_text()
logger.error("Successfully obtained nft JSON ruleset, but also got textual output: %r", nft_text)
except NftError as e: except NftError as e:
logger.debug("could not obtain nft JSON ruleset: %s", e) logger.debug("could not obtain nft JSON ruleset: %s", e)
text = mgr.list_rules_json() text = mgr.list_rules_json()