From 4e35fde7d5892f0e636e09bf2db109f56b270280 Mon Sep 17 00:00:00 2001 From: Knut Anderssen Date: Wed, 25 Oct 2023 11:59:24 +0100 Subject: [PATCH] Fix firewalld zones reader Adapted the zones reader to the new --list-all-zones output introduced by firewalld 2.0.1 version (bsc#1216534) --- .../network/src/lib/y2firewall/firewalld/zone_reader.rb | 4 ++-- .../network/test/y2firewall/firewalld/zone_reader_test.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library/network/src/lib/y2firewall/firewalld/zone_reader.rb b/library/network/src/lib/y2firewall/firewalld/zone_reader.rb index e788e6ef6..1f1aa1987 100644 --- a/library/network/src/lib/y2firewall/firewalld/zone_reader.rb +++ b/library/network/src/lib/y2firewall/firewalld/zone_reader.rb @@ -91,8 +91,8 @@ def parse_zones end def current_zone_from(line) - attribute, _value = line.split(/\s*\(active\)\s*$/) - zone_names.include?(attribute) ? attribute : nil + name, *_status = line.split + zone_names.include?(name) ? name : nil end ATTRIBUTE_MAPPING = { "summary" => "short" }.freeze diff --git a/library/network/test/y2firewall/firewalld/zone_reader_test.rb b/library/network/test/y2firewall/firewalld/zone_reader_test.rb index ebc0641e9..7cea19070 100755 --- a/library/network/test/y2firewall/firewalld/zone_reader_test.rb +++ b/library/network/test/y2firewall/firewalld/zone_reader_test.rb @@ -43,11 +43,11 @@ " rich rules: ", "\t", "", - "public (active)", + "public (default, active)", " summary: Public", - " 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: 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.", " target: default", " icmp-block-inversion: no", " interfaces: eth0 ens3",