|
 |
24f428 |
From b276f34f53906b4fbf7ab6111332e2165a5c3f15 Mon Sep 17 00:00:00 2001
|
|
|
24f428 |
From: Eric Garver <e@erig.me>
|
|
|
24f428 |
Date: Wed, 5 Dec 2018 09:38:26 -0500
|
|
|
24f428 |
Subject: [PATCH 13/23] tests/firewall-cmd: remove redundant checks for
|
|
|
24f428 |
TESTING_FIREWALL_OFFLINE_CMD
|
|
|
24f428 |
|
|
|
24f428 |
These checks are now part of the list macros.
|
|
|
24f428 |
|
|
|
24f428 |
(cherry picked from commit 158e5db21e99c48bdd4992de46cc92162d3ba626)
|
|
|
24f428 |
---
|
|
|
24f428 |
src/tests/firewall-cmd.at | 50 ++++++++++++++++-----------------------
|
|
|
24f428 |
1 file changed, 21 insertions(+), 29 deletions(-)
|
|
|
24f428 |
|
|
|
24f428 |
diff --git a/src/tests/firewall-cmd.at b/src/tests/firewall-cmd.at
|
|
|
24f428 |
index 82ffa9f52b47..3cb3e8a96ca7 100644
|
|
|
24f428 |
--- a/src/tests/firewall-cmd.at
|
|
|
24f428 |
+++ b/src/tests/firewall-cmd.at
|
|
|
24f428 |
@@ -731,36 +731,30 @@ FWD_START_TEST([direct ebtables])
|
|
|
24f428 |
FWD_CHECK([--direct --get-chains eb filter | grep mychain], 0, ignore)
|
|
|
24f428 |
FWD_CHECK([--direct --add-rule eb filter mychain 1 -p 0x86dd -j DROP], 0, ignore)
|
|
|
24f428 |
FWD_CHECK([--direct --add-rule eb filter mychain 999 -p IPv6 --ip6-protocol UDP --ip6-source-port ! 12345 -j DROP], 0, ignore)
|
|
|
24f428 |
-m4_ifdef([TESTING_FIREWALL_OFFLINE_CMD], [], [
|
|
|
24f428 |
EBTABLES_LIST_RULES([filter], [mychain], 0, [dnl
|
|
|
24f428 |
--p IPv6 -j DROP
|
|
|
24f428 |
--p IPv6 --ip6-proto udp --ip6-sport ! 12345 -j DROP
|
|
|
24f428 |
--j RETURN
|
|
|
24f428 |
-])
|
|
|
24f428 |
-])
|
|
|
24f428 |
+ -p IPv6 -j DROP
|
|
|
24f428 |
+ -p IPv6 --ip6-proto udp --ip6-sport ! 12345 -j DROP
|
|
|
24f428 |
+ -j RETURN
|
|
|
24f428 |
+ ])
|
|
|
24f428 |
FWD_CHECK([--direct --remove-rule eb filter mychain 1 -p 0x86dd -j DROP], 0, ignore)
|
|
|
24f428 |
-m4_ifdef([TESTING_FIREWALL_OFFLINE_CMD], [], [
|
|
|
24f428 |
EBTABLES_LIST_RULES([filter], [mychain], 0, [dnl
|
|
|
24f428 |
--p IPv6 --ip6-proto udp --ip6-sport ! 12345 -j DROP
|
|
|
24f428 |
--j RETURN
|
|
|
24f428 |
-])
|
|
|
24f428 |
-])
|
|
|
24f428 |
+ -p IPv6 --ip6-proto udp --ip6-sport ! 12345 -j DROP
|
|
|
24f428 |
+ -j RETURN
|
|
|
24f428 |
+ ])
|
|
|
24f428 |
|
|
|
24f428 |
FWD_CHECK([--direct --add-rule eb filter INPUT 1 -p 0x86dd -j DROP], 0, ignore)
|
|
|
24f428 |
FWD_CHECK([--direct --add-rule eb filter INPUT_direct 1 -p 0x86dd -j DROP], 0, ignore)
|
|
|
24f428 |
-m4_ifdef([TESTING_FIREWALL_OFFLINE_CMD], [], [dnl
|
|
|
24f428 |
-m4_if(nftables, FIREWALL_BACKEND, [dnl
|
|
|
24f428 |
- EBTABLES_LIST_RULES([filter], [INPUT], 0, [dnl
|
|
|
24f428 |
--p IPv6 -j DROP
|
|
|
24f428 |
--p IPv6 -j DROP
|
|
|
24f428 |
-])], [dnl
|
|
|
24f428 |
- EBTABLES_LIST_RULES([filter], [INPUT_direct], 0, [dnl
|
|
|
24f428 |
--p IPv6 -j DROP
|
|
|
24f428 |
--p IPv6 -j DROP
|
|
|
24f428 |
--j RETURN
|
|
|
24f428 |
-])
|
|
|
24f428 |
-])
|
|
|
24f428 |
-])
|
|
|
24f428 |
+ m4_if(nftables, FIREWALL_BACKEND, [dnl
|
|
|
24f428 |
+ EBTABLES_LIST_RULES([filter], [INPUT], 0, [dnl
|
|
|
24f428 |
+ -p IPv6 -j DROP
|
|
|
24f428 |
+ -p IPv6 -j DROP
|
|
|
24f428 |
+ ])], [dnl
|
|
|
24f428 |
+ EBTABLES_LIST_RULES([filter], [INPUT_direct], 0, [dnl
|
|
|
24f428 |
+ -p IPv6 -j DROP
|
|
|
24f428 |
+ -p IPv6 -j DROP
|
|
|
24f428 |
+ -j RETURN
|
|
|
24f428 |
+ ])
|
|
|
24f428 |
+ ])
|
|
|
24f428 |
|
|
|
24f428 |
FWD_CHECK([--direct --remove-rules eb filter INPUT], 0, ignore)
|
|
|
24f428 |
FWD_CHECK([--direct --remove-rules eb filter mychain], 0, ignore)
|
|
|
24f428 |
@@ -769,12 +763,10 @@ m4_if(nftables, FIREWALL_BACKEND, [dnl
|
|
|
24f428 |
FWD_CHECK([--permanent --direct --get-chains eb filter | grep mychain], 0, ignore)
|
|
|
24f428 |
FWD_CHECK([--permanent --direct --add-rule eb filter mychain 1 -p 0x86dd -j DROP], 0, ignore)
|
|
|
24f428 |
FWD_RELOAD
|
|
|
24f428 |
-m4_ifdef([TESTING_FIREWALL_OFFLINE_CMD], [], [
|
|
|
24f428 |
EBTABLES_LIST_RULES([filter], [mychain], 0, [dnl
|
|
|
24f428 |
--p IPv6 -j DROP
|
|
|
24f428 |
--j RETURN
|
|
|
24f428 |
-])
|
|
|
24f428 |
-])
|
|
|
24f428 |
+ -p IPv6 -j DROP
|
|
|
24f428 |
+ -j RETURN
|
|
|
24f428 |
+ ])
|
|
|
24f428 |
FWD_END_TEST
|
|
|
24f428 |
|
|
|
24f428 |
FWD_START_TEST([lockdown])
|
|
|
24f428 |
--
|
|
|
24f428 |
2.20.1
|
|
|
24f428 |
|