Remove duplicates in acl_names.

yast · May 27, 2016 · a2c6249 · a2c6249
1 parent abbce87
commit a2c6249
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/src/include/dns-server/dialog-masterzone.rb b/src/include/dns-server/dialog-masterzone.rb
@@ -67,7 +67,7 @@ def acl_names
         a.strip.split(/[ \t]/).fetch(0, "")
       end
       # bsc#976643#c23
-      names = (names + current_zone_allow_transfer + BUILTIN_ACLS).sort
+      names = (names + current_zone_allow_transfer + BUILTIN_ACLS).sort.uniq
       # bug #203910
       # hide "none" from listed ACLs
       # "none" means, not allowed and thus multiselectbox of ACLs is disabled

diff --git a/test/masterzone_test.rb b/test/masterzone_test.rb
@@ -28,6 +28,14 @@ def initialize
     }
   end
 
+  let(:any_zone_options) do
+    {
+      "options" => [
+        { "key" => "allow-transfer", "value" => "{ any; }" }
+      ]
+    }
+  end
+
   let(:none_zone_options) do
     {
       "options" => [
@@ -49,6 +57,12 @@ def initialize
       expect(z.current_zone_allow_transfer).to eq ["none"]
     end
 
+    it "parses an 'any' case" do
+      z = CurrentZoneMock.new
+      z.current_zone = any_zone_options
+      expect(z.current_zone_allow_transfer).to eq ["any"]
+    end
+
     it "parses an empty case" do
       z = CurrentZoneMock.new
       z.current_zone = empty_zone_options
@@ -69,13 +83,18 @@ def initialize
       expect(z.acl_names).to eq ["any", "localhost", "localnets"]
     end
 
-
     it "omits 'none'" do
       z = CurrentZoneMock.new
       z.current_zone = none_zone_options
       expect(z.acl_names).to eq ["any", "localhost", "localnets"]
     end
 
+    it "deduplicates 'any'" do
+      z = CurrentZoneMock.new
+      z.current_zone = any_zone_options
+      expect(z.acl_names).to eq ["any", "localhost", "localnets"]
+    end
+
     it "uses predeclared ACLs" do
       z = CurrentZoneMock.new
       expect(Yast::DnsServer).to receive(:GetAcl).and_return [
@@ -111,6 +130,19 @@ def initialize
       expect { z.ZoneAclInit }.to_not raise_error
     end
 
+    it "sets up an 'any' case" do
+      z = CurrentZoneMock.new
+      z.current_zone = any_zone_options
+
+      expect(Yast::UI).to receive(:ChangeWidget)
+        .with(Id("enable_zone_transport"), :Value, true)
+      expect(Yast::UI).to receive(:ChangeWidget)
+        .with(Id("acls_list"), :Enabled, true)
+      expect(Yast::UI).to receive(:ChangeWidget)
+        .with(Id("acls_list"), :SelectedItems, ["any"])
+      expect { z.ZoneAclInit }.to_not raise_error
+    end
+
     it "sets up an empty case" do
       z = CurrentZoneMock.new
       z.current_zone = empty_zone_options