Quico/update-firewall-source
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor(xml): Shorten section name var

Browse Source
This commit is contained in:
hygienic-books 2022-07-05 17:26:24 +02:00
parent 1bbf75d3dd
commit c4781aa615
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
update-firewall-source.py
View File

@ -285,7 +285,7 @@ def add_rule_elem(
prio: int, prio: int,
target: str, target: str,
/, *, /, *,
arg_section_name: str = None, arg_section: str = None,
arg_proto: str = None, arg_proto: str = None,
arg_state: str = None, arg_state: str = None,
arg_ports: list = None, arg_ports: list = None,
@ -307,8 +307,7 @@ def add_rule_elem(
f"""{"--match multiport --destination-ports " + ",".join(arg_ports) + " " if arg_ports else ""}""" \ f"""{"--match multiport --destination-ports " + ",".join(arg_ports) + " " if arg_ports else ""}""" \
f"""{"--source " + arg_address + " " if arg_address else ""}""" \ f"""{"--source " + arg_address + " " if arg_address else ""}""" \
f"""--jump {target}""" \ f"""--jump {target}""" \
f""" f"""{" --match comment --comment " + chr(34) + arg_section[:256] + chr(34) if arg_section else ""}"""
{" --match comment --comment " + chr(34) + arg_section_name[:256] + chr(34) if arg_section_name else ""}"""
except lxml.etree.LxmlError as le: except lxml.etree.LxmlError as le:
log.error(f"""Failed to add XML '<rule ipv=f"{address_family}" .../>'\n""" log.error(f"""Failed to add XML '<rule ipv=f"{address_family}" .../>'\n"""
f"Verbatim exception was:\n" f"Verbatim exception was:\n"
@ -382,7 +381,7 @@ def add_fw_rule_to_xml(
address_family, address_family,
rules_already_added[address_family], rules_already_added[address_family],
target, target,
arg_section_name=section_name, arg_section=section_name,
arg_proto=proto, arg_proto=proto,
arg_state=config_obj.get(section_name, "state"), arg_state=config_obj.get(section_name, "state"),
arg_ports=ports, arg_ports=ports,
@ -398,7 +397,7 @@ def add_fw_rule_to_xml(
address_family, address_family,
rules_already_added[address_family], rules_already_added[address_family],
target, target,
arg_section_name=section_name, arg_section=section_name,
arg_proto=proto, arg_proto=proto,
arg_state=config_obj.get(section_name, "state"), arg_state=config_obj.get(section_name, "state"),
arg_ports=ports) arg_ports=ports)