|
 |
ea8ea4 |
From 2c1a48c8582999fca128ae1294642adb23744a2b Mon Sep 17 00:00:00 2001
|
|
|
ea8ea4 |
From: Eric Garver <eric@garver.life>
|
|
|
ea8ea4 |
Date: Wed, 29 Jan 2020 10:56:06 -0500
|
|
|
ea8ea4 |
Subject: [PATCH 143/146] chore: test: retab some test cases
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
Replace leading tabs with spaces.
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
(cherry picked from commit 890d8a60893a0c3975b792bcbd3a6c65419a8e8c)
|
|
|
ea8ea4 |
(cherry picked from commit 2fd061c833a6d9836a5062ec79898bd1ca6d97cd)
|
|
|
ea8ea4 |
---
|
|
|
ea8ea4 |
src/tests/features/helpers_custom.at | 30 ++++++-------
|
|
|
ea8ea4 |
src/tests/regression/gh453.at | 64 ++++++++++++++--------------
|
|
|
ea8ea4 |
src/tests/regression/rhbz1506742.at | 2 +-
|
|
|
ea8ea4 |
src/tests/regression/rhbz1734765.at | 28 ++++++------
|
|
|
ea8ea4 |
4 files changed, 62 insertions(+), 62 deletions(-)
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
diff --git a/src/tests/features/helpers_custom.at b/src/tests/features/helpers_custom.at
|
|
|
ea8ea4 |
index fd59d06ba4d1..06464f7b5b44 100644
|
|
|
ea8ea4 |
--- a/src/tests/features/helpers_custom.at
|
|
|
ea8ea4 |
+++ b/src/tests/features/helpers_custom.at
|
|
|
ea8ea4 |
@@ -20,29 +20,29 @@ dnl default now-a-days.
|
|
|
ea8ea4 |
AT_SKIP_IF([NS_CMD([sh -c 'test "$(sysctl -n net.netfilter.nf_conntrack_helper)" -eq "1"'])])
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
NFT_LIST_RULES([inet], [filter_IN_public_allow], 0, [dnl
|
|
|
ea8ea4 |
- table inet firewalld {
|
|
|
ea8ea4 |
- chain filter_IN_public_allow {
|
|
|
ea8ea4 |
- tcp dport 22 ct state new,untracked accept
|
|
|
ea8ea4 |
- ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept
|
|
|
ea8ea4 |
- tcp dport 2121 ct helper set "helper-ftptest-tcp"
|
|
|
ea8ea4 |
- tcp dport 2121 ct state new,untracked accept
|
|
|
ea8ea4 |
- }
|
|
|
ea8ea4 |
- }
|
|
|
ea8ea4 |
+ table inet firewalld {
|
|
|
ea8ea4 |
+ chain filter_IN_public_allow {
|
|
|
ea8ea4 |
+ tcp dport 22 ct state new,untracked accept
|
|
|
ea8ea4 |
+ ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept
|
|
|
ea8ea4 |
+ tcp dport 2121 ct helper set "helper-ftptest-tcp"
|
|
|
ea8ea4 |
+ tcp dport 2121 ct state new,untracked accept
|
|
|
ea8ea4 |
+ }
|
|
|
ea8ea4 |
+ }
|
|
|
ea8ea4 |
])
|
|
|
ea8ea4 |
IPTABLES_LIST_RULES([raw], [PRE_public_allow], 0, [dnl
|
|
|
ea8ea4 |
- CT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:2121 CT helper ftp
|
|
|
ea8ea4 |
+ CT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:2121 CT helper ftp
|
|
|
ea8ea4 |
])
|
|
|
ea8ea4 |
IPTABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl
|
|
|
ea8ea4 |
- ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
ea8ea4 |
- ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:2121 ctstate NEW,UNTRACKED
|
|
|
ea8ea4 |
+ ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
ea8ea4 |
+ ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:2121 ctstate NEW,UNTRACKED
|
|
|
ea8ea4 |
])
|
|
|
ea8ea4 |
IP6TABLES_LIST_RULES([raw], [PRE_public_allow], 0, [dnl
|
|
|
ea8ea4 |
- CT tcp ::/0 ::/0 tcp dpt:2121 CT helper ftp
|
|
|
ea8ea4 |
+ CT tcp ::/0 ::/0 tcp dpt:2121 CT helper ftp
|
|
|
ea8ea4 |
])
|
|
|
ea8ea4 |
IP6TABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl
|
|
|
ea8ea4 |
- ACCEPT tcp ::/0 ::/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
ea8ea4 |
- ACCEPT udp ::/0 fe80::/64 udp dpt:546 ctstate NEW,UNTRACKED
|
|
|
ea8ea4 |
- ACCEPT tcp ::/0 ::/0 tcp dpt:2121 ctstate NEW,UNTRACKED
|
|
|
ea8ea4 |
+ ACCEPT tcp ::/0 ::/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
ea8ea4 |
+ ACCEPT udp ::/0 fe80::/64 udp dpt:546 ctstate NEW,UNTRACKED
|
|
|
ea8ea4 |
+ ACCEPT tcp ::/0 ::/0 tcp dpt:2121 ctstate NEW,UNTRACKED
|
|
|
ea8ea4 |
])
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
FWD_END_TEST
|
|
|
ea8ea4 |
diff --git a/src/tests/regression/gh453.at b/src/tests/regression/gh453.at
|
|
|
ea8ea4 |
index f57a79dcf9a2..36a6fce5f22a 100644
|
|
|
ea8ea4 |
--- a/src/tests/regression/gh453.at
|
|
|
ea8ea4 |
+++ b/src/tests/regression/gh453.at
|
|
|
ea8ea4 |
@@ -8,48 +8,48 @@ FWD_CHECK([-q --set-automatic-helpers=no])
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
FWD_CHECK([-q --add-service=ftp])
|
|
|
ea8ea4 |
NS_CHECK([nft list ruleset | TRIM_WHITESPACE |grep -A3 "ct helper helper-ftp-tcp"], 0, [m4_strip([dnl
|
|
|
ea8ea4 |
- ct helper helper-ftp-tcp {
|
|
|
ea8ea4 |
- type "ftp" protocol tcp
|
|
|
ea8ea4 |
- l3proto inet
|
|
|
ea8ea4 |
- }
|
|
|
ea8ea4 |
+ ct helper helper-ftp-tcp {
|
|
|
ea8ea4 |
+ type "ftp" protocol tcp
|
|
|
ea8ea4 |
+ l3proto inet
|
|
|
ea8ea4 |
+ }
|
|
|
ea8ea4 |
])])
|
|
|
ea8ea4 |
NFT_LIST_RULES([inet], [filter_IN_public_allow], 0, [dnl
|
|
|
ea8ea4 |
- table inet firewalld {
|
|
|
ea8ea4 |
- chain filter_IN_public_allow {
|
|
|
ea8ea4 |
- tcp dport 22 ct state new,untracked accept
|
|
|
ea8ea4 |
- ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept
|
|
|
ea8ea4 |
- tcp dport 21 ct helper set "helper-ftp-tcp"
|
|
|
ea8ea4 |
- tcp dport 21 ct state new,untracked accept
|
|
|
ea8ea4 |
- }
|
|
|
ea8ea4 |
- }
|
|
|
ea8ea4 |
+ table inet firewalld {
|
|
|
ea8ea4 |
+ chain filter_IN_public_allow {
|
|
|
ea8ea4 |
+ tcp dport 22 ct state new,untracked accept
|
|
|
ea8ea4 |
+ ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept
|
|
|
ea8ea4 |
+ tcp dport 21 ct helper set "helper-ftp-tcp"
|
|
|
ea8ea4 |
+ tcp dport 21 ct state new,untracked accept
|
|
|
ea8ea4 |
+ }
|
|
|
ea8ea4 |
+ }
|
|
|
ea8ea4 |
])
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
FWD_CHECK([-q --add-service=sip])
|
|
|
ea8ea4 |
NS_CHECK([nft list ruleset | TRIM_WHITESPACE |grep -A3 "ct helper helper-sip-tcp"], 0, [m4_strip([dnl
|
|
|
ea8ea4 |
- ct helper helper-sip-tcp {
|
|
|
ea8ea4 |
- type "sip" protocol tcp
|
|
|
ea8ea4 |
- l3proto inet
|
|
|
ea8ea4 |
- }
|
|
|
ea8ea4 |
+ ct helper helper-sip-tcp {
|
|
|
ea8ea4 |
+ type "sip" protocol tcp
|
|
|
ea8ea4 |
+ l3proto inet
|
|
|
ea8ea4 |
+ }
|
|
|
ea8ea4 |
])])
|
|
|
ea8ea4 |
NS_CHECK([nft list ruleset | TRIM_WHITESPACE |grep -A3 "ct helper helper-sip-udp"], 0, [m4_strip([dnl
|
|
|
ea8ea4 |
- ct helper helper-sip-udp {
|
|
|
ea8ea4 |
- type "sip" protocol udp
|
|
|
ea8ea4 |
- l3proto inet
|
|
|
ea8ea4 |
- }
|
|
|
ea8ea4 |
+ ct helper helper-sip-udp {
|
|
|
ea8ea4 |
+ type "sip" protocol udp
|
|
|
ea8ea4 |
+ l3proto inet
|
|
|
ea8ea4 |
+ }
|
|
|
ea8ea4 |
])])
|
|
|
ea8ea4 |
NFT_LIST_RULES([inet], [filter_IN_public_allow], 0, [dnl
|
|
|
ea8ea4 |
- table inet firewalld {
|
|
|
ea8ea4 |
- chain filter_IN_public_allow {
|
|
|
ea8ea4 |
- tcp dport 22 ct state new,untracked accept
|
|
|
ea8ea4 |
- ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept
|
|
|
ea8ea4 |
- tcp dport 21 ct helper set "helper-ftp-tcp"
|
|
|
ea8ea4 |
- tcp dport 21 ct state new,untracked accept
|
|
|
ea8ea4 |
- tcp dport 5060 ct helper set "helper-sip-tcp"
|
|
|
ea8ea4 |
- udp dport 5060 ct helper set "helper-sip-udp"
|
|
|
ea8ea4 |
- tcp dport 5060 ct state new,untracked accept
|
|
|
ea8ea4 |
- udp dport 5060 ct state new,untracked accept
|
|
|
ea8ea4 |
- }
|
|
|
ea8ea4 |
- }
|
|
|
ea8ea4 |
+ table inet firewalld {
|
|
|
ea8ea4 |
+ chain filter_IN_public_allow {
|
|
|
ea8ea4 |
+ tcp dport 22 ct state new,untracked accept
|
|
|
ea8ea4 |
+ ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept
|
|
|
ea8ea4 |
+ tcp dport 21 ct helper set "helper-ftp-tcp"
|
|
|
ea8ea4 |
+ tcp dport 21 ct state new,untracked accept
|
|
|
ea8ea4 |
+ tcp dport 5060 ct helper set "helper-sip-tcp"
|
|
|
ea8ea4 |
+ udp dport 5060 ct helper set "helper-sip-udp"
|
|
|
ea8ea4 |
+ tcp dport 5060 ct state new,untracked accept
|
|
|
ea8ea4 |
+ udp dport 5060 ct state new,untracked accept
|
|
|
ea8ea4 |
+ }
|
|
|
ea8ea4 |
+ }
|
|
|
ea8ea4 |
])
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
FWD_END_TEST
|
|
|
ea8ea4 |
diff --git a/src/tests/regression/rhbz1506742.at b/src/tests/regression/rhbz1506742.at
|
|
|
ea8ea4 |
index 1e5d34995add..0e74bfb1305c 100644
|
|
|
ea8ea4 |
--- a/src/tests/regression/rhbz1506742.at
|
|
|
ea8ea4 |
+++ b/src/tests/regression/rhbz1506742.at
|
|
|
ea8ea4 |
@@ -18,4 +18,4 @@ FWD_CHECK([-q --ipset=foobar --query-entry=1.2.3.4], 32, ignore, ignore)
|
|
|
ea8ea4 |
FWD_CHECK([-q --ipset=foobar --remove-entries-from-file=foobar_entries.txt])
|
|
|
ea8ea4 |
FWD_END_TEST([-e '/Error: IPSET_WITH_TIMEOUT/d' dnl
|
|
|
ea8ea4 |
-e '/ERROR: IPSET_WITH_TIMEOUT/d' dnl
|
|
|
ea8ea4 |
- -e '/WARNING: NOT_ENABLED/d'])
|
|
|
ea8ea4 |
+ -e '/WARNING: NOT_ENABLED/d'])
|
|
|
ea8ea4 |
diff --git a/src/tests/regression/rhbz1734765.at b/src/tests/regression/rhbz1734765.at
|
|
|
ea8ea4 |
index 60cd18a6a6ea..5590ab5970da 100644
|
|
|
ea8ea4 |
--- a/src/tests/regression/rhbz1734765.at
|
|
|
ea8ea4 |
+++ b/src/tests/regression/rhbz1734765.at
|
|
|
ea8ea4 |
@@ -44,22 +44,22 @@ FWD_CHECK([-q --permanent --zone=trusted --add-interface=foobar1])
|
|
|
ea8ea4 |
FWD_RELOAD
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
NFT_LIST_SET([ipsetv4], 0, [dnl
|
|
|
ea8ea4 |
- table inet firewalld {
|
|
|
ea8ea4 |
- set ipsetv4 {
|
|
|
ea8ea4 |
- type ipv4_addr
|
|
|
ea8ea4 |
- flags interval
|
|
|
ea8ea4 |
- elements = { 192.0.2.12 }
|
|
|
ea8ea4 |
- }
|
|
|
ea8ea4 |
- }
|
|
|
ea8ea4 |
+ table inet firewalld {
|
|
|
ea8ea4 |
+ set ipsetv4 {
|
|
|
ea8ea4 |
+ type ipv4_addr
|
|
|
ea8ea4 |
+ flags interval
|
|
|
ea8ea4 |
+ elements = { 192.0.2.12 }
|
|
|
ea8ea4 |
+ }
|
|
|
ea8ea4 |
+ }
|
|
|
ea8ea4 |
])
|
|
|
ea8ea4 |
NFT_LIST_SET([ipsetv6], 0, [dnl
|
|
|
ea8ea4 |
- table inet firewalld {
|
|
|
ea8ea4 |
- set ipsetv6 {
|
|
|
ea8ea4 |
- type ipv6_addr
|
|
|
ea8ea4 |
- flags interval
|
|
|
ea8ea4 |
- elements = { ::2 }
|
|
|
ea8ea4 |
- }
|
|
|
ea8ea4 |
- }
|
|
|
ea8ea4 |
+ table inet firewalld {
|
|
|
ea8ea4 |
+ set ipsetv6 {
|
|
|
ea8ea4 |
+ type ipv6_addr
|
|
|
ea8ea4 |
+ flags interval
|
|
|
ea8ea4 |
+ elements = { ::2 }
|
|
|
ea8ea4 |
+ }
|
|
|
ea8ea4 |
+ }
|
|
|
ea8ea4 |
])
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
FWD_CHECK([-q --zone=foobar_010 --add-source="10.10.10.10"])
|
|
|
ea8ea4 |
--
|
|
|
ea8ea4 |
2.23.0
|
|
|
ea8ea4 |
|