Skip to content

Added IPv6 support to iptables flush state. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stenstad wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added IPv6 support to iptables flush state. #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 49 additions & 1 deletion iptables/flush.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,61 @@
{% set testing_mode_timer = firewall.get('testing_mode:flush_after', 60)|int %}

{%- if flush or testing_mode_enabled %}
# IPv6 is missing!
iptables_input_policy_accept:
iptables.set_policy:
- table: filter
- chain: INPUT
- policy: ACCEPT

iptables_input_policy_accept_v6:
iptables.set_policy:
- table: filter
- chain: INPUT
- family: ipv6
- policy: ACCEPT

iptables_output_policy_accept:
iptables.set_policy:
- table: filter
- chain: OUTPUT
- policy: ACCEPT

iptables_output_policy_accept_v6:
iptables.set_policy:
- table: filter
- chain: OUTPUT
- family: ipv6
- policy: ACCEPT

iptables_forward_policy_accept:
iptables.set_policy:
- table: filter
- chain: FORWARD
- policy: ACCEPT

iptables_forward_policy_accept_v6:
iptables.set_policy:
- table: filter
- chain: FORWARD
- family: ipv6
- policy: ACCEPT

iptables_flush:
iptables.flush:
- table: filter
- require:
- iptables: iptables_input_policy_accept
- iptables: iptables_output_policy_accept
- iptables: iptables_forward_policy_accept

iptables_flush_v6:
iptables.flush:
- table: filter
- famile: ipv6
- require:
- iptables: iptables_input_policy_accept_v6
- iptables: iptables_output_policy_accept_v6
- iptables: iptables_forward_policy_accept_v6
{%- endif %}

{%- if testing_mode_enabled %}
Expand All @@ -51,8 +80,27 @@
- order: last
- require:
- iptables: iptables_flush

iptables_flush_v6_testing_mode:
schedule.present:
- function: state.sls_id
- job_args:
- iptables_flush_v6
- iptables.flush
# This is a workaround to mimic "now + x seconds", since Salt schedule just supports ISO8601 time format.
# It generates "now" based on Unix Time, then it add x number of seconds, finally it converts that to ISO8601 time.
- once: "{{ (None|strftime("%s")|int + testing_mode_timer)|strftime("%Y-%m-%dT%H:%M:%S") }}"
- once_fmt: "%Y-%m-%dT%H:%M:%S"
- persist: False
- order: last
- require:
- iptables: iptables_flush_v6
{%- else %}
delete_iptables_flush_testing_mode_job:
schedule.absent:
- name: iptables_flush_testing_mode

delete_iptables_flush_v6_testing_mode_job:
schedule.absent:
- name: iptables_flush_v6_testing_mode
{%- endif %}