|
 |
63f414 |
From 87ecae78c07da6db1faa18504b06345ab3ba51a0 Mon Sep 17 00:00:00 2001
|
|
|
21c891 |
From: Eric Garver <e@erig.me>
|
|
|
21c891 |
Date: Mon, 9 Jul 2018 11:29:33 -0400
|
|
|
63f414 |
Subject: [PATCH 01/22] RHEL only: Add cockpit by default to some zones
|
|
|
21c891 |
|
|
|
21c891 |
Fixes: #1581578
|
|
|
21c891 |
---
|
|
|
63f414 |
config/zones/home.xml | 1 +
|
|
|
63f414 |
config/zones/internal.xml | 1 +
|
|
|
63f414 |
config/zones/public.xml | 1 +
|
|
|
63f414 |
config/zones/work.xml | 1 +
|
|
|
63f414 |
src/tests/functions.at | 19 +++++++++++++++++++
|
|
|
63f414 |
5 files changed, 23 insertions(+)
|
|
|
21c891 |
|
|
|
21c891 |
diff --git a/config/zones/home.xml b/config/zones/home.xml
|
|
|
21c891 |
index 42b29b2f2d50..8aa8afa0e8aa 100644
|
|
|
21c891 |
--- a/config/zones/home.xml
|
|
|
21c891 |
+++ b/config/zones/home.xml
|
|
|
21c891 |
@@ -6,4 +6,5 @@
|
|
|
21c891 |
<service name="mdns"/>
|
|
|
21c891 |
<service name="samba-client"/>
|
|
|
21c891 |
<service name="dhcpv6-client"/>
|
|
|
21c891 |
+ <service name="cockpit"/>
|
|
|
21c891 |
</zone>
|
|
|
21c891 |
diff --git a/config/zones/internal.xml b/config/zones/internal.xml
|
|
|
21c891 |
index e646b48c94e8..40cb7e14424b 100644
|
|
|
21c891 |
--- a/config/zones/internal.xml
|
|
|
21c891 |
+++ b/config/zones/internal.xml
|
|
|
21c891 |
@@ -6,4 +6,5 @@
|
|
|
21c891 |
<service name="mdns"/>
|
|
|
21c891 |
<service name="samba-client"/>
|
|
|
21c891 |
<service name="dhcpv6-client"/>
|
|
|
21c891 |
+ <service name="cockpit"/>
|
|
|
21c891 |
</zone>
|
|
|
21c891 |
diff --git a/config/zones/public.xml b/config/zones/public.xml
|
|
|
21c891 |
index 49795d8c9068..617e131a4895 100644
|
|
|
21c891 |
--- a/config/zones/public.xml
|
|
|
21c891 |
+++ b/config/zones/public.xml
|
|
|
21c891 |
@@ -4,4 +4,5 @@
|
|
|
21c891 |
<description>For use in public areas. You do not trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted.</description>
|
|
|
21c891 |
<service name="ssh"/>
|
|
|
21c891 |
<service name="dhcpv6-client"/>
|
|
|
21c891 |
+ <service name="cockpit"/>
|
|
|
21c891 |
</zone>
|
|
|
21c891 |
diff --git a/config/zones/work.xml b/config/zones/work.xml
|
|
|
21c891 |
index 6ea5550a40bd..9609ee6f65c2 100644
|
|
|
21c891 |
--- a/config/zones/work.xml
|
|
|
21c891 |
+++ b/config/zones/work.xml
|
|
|
21c891 |
@@ -4,4 +4,5 @@
|
|
|
21c891 |
<description>For use in work areas. You mostly trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted.</description>
|
|
|
21c891 |
<service name="ssh"/>
|
|
|
21c891 |
<service name="dhcpv6-client"/>
|
|
|
21c891 |
+ <service name="cockpit"/>
|
|
|
21c891 |
</zone>
|
|
|
63f414 |
diff --git a/src/tests/functions.at b/src/tests/functions.at
|
|
|
63f414 |
index 582fdcc19314..6b1263b178dc 100644
|
|
|
63f414 |
--- a/src/tests/functions.at
|
|
|
63f414 |
+++ b/src/tests/functions.at
|
|
|
63f414 |
@@ -105,6 +105,13 @@ m4_define([FWD_START_TEST], [
|
|
|
8072fb |
|
|
|
63f414 |
m4_ifdef([TESTING_FIREWALL_OFFLINE_CMD], [
|
|
|
63f414 |
AT_KEYWORDS(offline)
|
|
|
63f414 |
+ dnl cockpit is added by default downstream, but upstream tests don't expect
|
|
|
63f414 |
+ dnl it. Simply remove it at the start of every test.
|
|
|
63f414 |
+ dnl
|
|
|
63f414 |
+ FWD_OFFLINE_CHECK([--zone home --remove-service-from-zone cockpit], 0, [ignore])
|
|
|
63f414 |
+ FWD_OFFLINE_CHECK([--zone internal --remove-service-from-zone cockpit], 0, [ignore])
|
|
|
63f414 |
+ FWD_OFFLINE_CHECK([--zone public --remove-service-from-zone cockpit], 0, [ignore])
|
|
|
63f414 |
+ FWD_OFFLINE_CHECK([--zone work --remove-service-from-zone cockpit], 0, [ignore])
|
|
|
63f414 |
], [
|
|
|
63f414 |
m4_define_default([FIREWALL_BACKEND], [nftables])
|
|
|
8072fb |
|
|
|
63f414 |
@@ -226,6 +233,18 @@ m4_define([FWD_START_TEST], [
|
|
|
63f414 |
])
|
|
|
8072fb |
|
|
|
63f414 |
FWD_START_FIREWALLD
|
|
|
63f414 |
+
|
|
|
63f414 |
+ dnl cockpit is added by default downstream, but upstream tests don't expect
|
|
|
63f414 |
+ dnl it. Simply remove it at the start of every test.
|
|
|
63f414 |
+ dnl
|
|
|
63f414 |
+ FWD_CHECK([--permanent --zone home --remove-service cockpit], 0, [ignore])
|
|
|
63f414 |
+ FWD_CHECK([ --zone home --remove-service cockpit], 0, [ignore])
|
|
|
63f414 |
+ FWD_CHECK([--permanent --zone internal --remove-service cockpit], 0, [ignore])
|
|
|
63f414 |
+ FWD_CHECK([ --zone internal --remove-service cockpit], 0, [ignore])
|
|
|
63f414 |
+ FWD_CHECK([--permanent --zone public --remove-service cockpit], 0, [ignore])
|
|
|
63f414 |
+ FWD_CHECK([ --zone public --remove-service cockpit], 0, [ignore])
|
|
|
63f414 |
+ FWD_CHECK([--permanent --zone work --remove-service cockpit], 0, [ignore])
|
|
|
63f414 |
+ FWD_CHECK([ --zone work --remove-service cockpit], 0, [ignore])
|
|
|
63f414 |
])
|
|
|
21c891 |
])
|
|
|
40251c |
|
|
|
21c891 |
--
|
|
|
63f414 |
2.27.0
|
|
|
21c891 |
|