Merge 1e4f24c into 2d0a28c

yast · Oct 5, 2018 · aaf06fd · aaf06fd
2 parents 2d0a28c + 1e4f24c
commit aaf06fd
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/package/yast2-dhcp-server.changes b/package/yast2-dhcp-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct  5 15:06:58 CEST 2018 - schubi@suse.de
+
+- Adapting to new firewall API (bsc#1108942)
+- 4.1.3
+
 -------------------------------------------------------------------
 Fri Aug 24 14:21:19 UTC 2018 - dgonzalez@suse.com
 

diff --git a/package/yast2-dhcp-server.spec b/package/yast2-dhcp-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dhcp-server
-Version:        4.1.2
+Version:        4.1.3
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/dhcp-server/widgets.rb b/src/include/dhcp-server/widgets.rb
@@ -10,6 +10,8 @@
 require "yast2/system_service"
 require "cwm"
 require "cwm/service_widget"
+require "y2firewall/firewalld"
+require "y2firewall/helpers/interfaces"
 
 # Representation of the configuration of dhcp-server.
 # Input and output routines.
@@ -27,7 +29,6 @@ def initialize_dhcp_server_widgets(include_target)
       Yast.import "LogView"
       Yast.import "Popup"
       Yast.import "TablePopup"
-      Yast.import "SuSEFirewall"
       Yast.import "Mode"
     end
 
@@ -280,7 +281,7 @@ def ldapHandle(id, event)
     # Initialize the widget
     # @param [String] id any widget id
     def OpenFirewallInit(id)
-      enabled = SuSEFirewall.GetEnableService
+      enabled = firewalld.enabled?
       open = DhcpServer.GetOpenFirewall
       UI.ChangeWidget(Id(id), :Enabled, enabled)
       UI.ChangeWidget(Id(id), :Value, open)
@@ -303,7 +304,7 @@ def OpenFirewallStore(id, event)
     def OpenFirewallValidate(id, event)
       event = deep_copy(event)
       open = Convert.to_boolean(UI.QueryWidget(Id(id), :Value))
-      enabled = SuSEFirewall.GetEnableService
+      enabled = firewalld.enabled?
 
       if enabled && !open
         # yes-no popup
@@ -325,7 +326,7 @@ def OpenFirewallValidate(id, event)
         Builtins.foreach(@ifaces) do |ifcfg, interface|
           # interface is active
           if Ops.get_boolean(interface, "active", false) == true
-            if SuSEFirewall.GetZoneOfInterface(ifcfg) == nil
+            if interface_zone(ifcfg) == nil
               ifaces_not_in_fw = Builtins.add(ifaces_not_in_fw, ifcfg)
             end
           end

diff --git a/src/modules/DhcpServer.pm b/src/modules/DhcpServer.pm
@@ -114,7 +114,7 @@ YaST::YCP::Import ("Service");
 YaST::YCP::Import ("Popup");
 YaST::YCP::Import ("Progress");
 YaST::YCP::Import ("Report");
-YaST::YCP::Import ("SuSEFirewall");
+YaST::YCP::Import ("FirewalldWrapper");
 YaST::YCP::Import ("DnsServerAPI");
 
 ##-------------------------------------------------------------------------
@@ -1496,7 +1496,7 @@ DHCP server will not be available."));
 
     if (! Mode->test ()) {
 	my $progress_orig = Progress->set (0);
-	SuSEFirewall->Read ();
+	FirewalldWrapper->read();
 	Progress->set ($progress_orig);
     }
 
@@ -1514,11 +1514,11 @@ DHCP server will not be available."));
     @allowed_interfaces = split (/ /, $ifaces_list);
 
     # if firewall is enabled
-    if (SuSEFirewall->GetEnableService()) {
+    if (FirewalldWrapper->is_enabled()) {
 	foreach my $iface (@allowed_interfaces) {
-	    my $iface_zone = SuSEFirewall->GetZoneOfInterface($iface);
+	    my $iface_zone = FirewalldWrapper->zone_name_of_interface($iface);
 	    if (defined $iface_zone) {
-		$open_firewall = SuSEFirewall->IsServiceSupportedInZone("service:dhcp-server", $iface_zone);
+		$open_firewall = FirewalldWrapper->is_service_in_zone("service:dhcp-server", $iface_zone);
 	    } else {
 		$open_firewall = 0;
 	    }
@@ -1656,7 +1656,7 @@ sub Write {
 
     my $ok = 1;
 
-    $modified = $modified || SuSEFirewall->GetModified ();
+    $modified = $modified || FirewalldWrapper->is_modified ();
 
     if (! $modified)
     {
@@ -1713,20 +1713,20 @@ sub Write {
     if (\@original_allowed_interfaces != \@allowed_interfaces) {
 	# disabling on all interfaces
 	my @all_ifaces;
-	foreach my $iface (@{SuSEFirewall->GetAllKnownInterfaces()}) {
+	foreach my $iface (@{FirewalldWrapper->all_known_interfaces() // []}) {
 	    push @all_ifaces, $iface->{'id'};
 	}
-	SuSEFirewall->SetServices (["service:dhcp-server"], \@all_ifaces, 0);
+	FirewalldWrapper->set_services (["service:dhcp-server"], \@all_ifaces, 0);
 	if ($open_firewall) {
 	    # allowing on selected interfaces
-	    SuSEFirewall->SetServices (["service:dhcp-server"], \@allowed_interfaces, 1);
+	    FirewalldWrapper->set_services (["service:dhcp-server"], \@allowed_interfaces, 1);
 	}
     }
 
     if (! Mode->test ())
     {
 	my $progress_orig = Progress->set (0);
-	SuSEFirewall->Write ();
+	FirewalldWrapper->write ();
 	Progress->set ($progress_orig);
     }
 

diff --git a/src/modules/DhcpServerUI.rb b/src/modules/DhcpServerUI.rb
@@ -22,7 +22,6 @@ def main
       Yast.import "Mode"
       Yast.import "Popup"
       Yast.import "Report"
-      Yast.import "SuSEFirewall"
 
       @current_entry_type = ""
       @current_entry_id = ""