Revert "host_firewall: sources zone accepts tcp ports from listed addresses alone"
This reverts commit 0abc9fb1c3.
This commit is contained in:
@@ -18,8 +18,6 @@ firewall:
|
|||||||
tcp: {}
|
tcp: {}
|
||||||
v4: {}
|
v4: {}
|
||||||
v6: {}
|
v6: {}
|
||||||
# Ports accepted from the listed addresses alone: name -> {tcp: ports, v4: addresses, v6: addresses}, each a map as above.
|
|
||||||
sources: {}
|
|
||||||
# Metrics scrapers: on wt0 only these source addresses reach the listed tcp
|
# Metrics scrapers: on wt0 only these source addresses reach the listed tcp
|
||||||
# ports (the vpn zone applies to every peer). Rendered only when both are set.
|
# ports (the vpn zone applies to every peer). Rendered only when both are set.
|
||||||
scrapers:
|
scrapers:
|
||||||
|
|||||||
@@ -367,14 +367,6 @@ table inet host {
|
|||||||
{% if list(firewall.public.udp) %}
|
{% if list(firewall.public.udp) %}
|
||||||
udp dport { {{ list(firewall.public.udp) }} } accept
|
udp dport { {{ list(firewall.public.udp) }} } accept
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% for src in firewall.sources | default({}, true) | dict2items | rejectattr('value', 'none') | map(attribute='value') %}
|
|
||||||
{% if list(src.tcp) and list(src.v4) %}
|
|
||||||
ip saddr { {{ list(src.v4) }} } tcp dport { {{ list(src.tcp) }} } accept
|
|
||||||
{% endif %}
|
|
||||||
{% if list(src.tcp) and list(src.v6) %}
|
|
||||||
ip6 saddr { {{ list(src.v6) }} } tcp dport { {{ list(src.tcp) }} } accept
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
{% if list(firewall.geo.tcp) %}
|
{% if list(firewall.geo.tcp) %}
|
||||||
tcp dport { {{ list(firewall.geo.tcp) }} } jump geo
|
tcp dport { {{ list(firewall.geo.tcp) }} } jump geo
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
Reference in New Issue
Block a user