Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added separation between external/internal in qdb_forward_entries

Browse Source
This commit is contained in:
Giulio 2021-06-29 13:15:14 +02:00
parent 893d3f1a8e
commit 99ea8dddbe
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubes/firewall.py
View File

@ -694,7 +694,10 @@ class Firewall:
directly separate forwarding rules from standard rules since they need directly separate forwarding rules from standard rules since they need
to be handled differently later. to be handled differently later.
''' '''
entries = {} entries = {
"internal": [],
"external": []
}
if addr_family is not None: if addr_family is not None:
exclude_dsttype = 'dst4' if addr_family == 6 else 'dst6' exclude_dsttype = 'dst4' if addr_family == 6 else 'dst6'
for ruleno, rule in zip(itertools.count(), self.rules): for ruleno, rule in zip(itertools.count(), self.rules):
@ -706,5 +709,10 @@ class Firewall:
# include only forwarding rules # include only forwarding rules
if rule.action != "forward": if rule.action != "forward":
continue continue
entries['{:04}'.format(ruleno)] = rule.rule if rule.forwardtype == "internal":
entries["internal"]['{:04}'.format(ruleno)] = rule.rule
elif rule.forwardype == "external":
entries["external"]['{:04}'.format(ruleno)] = rule.rule
else:
raise ValueError('invalid forwardtype for rule')
return entries return entries