Merge lp:~aptdaemon-developers/aptdaemon/fail-on-no-auth into lp:aptdaemon

[Sebastian Heinlein]

This introduces a string change (new error messages)

Unmerged revisions

787. By Sebastian Heinlein on 2012-03-29

core: if the run call fails also let the transaction fail (fixes LP #892215)

If the authorization fails the transaction will now also fail. This helps clients which dont catch errors in the run method. Furthermore all connected transaction will also fail.

786. By Sebastian Heinlein on 2012-03-29

enums: Add new transaction error enums to handle a not authorized user and a failed authorization process

=== modified file 'aptdaemon/core.py'
--- aptdaemon/core.py	2012-03-14 07:53:38 +0000
+++ aptdaemon/core.py	2012-03-29 06:58:18 +0000
@@ -47,6 +47,7 @@
 import signal
 import sys
 import time
+import traceback
 import uuid
 
 from gi.repository import GObject
@@ -890,16 +891,35 @@
 
     @inline_callbacks
     def _run(self, sender):
-        yield self._check_foreign_user(sender)
-        yield self._check_auth()
-        yield self.queue.put(self.tid)
-        self.status = enums.STATUS_WAITING
-        next_trans = self.after
-        while next_trans:
-            yield next_trans._check_auth()
-            yield self.queue.put(next_trans.tid)
-            next_trans.status = enums.STATUS_WAITING
-            next_trans = next_trans.after
+        trans = self
+        while trans:
+            try:
+                yield self._check_foreign_user(sender)
+                yield self._check_auth()
+                yield self.queue.put(self.tid)
+            except errors.AuthorizationFailed as excep:
+                error = errors.TransactionFailed(enums.ERROR_AUTH_FAILED,
+                                                 str(excep))
+            except errors.NotAuthorizedError as excep:
+                error = errors.TransactionFailed(enums.ERROR_NOT_AUTHORIZED,
+                                                 str(excep))
+            except Exception as excep:
+                tbk = traceback.format_exc(excep)
+                error = errors.TransactionFailed(enums.ERROR_UNKNOWN, tbk)
+            else:
+                self.status = enums.STATUS_WAITING
+                trans = self.after
+                continue
+            trans.error = error
+            trans.exit = enums.EXIT_FAILED
+            # Also let all connected transactions fail
+            next = self.after
+            while next:
+                next.error = error
+                next.exit = enums.EXIT_FAILED
+                next = next_trans.after
+            # Need to re-raise the error
+            raise error
 
     @inline_callbacks
     def _check_auth(self):

=== modified file 'aptdaemon/enums.py'
--- aptdaemon/enums.py	2011-12-13 21:32:43 +0000
+++ aptdaemon/enums.py	2012-03-29 06:58:18 +0000
@@ -38,7 +38,7 @@
            "ERROR_SYSTEM_ALREADY_UPTODATE", "ERROR_NOT_SUPPORTED",
            "ERROR_LICENSE_KEY_INSTALL_FAILED",
            "ERROR_LICENSE_KEY_DOWNLOAD_FAILED",
-           "ERROR_UNKNOWN",
+           "ERROR_NOT_AUTHORIZED", "ERROR_AUTH_FAILED", "ERROR_UNKNOWN",
            "STATUS_SETTING_UP", "STATUS_WAITING", "STATUS_WAITING_MEDIUM",
            "STATUS_WAITING_CONFIG_FILE_PROMPT", "STATUS_WAITING_LOCK",
            "STATUS_RUNNING", "STATUS_LOADING_CACHE", "STATUS_DOWNLOADING",
@@ -156,6 +156,11 @@
 ERROR_LICENSE_KEY_INSTALL_FAILED = "error-license-key-install-failed"
 #: The system is already up-to-date and don't needs any upgrades
 ERROR_SYSTEM_ALREADY_UPTODATE = "error-system-already-uptodate"
+#: The user could not authenticate to run the transaction
+ERROR_NOT_AUTHORIZED = "error-not-authorized"
+#: The authorization system is broken (e.g. there isn't any session policykit
+#: agent running)
+ERROR_AUTH_FAILED = "error-auth-failed"
 #: An unknown error occured. In most cases these are programming ones.
 ERROR_UNKNOWN = "error-unknown"
 
@@ -547,6 +552,12 @@
                                          "use this piece of software could not be "
                                          "downloaded. Please check your "
                                          "network connection."),
+    ERROR_NOT_AUTHORIZED: _("Please check that you have entered the correct "
+                            "password and that you are allowed to perform "
+                            "this action. Contact your system administrator."),
+    ERROR_AUTH_FAILED: _("The authorization system (PolicyKit) seems to be "
+                         "not correctly installed. Please make sure that a "
+                         "session agent is running."),
     }
 
 def get_error_description_from_enum(enum):
@@ -586,6 +597,8 @@
     ERROR_LICENSE_KEY_DOWNLOAD_FAILED: _("Failed to download the license key"),
     ERROR_LICENSE_KEY_INSTALL_FAILED: _("Failed to install the license key"),
     ERROR_SYSTEM_ALREADY_UPTODATE: _("The system is already up to date"),
+    ERROR_NOT_AUTHORIZED: _("You are not allowed to perform this action"),
+    ERROR_AUTH_FAILED: _("Failed to authorize you"),
     ERROR_UNKNOWN : _("An unhandlable error occured")
     }
 

=== modified file 'aptdaemon/pkcompat.py'
--- aptdaemon/pkcompat.py	2012-03-13 18:35:32 +0000
+++ aptdaemon/pkcompat.py	2012-03-29 06:58:18 +0000
@@ -203,6 +203,10 @@
             pk_enums.ERROR_INVALID_PACKAGE_FILE,
     aptd_enums.ERROR_SYSTEM_ALREADY_UPTODATE:
             pk_enums.ERROR_NO_PACKAGES_TO_UPDATE,
+    aptd_enums.ERROR_AUTH_FAILED:
+            pk_enums.ERROR_NOT_AUTHORIZED,
+    aptd_enums.ERROR_NOT_AUTHORIZED:
+            pk_enums.ERROR_NOT_AUTHORIZED,
     }
 
 MAP_PACKAGE_ENUM = {