From 742ed8613bff7f6ecb78a58ceca02c308af6786e Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Mon, 9 Jul 2018 11:29:33 -0400 Subject: [PATCH] Add cockpit by default to some zones Fixes: #1581578 --- config/zones/home.xml | 1 + config/zones/internal.xml | 1 + config/zones/public.xml | 1 + config/zones/work.xml | 1 + src/tests/regression/gh366.at | 3 +++ src/tests/regression/rhbz1514043.at | 2 +- 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/zones/home.xml b/config/zones/home.xml index 42b29b2f2d50..8aa8afa0e8aa 100644 --- a/config/zones/home.xml +++ b/config/zones/home.xml @@ -6,4 +6,5 @@ + diff --git a/config/zones/internal.xml b/config/zones/internal.xml index e646b48c94e8..40cb7e14424b 100644 --- a/config/zones/internal.xml +++ b/config/zones/internal.xml @@ -6,4 +6,5 @@ + diff --git a/config/zones/public.xml b/config/zones/public.xml index 49795d8c9068..617e131a4895 100644 --- a/config/zones/public.xml +++ b/config/zones/public.xml @@ -4,4 +4,5 @@ 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. + diff --git a/config/zones/work.xml b/config/zones/work.xml index 6ea5550a40bd..9609ee6f65c2 100644 --- a/config/zones/work.xml +++ b/config/zones/work.xml @@ -4,4 +4,5 @@ For use in work areas. You mostly trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted. + diff --git a/src/tests/regression/gh366.at b/src/tests/regression/gh366.at index dd6963f9ac3a..6347f6650525 100644 --- a/src/tests/regression/gh366.at +++ b/src/tests/regression/gh366.at @@ -7,6 +7,7 @@ table inet firewalld { chain filter_IN_public_allow { tcp dport 22 ct state new,untracked accept ip6 daddr fe80::/64 udp dport 546 ct state new,untracked accept +tcp dport 9090 ct state new,untracked accept ip daddr 224.0.0.251 udp dport 5353 ct state new,untracked accept ip6 daddr ff02::fb udp dport 5353 ct state new,untracked accept } @@ -14,11 +15,13 @@ ip6 daddr ff02::fb udp dport 5353 ct state new,untracked accept ])], [ IPTABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:22 ctstate NEW,UNTRACKED +ACCEPT tcp -- 0.0.0.0/0 0.0.0.0/0 tcp dpt:9090 ctstate NEW,UNTRACKED ACCEPT udp -- 0.0.0.0/0 224.0.0.251 udp dpt:5353 ctstate NEW,UNTRACKED ]) IP6TABLES_LIST_RULES([filter], [IN_public_allow], 0, [dnl ACCEPT tcp ::/0 ::/0 tcp dpt:22 ctstate NEW,UNTRACKED ACCEPT udp ::/0 fe80::/64 udp dpt:546 ctstate NEW,UNTRACKED +ACCEPT tcp ::/0 ::/0 tcp dpt:9090 ctstate NEW,UNTRACKED ACCEPT udp ::/0 ff02::fb udp dpt:5353 ctstate NEW,UNTRACKED ])])]) diff --git a/src/tests/regression/rhbz1514043.at b/src/tests/regression/rhbz1514043.at index a7368dbd9eeb..36ee0050141d 100644 --- a/src/tests/regression/rhbz1514043.at +++ b/src/tests/regression/rhbz1514043.at @@ -3,7 +3,7 @@ FWD_CHECK([-q --set-log-denied=all]) FWD_CHECK([-q --permanent --zone=public --add-service=samba]) FWD_RELOAD FWD_CHECK([--zone=public --list-all | TRIM | grep ^services], 0, [dnl -services: dhcpv6-client samba ssh +services: cockpit dhcpv6-client samba ssh ]) dnl check that log denied actually took effect m4_if(iptables, FIREWALL_BACKEND, [ -- 2.18.0