firewallsettings.py: Drop enabling IPP client service

IPP client service in firewall was for CUPS broadcast, which is
obsoleted technology and neither cupsd or cups-browsed provides it in
the present.

If user still depends CUPS broadcasts, the service can still be enabled
in firewall SW directly.

Author: zdohnal

firewallsettings.py

@@ -128,13 +128,6 @@ def add_service (self, service):
             else:
                 raise FirewallError (e.code, e.msg)
 
-    def check_ipp_client_allowed (self):
-        if not self._get_fw_data ():
-            return True
-
-        return (IPP_CLIENT_SERVICE in self._fw_data.getServices () or
-               [IPP_CLIENT_PORT, IPP_CLIENT_PROTOCOL] in self._fw_data.getPorts ())
-
     def check_ipp_server_allowed (self):
         if not self._get_fw_data ():
             return True
@@ -249,11 +242,6 @@ def add_service (self, service):
         args.append ("--service=" + service)
         self._fw_data = (args, filename)
 
-    def check_ipp_client_allowed (self):
-        return self._check_any_allowed (set(["--port=%s:%s" %
-                                        (IPP_CLIENT_PORT, IPP_CLIENT_PROTOCOL),
-                                             "--service=" + IPP_CLIENT_SERVICE]))
-
     def check_ipp_server_allowed (self):
         return self._check_any_allowed (set(["--port=%s:%s" %
                                         (IPP_SERVER_PORT, IPP_SERVER_PROTOCOL),

newprinter.py

@@ -2273,41 +2273,35 @@ def fillDeviceTab(self, current_uri=None):
 
     def on_firewall_read (self, data):
         f = self.firewall
-        allowed = True
+        mdns_allowed = False
+
         try:
-            ipp_allowed = f.check_ipp_client_allowed ()
             mdns_allowed = f.check_mdns_allowed ()
-            allowed = (ipp_allowed and mdns_allowed)
 
-            secondary_text = TEXT_adjust_firewall + "\n\n"
-            if not ipp_allowed:
-                secondary_text += ("- " +
-                                   _("Allow all incoming IPP Browse packets") +
-                                   "\n")
-                f.add_service (firewallsettings.IPP_CLIENT_SERVICE)
-            if not mdns_allowed:
-                secondary_text += ("- " +
-                                   _("Allow all incoming mDNS traffic") + "\n")
-                f.add_service (firewallsettings.MDNS_SERVICE)
+            if mdns_allowed:
+                debugprint("Firewall all OK, no changes needed")
+                return
 
-            if not allowed:
-                debugprint ("Asking for permission to adjust firewall:\n%s" %
-                            secondary_text)
-                dialog = Gtk.MessageDialog (parent=self.NewPrinterWindow,
-                                            modal=True, destroy_with_parent=True,
-                                            message_type=Gtk.MessageType.QUESTION,
-                                            buttons=Gtk.ButtonsType.NONE,
-                                            text= _("Adjust Firewall"))
-                dialog.format_secondary_markup (secondary_text)
-                dialog.add_buttons (_("Do It Later"), Gtk.ResponseType.NO,
-                                    _("Adjust Firewall"), Gtk.ResponseType.YES)
-                dialog.connect ('response', self.adjust_firewall_response)
-                dialog.show ()
+            secondary_text = TEXT_adjust_firewall + "\n\n"
+            secondary_text += ("- " +
+                               _("Allow all incoming mDNS traffic") + "\n")
+            f.add_service (firewallsettings.MDNS_SERVICE)
+
+            debugprint ("Asking for permission to adjust firewall:\n%s" %
+                        secondary_text)
+            dialog = Gtk.MessageDialog (parent=self.NewPrinterWindow,
+                                        modal=True, destroy_with_parent=True,
+                                        message_type=Gtk.MessageType.QUESTION,
+                                        buttons=Gtk.ButtonsType.NONE,
+                                        text= _("Adjust Firewall"))
+            dialog.format_secondary_markup (secondary_text)
+            dialog.add_buttons (_("Do It Later"), Gtk.ResponseType.NO,
+                                _("Adjust Firewall"), Gtk.ResponseType.YES)
+            dialog.connect ('response', self.adjust_firewall_response)
+            dialog.show ()
         except (dbus.DBusException, Exception):
             nonfatalException ()
 
-        if allowed:
-            debugprint ("Firewall all OK, no changes needed")
 
     def adjust_firewall_response (self, dialog, response):
         dialog.destroy ()