|
 |
1ae9b3 |
From 729936737ae3588d5b79c9f00760a2228586338b Mon Sep 17 00:00:00 2001
|
|
|
1ae9b3 |
From: Eric Garver <eric@garver.life>
|
|
|
1ae9b3 |
Date: Tue, 12 May 2020 08:25:07 -0400
|
|
|
1ae9b3 |
Subject: [PATCH 24/45] test(dbus): better way to check IPv6_rpfilter expected
|
|
|
1ae9b3 |
value
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
(cherry picked from commit 42e349f57a41305354871ca0c0d08fcf800a2fe3)
|
|
|
1ae9b3 |
(cherry picked from commit a79695be7243802b49c5bdb131c231b1ef8a9350)
|
|
|
1ae9b3 |
---
|
|
|
1ae9b3 |
src/tests/dbus/firewalld.conf.at | 24 +++++++-----------------
|
|
|
1ae9b3 |
1 file changed, 7 insertions(+), 17 deletions(-)
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
diff --git a/src/tests/dbus/firewalld.conf.at b/src/tests/dbus/firewalld.conf.at
|
|
|
1ae9b3 |
index 4eefa3286f9f..1c957957b3da 100644
|
|
|
1ae9b3 |
--- a/src/tests/dbus/firewalld.conf.at
|
|
|
1ae9b3 |
+++ b/src/tests/dbus/firewalld.conf.at
|
|
|
1ae9b3 |
@@ -1,8 +1,13 @@
|
|
|
1ae9b3 |
FWD_START_TEST([firewalld.conf])
|
|
|
1ae9b3 |
AT_KEYWORDS(dbus)
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
-dnl Verify defaults over dbus. Should be inline with default firewalld.conf.
|
|
|
1ae9b3 |
IF_HOST_SUPPORTS_NFT_FIB([
|
|
|
1ae9b3 |
+ EXPECTED_IPV6_RPFILTER_VALUE=yes
|
|
|
1ae9b3 |
+], [
|
|
|
1ae9b3 |
+ EXPECTED_IPV6_RPFILTER_VALUE=no
|
|
|
1ae9b3 |
+])
|
|
|
1ae9b3 |
+
|
|
|
1ae9b3 |
+dnl Verify defaults over dbus. Should be inline with default firewalld.conf.
|
|
|
1ae9b3 |
DBUS_GETALL([config], [config], 0, [dnl
|
|
|
1ae9b3 |
string "AllowZoneDrifting" : variant string "yes"
|
|
|
1ae9b3 |
string "AutomaticHelpers" : variant string "no"
|
|
|
1ae9b3 |
@@ -10,28 +15,13 @@ string "CleanupOnExit" : variant string "no"
|
|
|
1ae9b3 |
string "DefaultZone" : variant string "public"
|
|
|
1ae9b3 |
string "FirewallBackend" : variant string "nftables"
|
|
|
1ae9b3 |
string "FlushAllOnReload" : variant string "yes"
|
|
|
1ae9b3 |
-string "IPv6_rpfilter" : variant string "yes"
|
|
|
1ae9b3 |
-string "IndividualCalls" : variant string "no"
|
|
|
1ae9b3 |
-string "Lockdown" : variant string "no"
|
|
|
1ae9b3 |
-string "LogDenied" : variant string "off"
|
|
|
1ae9b3 |
-string "MinimalMark" : variant int32 100
|
|
|
1ae9b3 |
-string "RFC3964_IPv4" : variant string "yes"
|
|
|
1ae9b3 |
-])], [
|
|
|
1ae9b3 |
-DBUS_GETALL([config], [config], 0, [dnl
|
|
|
1ae9b3 |
-string "AllowZoneDrifting" : variant string "yes"
|
|
|
1ae9b3 |
-string "AutomaticHelpers" : variant string "no"
|
|
|
1ae9b3 |
-string "CleanupOnExit" : variant string "no"
|
|
|
1ae9b3 |
-string "DefaultZone" : variant string "public"
|
|
|
1ae9b3 |
-string "FirewallBackend" : variant string "nftables"
|
|
|
1ae9b3 |
-string "FlushAllOnReload" : variant string "yes"
|
|
|
1ae9b3 |
-string "IPv6_rpfilter" : variant string "no"
|
|
|
1ae9b3 |
+string "IPv6_rpfilter" : variant string m4_escape(["${EXPECTED_IPV6_RPFILTER_VALUE}"])
|
|
|
1ae9b3 |
string "IndividualCalls" : variant string "no"
|
|
|
1ae9b3 |
string "Lockdown" : variant string "no"
|
|
|
1ae9b3 |
string "LogDenied" : variant string "off"
|
|
|
1ae9b3 |
string "MinimalMark" : variant int32 100
|
|
|
1ae9b3 |
string "RFC3964_IPv4" : variant string "yes"
|
|
|
1ae9b3 |
])
|
|
|
1ae9b3 |
-])
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
m4_define([_helper], [
|
|
|
1ae9b3 |
DBUS_SET([config], [config], [string:"$1" $2], 0, ignore)
|
|
|
1ae9b3 |
--
|
|
|
1ae9b3 |
2.27.0
|
|
|
1ae9b3 |
|