|
 |
8a3219 |
From 0f28f2b7b8072bdc2e483d035230ddcb8b00a919 Mon Sep 17 00:00:00 2001
|
|
|
21c891 |
From: Eric Garver <e@erig.me>
|
|
|
21c891 |
Date: Mon, 9 Jul 2018 11:29:33 -0400
|
|
|
21c891 |
Subject: [PATCH] Add cockpit by default to some zones
|
|
|
21c891 |
|
|
|
21c891 |
Fixes: #1581578
|
|
|
21c891 |
---
|
|
|
8a3219 |
config/zones/home.xml | 1 +
|
|
|
8a3219 |
config/zones/internal.xml | 1 +
|
|
|
8a3219 |
config/zones/public.xml | 1 +
|
|
|
8a3219 |
config/zones/work.xml | 1 +
|
|
|
8a3219 |
src/tests/features/service_include.at | 2 +-
|
|
|
8a3219 |
src/tests/firewall-cmd.at | 14 +++++++++++++-
|
|
|
8a3219 |
src/tests/regression/gh366.at | 3 +++
|
|
|
8a3219 |
src/tests/regression/gh453.at | 2 ++
|
|
|
8a3219 |
src/tests/regression/rhbz1514043.at | 2 +-
|
|
|
8a3219 |
9 files changed, 24 insertions(+), 3 deletions(-)
|
|
|
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>
|
|
|
8a3219 |
diff --git a/src/tests/features/service_include.at b/src/tests/features/service_include.at
|
|
|
8a3219 |
index b3a50a84bd88..992c5ef0ba92 100644
|
|
|
8a3219 |
--- a/src/tests/features/service_include.at
|
|
|
8a3219 |
+++ b/src/tests/features/service_include.at
|
|
|
8a3219 |
@@ -90,7 +90,7 @@ FWD_CHECK([--zone=drop --list-services], 0, [dnl
|
|
|
8a3219 |
|
|
|
8a3219 |
])
|
|
|
8a3219 |
FWD_CHECK([--zone=public --list-services], 0, [dnl
|
|
|
8a3219 |
-dhcpv6-client ssh
|
|
|
8a3219 |
+cockpit dhcpv6-client ssh
|
|
|
8a3219 |
])
|
|
|
8a3219 |
FWD_CHECK([-q --permanent --service=my-service-with-include --remove-include=does-not-exist])
|
|
|
8a3219 |
FWD_RELOAD
|
|
|
8a3219 |
diff --git a/src/tests/firewall-cmd.at b/src/tests/firewall-cmd.at
|
|
|
8a3219 |
index efc8f9c50757..6444b4566af5 100644
|
|
|
8a3219 |
--- a/src/tests/firewall-cmd.at
|
|
|
8a3219 |
+++ b/src/tests/firewall-cmd.at
|
|
|
8a3219 |
@@ -1046,6 +1046,7 @@ FWD_START_TEST([rich rules priority])
|
|
|
8a3219 |
chain filter_IN_public_allow {
|
|
|
8a3219 |
tcp dport 22 ct state new,untracked accept
|
|
|
8a3219 |
ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept
|
|
|
8a3219 |
+ tcp dport 9090 ct state new,untracked accept
|
|
|
8a3219 |
tcp dport 1122 ct state new,untracked accept
|
|
|
8a3219 |
tcp dport 3333 ct state new,untracked accept
|
|
|
8a3219 |
tcp dport 4444 ct state new,untracked accept
|
|
|
8a3219 |
@@ -1061,6 +1062,7 @@ FWD_START_TEST([rich rules priority])
|
|
|
8a3219 |
])
|
|
|
8a3219 |
IPTABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl
|
|
|
8a3219 |
ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
+ ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:9090 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:1122 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:3333 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:4444 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
@@ -1075,6 +1077,7 @@ FWD_START_TEST([rich rules priority])
|
|
|
8a3219 |
IP6TABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl
|
|
|
8a3219 |
ACCEPT tcp ::/0 ::/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
ACCEPT udp ::/0 fe80::/64 udp dpt:546 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
+ ACCEPT tcp ::/0 ::/0 tcp dpt:9090 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
ACCEPT tcp ::/0 ::/0 tcp dpt:1122 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
ACCEPT tcp ::/0 ::/0 tcp dpt:3333 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
ACCEPT tcp ::/0 ::/0 tcp dpt:4444 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
@@ -1156,6 +1159,7 @@ FWD_START_TEST([rich rules priority])
|
|
|
8a3219 |
chain filter_IN_public_allow {
|
|
|
8a3219 |
tcp dport 22 ct state new,untracked accept
|
|
|
8a3219 |
ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept
|
|
|
8a3219 |
+ tcp dport 9090 ct state new,untracked accept
|
|
|
8a3219 |
}
|
|
|
8a3219 |
}
|
|
|
8a3219 |
])
|
|
|
8a3219 |
@@ -1259,6 +1263,7 @@ FWD_START_TEST([rich rules priority])
|
|
|
8a3219 |
])
|
|
|
8a3219 |
IPTABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl
|
|
|
8a3219 |
ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
+ ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:9090 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
])
|
|
|
8a3219 |
IPTABLES_LIST_RULES([filter], [FWDI_public_pre], 0, [dnl
|
|
|
8a3219 |
])
|
|
|
8a3219 |
@@ -1293,6 +1298,7 @@ FWD_START_TEST([rich rules priority])
|
|
|
8a3219 |
IP6TABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl
|
|
|
8a3219 |
ACCEPT tcp ::/0 ::/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
ACCEPT udp ::/0 fe80::/64 udp dpt:546 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
+ ACCEPT tcp ::/0 ::/0 tcp dpt:9090 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
])
|
|
|
8a3219 |
IP6TABLES_LIST_RULES([filter], [FWDI_public_pre], 0, [dnl
|
|
|
8a3219 |
])
|
|
|
8a3219 |
@@ -1340,6 +1346,7 @@ FWD_START_TEST([rich rules priority])
|
|
|
8a3219 |
chain filter_IN_public_allow {
|
|
|
8a3219 |
tcp dport 22 ct state new,untracked accept
|
|
|
8a3219 |
ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept
|
|
|
8a3219 |
+ tcp dport 9090 ct state new,untracked accept
|
|
|
8a3219 |
icmp type echo-request accept
|
|
|
8a3219 |
icmpv6 type echo-request accept
|
|
|
8a3219 |
}
|
|
|
8a3219 |
@@ -1380,6 +1387,7 @@ FWD_START_TEST([rich rules priority])
|
|
|
8a3219 |
])
|
|
|
8a3219 |
IPTABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl
|
|
|
8a3219 |
ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
+ ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:9090 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
ACCEPT icmp -- 0.0.0.0/0 0.0.0.0/0 icmptype 8
|
|
|
8a3219 |
])
|
|
|
8a3219 |
IPTABLES_LIST_RULES([filter], [FWDI_public_pre], 0, [dnl
|
|
|
8a3219 |
@@ -1402,6 +1410,7 @@ FWD_START_TEST([rich rules priority])
|
|
|
8a3219 |
IP6TABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl
|
|
|
8a3219 |
ACCEPT tcp ::/0 ::/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
ACCEPT udp ::/0 fe80::/64 udp dpt:546 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
+ ACCEPT tcp ::/0 ::/0 tcp dpt:9090 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
ACCEPT icmpv6 ::/0 ::/0 ipv6-icmptype 128
|
|
|
8a3219 |
])
|
|
|
8a3219 |
IP6TABLES_LIST_RULES([filter], [FWDI_public_pre], 0, [dnl
|
|
|
8a3219 |
@@ -1458,6 +1467,7 @@ FWD_START_TEST([rich rules priority])
|
|
|
8a3219 |
chain filter_IN_public_allow {
|
|
|
8a3219 |
tcp dport 22 ct state new,untracked accept
|
|
|
8a3219 |
ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept
|
|
|
8a3219 |
+ tcp dport 9090 ct state new,untracked accept
|
|
|
8a3219 |
}
|
|
|
8a3219 |
}
|
|
|
8a3219 |
])
|
|
|
8a3219 |
@@ -1495,6 +1505,7 @@ FWD_START_TEST([rich rules priority])
|
|
|
8a3219 |
])
|
|
|
8a3219 |
IPTABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl
|
|
|
8a3219 |
ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
+ ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:9090 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
])
|
|
|
8a3219 |
IPTABLES_LIST_RULES([filter], [IN_public_deny], 0, [dnl
|
|
|
8a3219 |
])
|
|
|
8a3219 |
@@ -1515,6 +1526,7 @@ FWD_START_TEST([rich rules priority])
|
|
|
8a3219 |
IP6TABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl
|
|
|
8a3219 |
ACCEPT tcp ::/0 ::/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
ACCEPT udp ::/0 fe80::/64 udp dpt:546 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
+ ACCEPT tcp ::/0 ::/0 tcp dpt:9090 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
])
|
|
|
8a3219 |
IP6TABLES_LIST_RULES([filter], [IN_public_deny], 0, [dnl
|
|
|
8a3219 |
])
|
|
|
8a3219 |
@@ -1540,7 +1552,7 @@ FWD_START_TEST([rich rules priority])
|
|
|
8a3219 |
icmp-block-inversion: no
|
|
|
8a3219 |
interfaces:
|
|
|
8a3219 |
sources:
|
|
|
8a3219 |
- services: dhcpv6-client ssh
|
|
|
8a3219 |
+ services: cockpit dhcpv6-client ssh
|
|
|
8a3219 |
ports:
|
|
|
8a3219 |
protocols:
|
|
|
8a3219 |
masquerade: no
|
|
|
21c891 |
diff --git a/src/tests/regression/gh366.at b/src/tests/regression/gh366.at
|
|
|
8a3219 |
index 1441a6be53bf..51ff504e6a9d 100644
|
|
|
21c891 |
--- a/src/tests/regression/gh366.at
|
|
|
21c891 |
+++ b/src/tests/regression/gh366.at
|
|
|
21c891 |
@@ -7,6 +7,7 @@ table inet firewalld {
|
|
|
21c891 |
chain filter_IN_public_allow {
|
|
|
21c891 |
tcp dport 22 ct state new,untracked accept
|
|
|
21c891 |
ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept
|
|
|
21c891 |
+tcp dport 9090 ct state new,untracked accept
|
|
|
21c891 |
ip daddr 224.0.0.251 udp dport 5353 ct state new,untracked accept
|
|
|
21c891 |
ip6 daddr ff02::fb udp dport 5353 ct state new,untracked accept
|
|
|
21c891 |
}
|
|
|
21c891 |
@@ -14,11 +15,13 @@ ip6 daddr ff02::fb udp dport 5353 ct state new,untracked accept
|
|
|
8a3219 |
])
|
|
|
21c891 |
IPTABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl
|
|
|
21c891 |
ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
21c891 |
+ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:9090 ctstate NEW,UNTRACKED
|
|
|
21c891 |
ACCEPT udp -- 0.0.0.0/0 224.0.0.251 udp dpt:5353 ctstate NEW,UNTRACKED
|
|
|
21c891 |
])
|
|
|
21c891 |
IP6TABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl
|
|
|
21c891 |
ACCEPT tcp ::/0 ::/0 tcp dpt:22 ctstate NEW,UNTRACKED
|
|
|
21c891 |
ACCEPT udp ::/0 fe80::/64 udp dpt:546 ctstate NEW,UNTRACKED
|
|
|
21c891 |
+ACCEPT tcp ::/0 ::/0 tcp dpt:9090 ctstate NEW,UNTRACKED
|
|
|
21c891 |
ACCEPT udp ::/0 ff02::fb udp dpt:5353 ctstate NEW,UNTRACKED
|
|
|
8a3219 |
])])
|
|
|
21c891 |
|
|
|
8a3219 |
diff --git a/src/tests/regression/gh453.at b/src/tests/regression/gh453.at
|
|
|
8a3219 |
index f57a79dcf9a2..6d820fce840a 100644
|
|
|
8a3219 |
--- a/src/tests/regression/gh453.at
|
|
|
8a3219 |
+++ b/src/tests/regression/gh453.at
|
|
|
8a3219 |
@@ -18,6 +18,7 @@ NFT_LIST_RULES([inet], [filter_IN_public_allow], 0, [dnl
|
|
|
8a3219 |
chain filter_IN_public_allow {
|
|
|
8a3219 |
tcp dport 22 ct state new,untracked accept
|
|
|
8a3219 |
ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept
|
|
|
8a3219 |
+ tcp dport 9090 ct state new,untracked accept
|
|
|
8a3219 |
tcp dport 21 ct helper set "helper-ftp-tcp"
|
|
|
8a3219 |
tcp dport 21 ct state new,untracked accept
|
|
|
8a3219 |
}
|
|
|
8a3219 |
@@ -42,6 +43,7 @@ NFT_LIST_RULES([inet], [filter_IN_public_allow], 0, [dnl
|
|
|
8a3219 |
chain filter_IN_public_allow {
|
|
|
8a3219 |
tcp dport 22 ct state new,untracked accept
|
|
|
8a3219 |
ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept
|
|
|
8a3219 |
+ tcp dport 9090 ct state new,untracked accept
|
|
|
8a3219 |
tcp dport 21 ct helper set "helper-ftp-tcp"
|
|
|
8a3219 |
tcp dport 21 ct state new,untracked accept
|
|
|
8a3219 |
tcp dport 5060 ct helper set "helper-sip-tcp"
|
|
|
21c891 |
diff --git a/src/tests/regression/rhbz1514043.at b/src/tests/regression/rhbz1514043.at
|
|
|
8a3219 |
index deb93a5fac94..88ce4934e5ea 100644
|
|
|
21c891 |
--- a/src/tests/regression/rhbz1514043.at
|
|
|
21c891 |
+++ b/src/tests/regression/rhbz1514043.at
|
|
|
8a3219 |
@@ -5,7 +5,7 @@ FWD_CHECK([-q --set-log-denied=all])
|
|
|
21c891 |
FWD_CHECK([-q --permanent --zone=public --add-service=samba])
|
|
|
21c891 |
FWD_RELOAD
|
|
|
21c891 |
FWD_CHECK([--zone=public --list-all | TRIM | grep ^services], 0, [dnl
|
|
|
21c891 |
-services: dhcpv6-client samba ssh
|
|
|
21c891 |
+services: cockpit dhcpv6-client samba ssh
|
|
|
21c891 |
])
|
|
|
21c891 |
dnl check that log denied actually took effect
|
|
|
21c891 |
m4_if(iptables, FIREWALL_BACKEND, [
|
|
|
21c891 |
--
|
|
|
8a3219 |
2.20.1
|
|
|
21c891 |
|