Attachment 621020 Details for Bug 845257 – the same should apply to re-adding / re-removing interface to/from zone

[patch] the same should apply to re-adding / re-removing interface to/from zone

0001-Don-t-send-ZONE_ALREADY_SET-ALREADY_ENABLED-NOT_ENAB.patch (text/plain), 11.23 KB, created by Jiri Popelka on 2012-10-03 16:58:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Popelka

Created: 2012-10-03 16:58:41 UTC

Size: 11.23 KB

patch

obsolete

>From bdf4508d928c1876107097a30d78e9cdf9f1c801 Mon Sep 17 00:00:00 2001
>From: Jiri Popelka <jpopelka@redhat.com>
>Date: Wed, 3 Oct 2012 18:19:13 +0200
>Subject: [PATCH] Don't send ZONE_ALREADY_SET/ALREADY_ENABLED/NOT_ENABLED over
> D-Bus
>
>to whoever tried to re-add or re-remove a interface/service/port etc.
>Use them for internal indication only.
>---
> src/firewall/server/firewalld.py | 167 ++++++++++++++++++++++++++++++++++-----
> 1 file changed, 147 insertions(+), 20 deletions(-)
>
>diff --git a/src/firewall/server/firewalld.py b/src/firewall/server/firewalld.py
>index 5675d4a..315bbd4 100644
>--- a/src/firewall/server/firewalld.py
>+++ b/src/firewall/server/firewalld.py
>@@ -214,7 +214,14 @@ class FirewallD(slip.dbus.service.Object):
>         All ingoing and outgoing connections and packets will be blocked.
>         """
>         log.debug1("enablePanicMode()")
>-        self.fw.enable_panic_mode()
>+        try:
>+            self.fw.enable_panic_mode()
>+        except FirewallError as e:
>+            if e.code == ALREADY_ENABLED:
>+                log.debug1(e)
>+                return
>+            else:
>+                raise e
>         self.PanicModeEnabled()
> 
>     @slip.dbus.polkit.require_auth(PK_ACTION_INFO)
>@@ -227,7 +234,14 @@ class FirewallD(slip.dbus.service.Object):
>         will not be blocked anymore
>         """
>         log.debug1("disablePanicMode()")
>-        self.fw.disable_panic_mode()
>+        try:
>+            self.fw.disable_panic_mode()
>+        except FirewallError as e:
>+            if e.code == NOT_ENABLED:
>+                log.debug1(e)
>+                return
>+            else:
>+                raise e
>         self.PanicModeDisabled()
> 
>     @slip.dbus.polkit.require_auth(PK_ACTION_INFO)
>@@ -366,7 +380,14 @@ class FirewallD(slip.dbus.service.Object):
>         """
>         interface = str(interface)
>         log.debug1("zone.addInterface('%s', '%s')" % (zone, interface))
>-        _zone = self.fw.zone.add_interface(zone, interface, sender)
>+        try:
>+            _zone = self.fw.zone.add_interface(zone, interface, sender)
>+        except FirewallError as e:
>+            if e.code == ZONE_ALREADY_SET:
>+                log.debug1(e)
>+                return zone
>+            else:
>+                raise e
> 
>         self.InterfaceAdded(_zone, interface)
>         return _zone
>@@ -381,7 +402,14 @@ class FirewallD(slip.dbus.service.Object):
>         """
>         interface = str(interface)
>         log.debug1("zone.changeZone('%s', '%s')" % (zone, interface))
>-        _zone = self.fw.zone.change_zone(zone, interface, sender)
>+        try:
>+            _zone = self.fw.zone.change_zone(zone, interface, sender)
>+        except FirewallError as e:
>+            if e.code == ZONE_ALREADY_SET:
>+                log.debug1(e)
>+                return zone
>+            else:
>+                raise e
> 
>         self.ZoneChanged(_zone, interface)
>         return _zone
>@@ -396,7 +424,14 @@ class FirewallD(slip.dbus.service.Object):
>         """
>         interface = str(interface)
>         log.debug1("zone.removeInterface('%s', '%s')" % (zone, interface))
>-        _zone = self.fw.zone.remove_interface(zone, interface)
>+        try:
>+            _zone = self.fw.zone.remove_interface(zone, interface)
>+        except FirewallError as e:
>+            if e.code == UNKNOWN_INTERFACE:
>+                log.debug1(e)
>+                return zone
>+            else:
>+                raise e
> 
>         self.InterfaceRemoved(_zone, interface)
>         return _zone
>@@ -460,7 +495,14 @@ class FirewallD(slip.dbus.service.Object):
>         timeout = int(timeout)
>         log.debug1("zone.addService('%s', '%s', %d)" % (zone, service, timeout))
> 
>-        _zone = self.fw.zone.add_service(zone, service, timeout, sender)
>+        try:
>+            _zone = self.fw.zone.add_service(zone, service, timeout, sender)
>+        except FirewallError as e:
>+            if e.code == ALREADY_ENABLED:
>+                log.debug1(e)
>+                return zone
>+            else:
>+                raise e
> 
>         if timeout > 0:
>             tag = GLib.timeout_add_seconds(timeout, self.disableTimedService,
>@@ -479,7 +521,14 @@ class FirewallD(slip.dbus.service.Object):
>         service = str(service)
>         log.debug1("zone.removeService('%s', '%s')" % (zone, service))
> 
>-        _zone = self.fw.zone.remove_service(zone, service)
>+        try:
>+            _zone = self.fw.zone.remove_service(zone, service)
>+        except FirewallError as e:
>+            if e.code == NOT_ENABLED:
>+                log.debug1(e)
>+                return zone
>+            else:
>+                raise e
> 
>         self.removeTimeout(_zone, service)
>         self.ServiceRemoved(_zone, service)
>@@ -538,7 +587,15 @@ class FirewallD(slip.dbus.service.Object):
>         timeout = int(timeout)
>         log.debug1("zone.enablePort('%s', '%s', '%s')" % \
>                        (zone, port, protocol))
>-        _zone = self.fw.zone.add_port(zone, port, protocol, timeout, sender)
>+
>+        try:
>+            _zone = self.fw.zone.add_port(zone, port, protocol, timeout, sender)
>+        except FirewallError as e:
>+            if e.code == ALREADY_ENABLED:
>+                log.debug1(e)
>+                return zone
>+            else:
>+                raise e
> 
>         if timeout > 0:
>             tag = GLib.timeout_add_seconds(timeout, self.disableTimedPort,
>@@ -558,7 +615,15 @@ class FirewallD(slip.dbus.service.Object):
>         protocol = str(protocol)
>         log.debug1("zone.removePort('%s', '%s', '%s')" % \
>                        (zone, port, protocol))
>-        _zone= self.fw.zone.remove_port(zone, port, protocol)
>+
>+        try:
>+            _zone= self.fw.zone.remove_port(zone, port, protocol)
>+        except FirewallError as e:
>+            if e.code == NOT_ENABLED:
>+                log.debug1(e)
>+                return zone
>+            else:
>+                raise e
> 
>         self.removeTimeout(_zone, (port, protocol))
>         self.PortRemoved(_zone, port, protocol)
>@@ -614,8 +679,16 @@ class FirewallD(slip.dbus.service.Object):
>         # adds masquerade if not added already
>         timeout = int(timeout)
>         log.debug1("zone.addMasquerade('%s')" % (zone))
>-        _zone = self.fw.zone.add_masquerade(zone, timeout, sender)
>-        
>+
>+        try:
>+            _zone = self.fw.zone.add_masquerade(zone, timeout, sender)
>+        except FirewallError as e:
>+            if e.code == ALREADY_ENABLED:
>+                log.debug1(e)
>+                return zone
>+            else:
>+                raise e
>+
>         if timeout > 0:
>             tag = GLib.timeout_add_seconds(timeout, self.disableTimedMasquerade,
>                                            _zone)
>@@ -631,7 +704,15 @@ class FirewallD(slip.dbus.service.Object):
>     def removeMasquerade(self, zone, sender=None):
>         # removes masquerade
>         log.debug1("zone.removeMasquerade('%s')" % (zone))
>-        _zone = self.fw.zone.remove_masquerade(zone)
>+
>+        try:
>+            _zone = self.fw.zone.remove_masquerade(zone)
>+        except FirewallError as e:
>+            if e.code == NOT_ENABLED:
>+                log.debug1(e)
>+                return zone
>+            else:
>+                raise e
> 
>         self.removeTimeout(_zone, "masquerade")
>         self.MasqueradeRemoved(_zone)
>@@ -680,8 +761,16 @@ class FirewallD(slip.dbus.service.Object):
>         timeout = int(timeout)
>         log.debug1("zone.addForwardPort('%s', '%s', '%s', '%s', '%s')" % \
>                        (zone, port, protocol, toport, toaddr))
>-        _zone = self.fw.zone.add_forward_port(zone, port, protocol, toport,
>-                                              toaddr, timeout, sender)
>+
>+        try:
>+            _zone = self.fw.zone.add_forward_port(zone, port, protocol, toport,
>+                                                  toaddr, timeout, sender)
>+        except FirewallError as e:
>+            if e.code == ALREADY_ENABLED:
>+                log.debug1(e)
>+                return zone
>+            else:
>+                raise e
> 
>         if timeout > 0:
>             tag = GLib.timeout_add_seconds(timeout,
>@@ -706,8 +795,16 @@ class FirewallD(slip.dbus.service.Object):
>         toaddr = str(toaddr)
>         log.debug1("zone.removeForwardPort('%s', '%s', '%s', '%s', '%s')" % \
>                        (zone, port, protocol, toport, toaddr))
>-        _zone = self.fw.zone.remove_forward_port(zone, port, protocol, toport,
>-                                                 toaddr)
>+
>+        try:
>+            _zone = self.fw.zone.remove_forward_port(zone, port, protocol,
>+                                                     toport, toaddr)
>+        except FirewallError as e:
>+            if e.code == NOT_ENABLED:
>+                log.debug1(e)
>+                return zone
>+            else:
>+                raise e
> 
>         self.removeTimeout(_zone, (port, protocol, toport, toaddr))
>         self.ForwardPortRemoved(_zone, port, protocol, toport, toaddr)
>@@ -771,7 +868,15 @@ class FirewallD(slip.dbus.service.Object):
>         icmp = str(icmp)
>         timeout = int(timeout)
>         log.debug1("zone.enableIcmpBlock('%s', '%s')" % (zone, icmp))
>-        _zone = self.fw.zone.add_icmp_block(zone, icmp, timeout, sender)
>+
>+        try:
>+            _zone = self.fw.zone.add_icmp_block(zone, icmp, timeout, sender)
>+        except FirewallError as e:
>+            if e.code == ALREADY_ENABLED:
>+                log.debug1(e)
>+                return zone
>+            else:
>+                raise e
> 
>         if timeout > 0:
>             tag = GLib.timeout_add_seconds(timeout, self.disableTimedIcmpBlock,
>@@ -789,7 +894,15 @@ class FirewallD(slip.dbus.service.Object):
>         # removes icmpBlock from zone
>         icmp = str(icmp)
>         log.debug1("zone.removeIcmpBlock('%s', '%s')" % (zone, icmp))
>-        _zone = self.fw.zone.remove_icmp_block(zone, icmp)
>+
>+        try:
>+            _zone = self.fw.zone.remove_icmp_block(zone, icmp)
>+        except FirewallError as e:
>+            if e.code == NOT_ENABLED:
>+                log.debug1(e)
>+                return zone
>+            else:
>+                raise e
> 
>         self.removeTimeout(_zone, icmp)
>         self.IcmpBlockRemoved(_zone, icmp)
>@@ -841,7 +954,14 @@ class FirewallD(slip.dbus.service.Object):
>         table = str(table)
>         chain = str(chain)
>         log.debug1("direct.addChain('%s', '%s', '%s')" % (ipv, table, chain))
>-        self.fw.direct.add_chain(ipv, table, chain)
>+        try:
>+            self.fw.direct.add_chain(ipv, table, chain)
>+        except FirewallError as e:
>+            if e.code == ALREADY_ENABLED:
>+                log.debug1(e)
>+                return
>+            else:
>+                raise e
>         self.ChainAdded(ipv, table, chain)
> 
>     @slip.dbus.polkit.require_auth(PK_ACTION_DIRECT)
>@@ -854,7 +974,14 @@ class FirewallD(slip.dbus.service.Object):
>         table = str(table)
>         chain = str(chain)
>         log.debug1("direct.removeChain('%s', '%s', '%s')" % (ipv, table, chain))
>-        self.fw.direct.remove_chain(ipv, table, chain)
>+        try:
>+            self.fw.direct.remove_chain(ipv, table, chain)
>+        except FirewallError as e:
>+            if e.code == NOT_ENABLED:
>+                log.debug1(e)
>+                return
>+            else:
>+                raise e
>         self.ChainRemoved(ipv, table, chain)
>     
>     @slip.dbus.polkit.require_auth(PK_ACTION_DIRECT)
>-- 
>1.7.11.4
>

Actions: View | Diff

Attachments on bug 845257: 621016 | 621020