Merge 9f71c74 into 78c1beb

package/yast2-firewall.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 10 12:53:49 UTC 2019 - Josef Reidinger <jreidinger@suse.com>
+
+- Ensure that custom zones use unique name (fate#324662)
+- Explicitly mention that masquerade is IPv4 only (fate#324662)
+- 4.1.6
+
 -------------------------------------------------------------------
 Tue Jan  8 13:22:25 CET 2019 - schubi@suse.de
 

package/yast2-firewall.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-firewall
-Version:        4.1.5
+Version:        4.1.6
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/lib/y2firewall/dialogs/zone.rb

@@ -29,10 +29,13 @@ class Zone < CWM::Popup
       # @param zone [Y2Firewall::Firewalld::Zone] holder for configuration or
       #   existing zone
       # @param new_zone [Boolean] if it creates new zone or edit existing
-      def initialize(zone, new_zone = false)
+      # @param existing_names [Array<String>] names have to be unique, so pass existing ones
+      #   which cannot be used.
+      def initialize(zone, new_zone: false, existing_names: [])
         textdomain "firewall"
         @zone = zone
         @new_zone = new_zone
+        @existing_names = existing_names
       end
 
       def title
@@ -43,7 +46,7 @@ def contents
         MinWidth(70,
           VBox(
             # do not allow to change name for already created zone
-            Left(NameWidget.new(@zone, disabled: !@new_zone)),
+            Left(NameWidget.new(@zone, disabled: !@new_zone, existing_names: @existing_names)),
             VSpacing(1),
             Left(ShortWidget.new(@zone)),
             VSpacing(1),

src/lib/y2firewall/widgets/pages/zones.rb

@@ -76,7 +76,8 @@ def label
 
           def handle
             zone = Y2Firewall::Firewalld::Zone.new(name: "draft")
-            result = Dialogs::Zone.run(zone, true)
+            result = Dialogs::Zone.run(zone, new_zone:       true,
+                                             existing_names: firewall.zones.map(&:name))
             if result == :ok
               zone.relations.map { |r| zone.send("#{r}=", []) }
               firewall.zones << zone

src/lib/y2firewall/widgets/zone.rb

@@ -28,14 +28,15 @@ module Dialogs
     class NameWidget < CWM::InputField
       include Yast::I18n
 
-      def initialize(zone, disabled: false)
+      def initialize(zone, disabled: false, existing_names: [])
         textdomain "textdomain"
         @zone = zone
         @disabled = disabled
+        @existing_names = existing_names
       end
 
       def init
-        self.value = @zone.name
+        self.value = @zone.name || ""
         @disabled ? disable : enable
       end
 
@@ -44,11 +45,17 @@ def label
       end
 
       def validate
-        return true if value.to_s.match?(/^\w+$/)
-
-        Yast::Report.Error(_("Please, provide a valid alphanumeric name for the zone"))
-        focus
-        false
+        if !value.to_s.match?(/^\w+$/)
+          Yast::Report.Error(_("Please, provide a valid alphanumeric name for the zone"))
+          focus
+          false
+        elsif @existing_names.include?(value.to_s)
+          Yast::Report.Error(_("Name is already used. Please choose different name."))
+          focus
+          false
+        else
+          true
+        end
       end
 
       def store
@@ -71,7 +78,7 @@ def initialize(zone)
       end
 
       def init
-        self.value = @zone.short
+        self.value = @zone.short || ""
       end
 
       def label
@@ -108,7 +115,7 @@ def initialize(zone)
       end
 
       def init
-        self.value = @zone.description
+        self.value = @zone.description || ""
       end
 
       def label
@@ -167,7 +174,7 @@ def initialize(zone)
       end
 
       def label
-        _("Masquerade")
+        _("IPv4 Masquerade")
       end
 
       def init
@@ -177,6 +184,17 @@ def init
       def store
         @zone.masquerade = value
       end
+
+      def help
+        format(_(
+                 "<b>%s</b> sets masquerade for given zone. Option is for IPv4 only." \
+                 "For IPv6 command line tool firewall-cmd and rich rules needs to be used." \
+                 "IP Masquerade, also called IPMASQ or MASQ, allows one or more computers in " \
+                 "a network without assigned IP addresses to communicate using server’s" \
+                 "assigned IP address."
+        ),
+          label)
+      end
     end
   end
 end

test/lib/y2firewall/dialogs/zone_test.rb

@@ -30,5 +30,5 @@
   include_examples "CWM::Dialog"
 
   let(:zone) { Y2Firewall::Firewalld::Zone.new(name: "test") }
-  subject { described_class.new(zone, false) }
+  subject { described_class.new(zone) }
 end

test/test_helper.rb

@@ -42,6 +42,7 @@ def stub_module(name, fake_class = nil)
 
 # some tests have translatable messages
 ENV["LANG"] = "en_US.UTF-8"
+ENV["LC_ALL"] = "en_US.UTF-8"
 
 if ENV["COVERAGE"]
   require "simplecov"