Merge lp:~flamingolof/aptdaemon/s-p-gtk-fixes into lp:aptdaemon

[Olof Kindgren]

[Olof Kindgren (flamingolof)]

Added methods
InstallKeyFile -- Installs a repository key from a given file
GetTrustedKeys -- Returns a list of repository keys
RemoveKey -- Remove a key with the specified fingerprint

=== modified file 'aptdaemon/client.py'
--- aptdaemon/client.py	2009-07-07 13:25:51 +0000
+++ aptdaemon/client.py	2009-07-09 17:05:04 +0000
@@ -40,7 +40,6 @@
 import errors
 import policykit
 
-
 class AptMessage:
     """Represents a non-cirtical information or warning from the daemon"""
     def __init__(self, enum, details):
@@ -320,6 +319,11 @@
         self._locale = "%s.%s" % locale.getdefaultlocale()
         self.terminal = None
 
+    def get_trusted_keys(self, exit_handler=None):
+        daemon = get_aptdaemon()
+        keys = polkit_auth_wrapper(daemon.GetTrustedKeys)
+        return keys
+
     def upgrade_system(self, safe_mode=True, exit_handler=None):
         """Upgrade system."""
         return self._run_transaction("UpgradeSystem", [safe_mode],
@@ -330,6 +334,14 @@
         return self._run_transaction("InstallPackages", [package_names],
                                      exit_handler)
 
+    def install_key_file(self, path, exit_handler=None):
+        """Install repository key file."""
+        return self._run_transaction("InstallKeyFile", [path], exit_handler)
+
+    def remove_key(self, fingerprint, exit_handler=None):
+        """Remove repository key."""
+        return self._run_transaction("RemoveKey", [fingerprint], exit_handler)
+
     def install_file(self, path, exit_handler=None):
         """Install local package file."""
         return self._run_transaction("InstallFile", [path], exit_handler)

=== modified file 'aptdaemon/console.py'
--- aptdaemon/console.py	2009-07-09 08:16:58 +0000
+++ aptdaemon/console.py	2009-07-09 17:05:04 +0000
@@ -78,12 +78,30 @@
         self._set_transaction(trans)
         trans.run(block=True)
 
+    def install_key_file(self, path):
+        """Install repository key file."""
+        trans = self._client.install_key_file(path,
+                                                   exit_handler=self._on_exit)
+        self._set_transaction(trans)
+        trans.run(block=True)
+
+    def remove_key(self, fingerprint):
+        """Remove repository key."""
+        trans = self._client.remove_key(fingerprint, exit_handler=self._on_exit)
+        self._set_transaction(trans)
+        trans.run(block=True)
+
     def install_file(self, path):
         """Install package file."""
         trans = self._client.install_file(path, exit_handler=self._on_exit)
         self._set_transaction(trans)
         trans.run(block=True)
 
+    def get_trusted_keys(self):
+        keys = self._client.get_trusted_keys(exit_handler=self._on_exit)
+        for key in keys:
+            print key
+
     def remove_packages(self, packages):
         """Remove packages"""
         trans = self._client.remove_packages(packages,
@@ -293,6 +311,15 @@
     parser.add_option("", "--upgrade-system", default="",
                       action="store_true", dest="dist_upgrade",
                       help=_("Upgrade the system"))
+    parser.add_option("", "--install-key-file", default="",
+                      action="store", type="string", dest="install_key_file",
+                      help=_("Install key from file"))
+    parser.add_option("", "--list-trusted-keys", default="",
+                      action="store_true", dest="get_trusted_keys",
+                      help=_("Get trusted keys"))
+    parser.add_option("", "--remove-key", default="",
+                      action="store", type="string", dest="remove_key",
+                      help=_("Remove key with the given fingerprint"))
     parser.add_option("", "--hide-terminal",
                       action="store_true", dest="hide_terminal",
                       help=_("Do not attach to the apt terminal"))
@@ -309,6 +336,12 @@
                                options.remove.split(),
                                options.purge.split(),
                                options.upgrade.split())
+    elif options.install_key_file:
+        client.install_key_file(options.install_key_file)
+    elif options.remove_key:
+        client.remove_key(options.remove_key)
+    elif options.get_trusted_keys:
+        client.get_trusted_keys()
     else:
         parser.print_help()
         sys.exit(1)

=== modified file 'aptdaemon/core.py'
--- aptdaemon/core.py	2009-07-07 15:07:52 +0000
+++ aptdaemon/core.py	2009-07-09 17:05:04 +0000
@@ -55,7 +55,7 @@
 import policykit
 from worker import AptWorker
 from misc import get_main_loop
-
+from softwareproperties.AptAuth import AptAuth
 # Setup i18n
 gettext.textdomain("aptdaemon")
 
@@ -551,6 +551,54 @@
     @dbus.service.method(APTDAEMON_TRANSACTION_DBUS_INTERFACE,
                          in_signature="s", out_signature="",
                          sender_keyword="sender")
+    def InstallKeyFile(self, path, sender):
+        """Install the given key file.
+
+        Keyword arguments:
+        path -- the absolute path to the package file
+        sender -- the unique D-Bus name of the sender (provided by D-Bus)
+        """
+        log_trans.info("InstallKeyFile() was called: %s" % path)
+        self._check_caller(sender)
+        if self.role != ROLE_UNSET:
+            raise TransactionRoleAlreadySet()
+        action = policykit.PK_ACTION_INSTALL_KEY_FILE
+        if not policykit.is_authorized_sender(action, sender):
+            raise errors.NotAuthorizedError(action, sender)
+        #FIXME: Perform some checks
+        self.role = ROLE_INSTALL_KEY_FILE
+        self.kwargs = {"path" : path}
+        log_trans.debug("Queue transaction")
+        self.queue.put(self)
+        log_trans.debug("Queued")
+
+    @dbus.service.method(APTDAEMON_TRANSACTION_DBUS_INTERFACE,
+                         in_signature="s", out_signature="",
+                         sender_keyword="sender")
+    def RemoveKey(self, fingerprint, sender):
+        """Remove the given key.
+
+        Keyword arguments:
+        fingerprint -- the fingerprint of the key to remove
+        sender -- the unique D-Bus name of the sender (provided by D-Bus)
+        """
+        log_trans.info("RemoveKey() was called: %s" % fingerprint)
+        self._check_caller(sender)
+        if self.role != ROLE_UNSET:
+            raise TransactionRoleAlreadySet()
+        action = policykit.PK_ACTION_REMOVE_KEY
+        if not policykit.is_authorized_sender(action, sender):
+            raise errors.NotAuthorizedError(action, sender)
+        #FIXME: Perform some checks
+        self.role = ROLE_REMOVE_KEY
+        self.kwargs = {"fingerprint" : fingerprint}
+        log_trans.debug("Queue transaction")
+        self.queue.put(self)
+        log_trans.debug("Queued")
+
+    @dbus.service.method(APTDAEMON_TRANSACTION_DBUS_INTERFACE,
+                         in_signature="s", out_signature="",
+                         sender_keyword="sender")
     def InstallFile(self, path, sender):
         """Install the given package file.
 
@@ -940,6 +988,19 @@
         return trans.tid
 
     @dbus.service.method(APTDAEMON_DBUS_INTERFACE,
+                         in_signature="", out_signature="as",
+                         sender_keyword="sender")
+    def GetTrustedKeys(self,sender):
+        """Return a list of installed repository keys."""
+        log_trans.info("GetTrustedKeys() was called")
+        action = policykit.PK_ACTION_GET_TRUSTED_KEYS
+        if not policykit.is_authorized_sender(action, sender):
+            raise errors.NotAuthorizedError(action, sender)
+        aptauth = AptAuth()
+        keys = aptauth.list()
+        return keys
+
+    @dbus.service.method(APTDAEMON_DBUS_INTERFACE,
                          in_signature="", out_signature="sas")
     def GetActiveTransactions(self):
         """Return the currently running transaction and the list of queued

=== modified file 'aptdaemon/enums.py'
--- aptdaemon/enums.py	2009-07-06 23:29:31 +0000
+++ aptdaemon/enums.py	2009-07-09 17:00:21 +0000
@@ -33,6 +33,8 @@
 (ERROR_PACKAGE_DOWNLOAD_FAILED,
  ERROR_REPO_DOWNLOAD_FAILED,
  ERROR_DEPENDENCIES_BROKEN,
+ ERROR_KEY_NOT_INSTALLED,
+ ERROR_KEY_NOT_REMOVED,
  ERROR_NO_LOCK,
  ERROR_NO_CACHE,
  ERROR_NO_PACKAGE,
@@ -41,7 +43,7 @@
  ERROR_PACKAGE_NOT_INSTALLED,
  ERROR_NOT_REMOVE_ESSENTIAL_PACKAGE,
  ERROR_DAEMON_DIED,
- ERROR_UNKNOWN) = range(12)
+ ERROR_UNKNOWN) = range(14)
 
 # Message enums
 (MSG_SYSTEM_ALREADY_UPTODATE,
@@ -62,14 +64,15 @@
 
 (ROLE_UNSET,
  ROLE_INSTALL_PACKAGES,
- ROLE_INSTALL_SIGNATURE,
+ ROLE_INSTALL_KEY_FILE,
  ROLE_INSTALL_FILE,
  ROLE_UPGRADE_PACKAGES,
  ROLE_UPGRADE_SYSTEM,
  ROLE_UPDATE_CACHE,
+ ROLE_REMOVE_KEY,
  ROLE_REMOVE_PACKAGES,
  ROLE_COMMIT_PACKAGES,
- ROLE_REMOVE_SIGNATURE) = range(10)
+ ROLE_REMOVE_KEY_FILE) = range(11)
 
 ICONS_STATUS = {
     STATUS_CANCELLING:'aptdaemon-cleanup',
@@ -94,7 +97,7 @@
 ICONS_ROLE = {
     ROLE_INSTALL_FILE:'aptdaemon-add',
     ROLE_INSTALL_PACKAGES:'aptdaemon-add',
-    ROLE_INSTALL_SIGNATURE:'emblem-system',
+    ROLE_INSTALL_KEY_FILE:'emblem-system',
     ROLE_UPDATE_CACHE:'aptdaemon-update-cache',
     ROLE_REMOVE_PACKAGES:'aptdaemon-delete',
     ROLE_UPGRADE_PACKAGES:'aptdaemon-upgrade',
@@ -127,8 +130,9 @@
 PAST_ROLE = {
     ROLE_INSTALL_FILE : _("Installed file"),
     ROLE_INSTALL_PACKAGES : _("Installed packages"),
-    ROLE_INSTALL_SIGNATURE: _("Installed signature"),
+    ROLE_INSTALL_KEY_FILE: _("Installed key"),
     ROLE_UPDATE_CACHE : _("Updated cache"),
+    ROLE_REMOVE_KEY : _("Removed key"),
     ROLE_REMOVE_PACKAGES : _("Removed packages"),
     ROLE_UPGRADE_PACKAGES : _("Updated packages"),
     ROLE_UPGRADE_SYSTEM : _("Upgraded system"),
@@ -157,8 +161,9 @@
 PRESENT_ROLE = {
     ROLE_INSTALL_FILE : _("Installing file"),
     ROLE_INSTALL_PACKAGES : _("Installing packages"),
-    ROLE_INSTALL_SIGNATURE: _("Installing signature"),
+    ROLE_INSTALL_KEY_FILE : _("Installing key"),
     ROLE_UPDATE_CACHE : _("Updating cache"),
+    ROLE_REMOVE_KEY : _("Removing key"),
     ROLE_REMOVE_PACKAGES : _("Removing packages"),
     ROLE_UPGRADE_PACKAGES : _("Updating packages"),
     ROLE_UPGRADE_SYSTEM : _("Upgrading system"),
@@ -180,6 +185,10 @@
                                   "they are a common source of problems.\n"
                                   "Furthermore run the following command in a "
                                   "Terminal: apt-get install -f"),
+    ERROR_KEY_NOT_INSTALLED : _("The selected file may not be a GPG key file "
+                                "or it might be corrupt."),
+    ERROR_KEY_NOT_REMOVED : _("The selected key couldn't be removed "
+                                "Check if you provided a valid fingerprint."),
     ERROR_NO_LOCK : _("Check if you are currently running another "
                       "software management tool, e.g. Synaptic or aptitude. "
                       "Only one tool is allowed to make changes at the "
@@ -211,6 +220,8 @@
     ERROR_PACKAGE_DOWNLOAD_FAILED : _("Failed to download package files"),
     ERROR_REPO_DOWNLOAD_FAILED : _("Failed to download repository information"),
     ERROR_DEPENDENCIES_BROKEN : _("Package dependencies are broken"),
+    ERROR_KEY_NOT_INSTALLED : _("Key was not installed"),
+    ERROR_KEY_NOT_INSTALLED : _("Key was not removed"),
     ERROR_NO_LOCK : _("Failed to lock the package manager"),
     ERROR_NO_CACHE : _("Failed to load the package list"),
     ERROR_NO_PACKAGE : _("Package does not exist"),

=== modified file 'aptdaemon/policykit.py'
--- aptdaemon/policykit.py	2009-07-02 10:43:47 +0000
+++ aptdaemon/policykit.py	2009-07-09 17:00:21 +0000
@@ -24,8 +24,11 @@
 import dbus
 
 PK_ACTION_REMOVE_PACKAGES = "org.debian.apt.remove-packages"
+PK_ACTION_REMOVE_KEY = "org.debian.apt.remove-key"
 PK_ACTION_INSTALL_PACKAGES = "org.debian.apt.install-packages"
+PK_ACTION_INSTALL_KEY_FILE = "org.debian.apt.install-key-file"
 PK_ACTION_INSTALL_FILE = "org.debian.apt.install-file"
+PK_ACTION_GET_TRUSTED_KEYS = "org.debian.apt.get-trusted-keys"
 PK_ACTION_UPGRADE_PACKAGES = "org.debian.apt.upgrade-packages"
 PK_ACTION_UPDATE_CACHE = "org.debian.apt.update-cache"
 PK_ACTION_UPGRADE_SYSTEM = "org.debian.apt.upgrade-system"

=== modified file 'aptdaemon/worker.py'
--- aptdaemon/worker.py	2009-07-07 14:03:32 +0000
+++ aptdaemon/worker.py	2009-07-09 17:00:21 +0000
@@ -39,6 +39,8 @@
                      DaemonDpkgInstallProgress, \
                      DaemonDpkgRecoverProgress
 
+from softwareproperties.SoftwareProperties import SoftwareProperties
+from softwareproperties.AptAuth import AptAuth
 log = logging.getLogger("AptDamon.Worker")
 
 class AptWorker(gobject.GObject):
@@ -100,6 +102,10 @@
                 self.upgrade_packages(**self.trans.kwargs)
             elif self.trans.role == ROLE_COMMIT_PACKAGES:
                 self.commit_packages(**self.trans.kwargs)
+            elif self.trans.role == ROLE_INSTALL_KEY_FILE:
+                self.install_key_file(**self.trans.kwargs)
+            elif self.trans.role == ROLE_REMOVE_KEY:
+                self.remove_key(**self.trans.kwargs)
         except TransactionFailed, excep:
             self.trans.error = excep
             self.trans.exit = EXIT_FAILED
@@ -172,6 +178,31 @@
                                             pkg_name)
             pkg.markInstall()
  
+    def install_key_file(self, path):
+        """Install repository key file.
+
+        Keyword argument:
+        path -- absolute path to the key file
+        """
+        softwareproperties = SoftwareProperties()
+        if not softwareproperties.add_key(os.path.expanduser(path)):
+            raise TransactionFailed(ERROR_KEY_NOT_INSTALLED,
+                                    "Key file %s couldn't be installed" % \
+                                        path)
+        
+    def remove_key(self, fingerprint):
+        """Remove repository key.
+
+        Keyword argument:
+        fingerprint -- fingerprint of the key to remove
+        """
+        softwareproperties = SoftwareProperties()
+        if not softwareproperties.remove_key(fingerprint):
+            raise TransactionFailed(ERROR_KEY_NOT_REMOVED,
+                                    "Key with fingerprint %s couldn't be removed" % \
+                                    fingerprint)
+        
+
     def install_file(self, path):
         """Install local package file.
 

=== modified file 'data/org.debian.apt.policy.in'
--- data/org.debian.apt.policy.in	2009-07-02 10:43:47 +0000
+++ data/org.debian.apt.policy.in	2009-07-09 17:00:21 +0000
@@ -17,6 +17,39 @@
     </defaults>
   </action>
 
+  <action id="org.debian.apt.install-key-file">
+    <description>Install repository key file</description>
+    <message>
+      Authentication is required to install a repository key.
+    </message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin_keep_always</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.debian.apt.remove-key">
+    <description>Remove a repository key</description>
+    <message>
+      Authentication is required to remove repository key.
+    </message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin_keep_always</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.debian.apt.get-trusted-keys">
+    <description>View trusted keys</description>
+    <message>
+      Authentication is required to view trusted keys.
+    </message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin_keep_always</allow_active>
+    </defaults>
+  </action>
+
   <action id="org.debian.apt.install-file">
     <_description>Install package file</_description>
     <_message>