Merge lp:~mvo/aptdaemon/add-license-key-call-from-server into lp:aptdaemon

[Michael Vogt]

This branch adds system wide license keys. The keys are obtained via a helper utility directly from the server.

=== modified file 'NEWS'
--- NEWS	2011-10-08 16:23:14 +0000
+++ NEWS	2011-11-10 14:28:46 +0000
@@ -9,6 +9,7 @@
    - Freeze (copy) the dpkg status file during a dpkg call to allow
      simulating other transactions with the frozen dpkg status
 
+   - Allow to install global license keys, see below
    - Add compatibilty for py-gobject 3.0 to the client module by switching
      to gobject from introspection repository
 
@@ -30,6 +31,15 @@
    - aptdaemon.test.Chroot now has got new methods to handle faked cdrom
      repositories: add_cdrom_repository(), mount_cdrom() and unmount_cdrom()
 
+   - org.debian.apt.transaction D-Bus interface: The Download and Space
+     properties are now of type Int64 (signed 64-bit integer)
+
+   - org.debian.apt D-Bus interface: Add new AddLicenseKey method which
+     allows to place a license key file at the loaction specified in the
+     record/control field LicenseKeyPath of the corresponding package.
+
+   - aptdaemon.client: New AptClient.add_license_key method.
+     
    - org.debian.apt D-Bus interface: Add the RebootRequired property. Should
      be quite self-explanatory
    

=== modified file 'aptdaemon/client.py'
--- aptdaemon/client.py	2011-08-17 11:23:20 +0000
+++ aptdaemon/client.py	2011-11-10 14:28:46 +0000
@@ -1536,6 +1536,33 @@
         return self._run_transaction("Clean", [], wait, reply_handler,
                                      error_handler)
 
+    @deferable
+    @convert_dbus_exception
+    def add_license_key(self, pkg_name, json_token, server_name, wait=False,
+                        reply_handler=None, error_handler=None):
+        """Install a license key to use a piece of proprietary software.
+
+        :param pkg_name: The package which requires the license
+        :param json_token: The oauth token in json format
+        :param server_name: The server name (ubuntu-procduction, ubuntu-staging)
+
+        :param wait: if True run the transaction immediately and return its exit
+            state instead of the transaction itself.
+        :param reply_handler: Callback function. If specified in combination
+            with error_handler the method will be called asynchrounsouly.
+        :param error_handler: Errback function. In case of an error the given
+            callback gets the corresponding exception instance.
+        :param defer: Run the method asynchrounsly and return a defer.Deferred.
+            This options is only available as an keyword.
+
+        :raises: dbus.DBusException
+
+        :returns: An AptTransaction instance.
+        """
+        return self._run_transaction("AddLicenseKey",
+                                     [pkg_name, json_token, server_name],
+                                     wait, reply_handler,
+                                     error_handler)
 
     def _run_transaction(self, method_name, args, wait, reply_handler,
                          error_handler):

=== modified file 'aptdaemon/core.py'
--- aptdaemon/core.py	2011-09-15 14:23:50 +0000
+++ aptdaemon/core.py	2011-11-10 14:28:46 +0000
@@ -296,7 +296,10 @@
         enums.ROLE_CLEAN: \
             policykit1.PK_ACTION_CLEAN,
         enums.ROLE_ENABLE_DISTRO_COMP: \
-            policykit1.PK_ACTION_CHANGE_REPOSITORY}
+            policykit1.PK_ACTION_CHANGE_REPOSITORY,
+        enums.ROLE_ADD_LICENSE_KEY: \
+            policykit1.PK_ACTION_INSTALL_OR_REMOVE_PACKAGES,
+        }
 
     WRITABLE_PROPERTIES = ("HttpProxy", "Terminal", "AllowUnauthenticated",
                            "DebconfSocket", "MetaData", "Locale",
@@ -875,7 +878,8 @@
         if self.role not in [enums.ROLE_ADD_REPOSITORY,
                              enums.ROLE_ADD_VENDOR_KEY_FROM_KEYSERVER,
                              enums.ROLE_UPDATE_CACHE,
-                             enums.ROLE_INSTALL_PACKAGES]:
+                             enums.ROLE_INSTALL_PACKAGES,
+                             enums.ROLE_ADD_LICENSE_KEY]:
             return_value(False)
         flags = policykit1.CHECK_AUTH_NONE
         for action in [policykit1.PK_ACTION_INSTALL_PACKAGES_FROM_NEW_REPO,
@@ -1856,6 +1860,34 @@
         mainloop.quit()
         log.debug("Exit")
 
+    # pylint: disable-msg=C0103,C0322
+    @dbus_deferred_method(APTDAEMON_DBUS_INTERFACE,
+                          in_signature="sss", out_signature="s",
+                          sender_keyword="sender")
+    def AddLicenseKey(self, pkg_name, json_token, server_name, sender):
+        """Install a license key to use a piece of proprietary software.
+
+        Requires the ``org.debian.apt.install-or-remove-packages``
+        :ref:`PolicyKit privilege <policykit>`.
+
+        :param pkg_name: The name of the package which requires the license
+        :type pkg_name: s
+        :param json_token: The oauth token to use with the server in json format
+        :type pkg_name: s
+        :param pkg_name: The name of the server to use 
+                         (ubuntu-production, ubuntu-staging)
+        :type pkg_name: s
+
+        :returns: The D-Bus path of the new transaction object which
+            performs this action.
+        """
+        log.info("AddLicenseKey() was called")
+        return self._create_trans(enums.ROLE_ADD_LICENSE_KEY, sender,
+                                  kwargs={'pkg_name': pkg_name,
+                                          'json_token' : json_token,
+                                          'server_name' : server_name,
+                                          })
+
     @inline_callbacks
     def _set_property(self, iface, name, value, sender):
         """Helper to set a property on the properties D-Bus interface."""

=== modified file 'aptdaemon/enums.py'
--- aptdaemon/enums.py	2011-10-24 12:30:38 +0000
+++ aptdaemon/enums.py	2011-11-10 14:28:46 +0000
@@ -35,6 +35,9 @@
            "ERROR_PACKAGE_MANAGER_FAILED", "ERROR_CACHE_BROKEN",
            "ERROR_PACKAGE_UNAUTHENTICATED", "ERROR_INCOMPLETE_INSTALL",
            "ERROR_UNREADABLE_PACKAGE_FILE", "ERROR_INVALID_PACKAGE_FILE",
+           "ERROR_LICENSE_KEY_PATH_INVALID", "ERROR_LICENSE_KEY_PATH_UNSECURE",
+           "ERROR_LICENSE_KEY_ALREADY_EXISTS", "ERROR_LICENSE_KEY_INVALID",
+           "ERROR_LICENSE_KEY_SERVER",
            "ERROR_UNKNOWN",
            "STATUS_SETTING_UP", "STATUS_WAITING", "STATUS_WAITING_MEDIUM",
            "STATUS_WAITING_CONFIG_FILE_PROMPT", "STATUS_WAITING_LOCK",
@@ -48,6 +51,7 @@
            "ROLE_REMOVE_VENDOR_KEY", "ROLE_FIX_INCOMPLETE_INSTALL",
            "ROLE_FIX_BROKEN_DEPENDS", "ROLE_ADD_REPOSITORY",
            "ROLE_ENABLE_DISTRO_COMP", "ROLE_CLEAN", "ROLE_RECONFIGURE",
+           "ROLE_ADD_LICENSE_KEY",
            "DOWNLOAD_DONE", "DOWNLOAD_AUTH_ERROR", "DOWNLOAD_ERROR",
            "DOWNLOAD_FETCHING", "DOWNLOAD_IDLE", "DOWNLOAD_NETWORK_ERROR",
            "PKG_INSTALLING", "PKG_CONFIGURING", "PKG_REMOVING",
@@ -143,6 +147,16 @@
 ERROR_UNREADABLE_PACKAGE_FILE = "error-unreadable-package-file"
 #: The package file violates the Debian/Ubuntu policy
 ERROR_INVALID_PACKAGE_FILE = "error-invalid-package-file"
+#: The license key path is not provided from a trusted source
+ERROR_LICENSE_KEY_PATH_INVALID = "error-license-key-path-invalid"
+#: The license key path is not provided from a trusted source
+ERROR_LICENSE_KEY_PATH_UNSECURE = "error-license-key-path-unsecure"
+#: The license key can not be retrivied from the server
+ERROR_LICENSE_KEY_SERVER = "error-license-key-server"
+#: The license key is already installed
+ERROR_LICENSE_KEY_ALREADY_EXISTS = "error-license-key-already-exists"
+#: The license key is invalid
+ERROR_LICENSE_KEY_INVALID = "error-license-key-invalid"
 #: An unknown error occured. In most cases these are programming ones.
 ERROR_UNKNOWN = "error-unknown"
 
@@ -253,6 +267,8 @@
 ROLE_RECONFIGURE = "role-reconfigure"
 #: The transaction will remove all downloaded package files.
 ROLE_CLEAN = "role-clean"
+#: The transaction will add a license key to the system
+ROLE_ADD_LICENSE_KEY = "role-add-license-key"
 
 # DOWNLOAD STATES
 #: The download has been completed.
@@ -434,6 +450,7 @@
     ROLE_ENABLE_DISTRO_COMP: _("Enabling component of the distribution failed"),
     ROLE_CLEAN: _("Removing downloaded package files failed"),
     ROLE_RECONFIGURE: _("Removing downloaded package files failed"),
+    ROLE_ADD_LICENSE_KEY: _("Adding license key"),
     ROLE_UNSET: ""
     }
 

=== added directory 'aptdaemon/piston'
=== added file 'aptdaemon/piston/__init__.py'
=== added file 'aptdaemon/piston/scaclient.py'
--- aptdaemon/piston/scaclient.py	1970-01-01 00:00:00 +0000
+++ aptdaemon/piston/scaclient.py	2011-11-10 14:28:46 +0000
@@ -0,0 +1,55 @@
+from piston_mini_client import (PistonAPI, PistonResponseObject,
+    returns_list_of, returns_json)
+from piston_mini_client.validators import (validate_pattern, validate,
+    oauth_protected)
+
+# These are factored out as constants for if you need to work against a
+# server that doesn't support both schemes (like http-only dev servers)
+PUBLIC_API_SCHEME = 'http'
+AUTHENTICATED_API_SCHEME = 'https'
+
+class SoftwareCenterAgentAPI(PistonAPI):
+    default_service_root = 'http://localhost:8000/api/2.0'
+
+    @validate_pattern('lang', r'[^/]{1,9}$')
+    @validate_pattern('series', r'[^/]{1,20}$')
+    @validate_pattern('arch', r'[^/]{1,10}$')
+    @returns_list_of(PistonResponseObject)
+    def available_apps(self, lang, series, arch):
+        """Retrieve the list of currently available apps for purchase."""
+        return self._get(
+            'applications/%s/ubuntu/%s/%s/' % (lang, series, arch),
+            scheme=PUBLIC_API_SCHEME)
+
+    @validate_pattern('lang', r'[^/]{1,9}$')
+    @validate_pattern('series', r'[^/]{1,20}$')
+    @validate_pattern('arch', r'[^/]{1,10}$')
+    @oauth_protected
+    @returns_list_of(PistonResponseObject)
+    def available_apps_qa(self, lang, series, arch):
+        """Retrieve the list of currently available apps for purchase."""
+        return self._get(
+            'applications_qa/%s/ubuntu/%s/%s/' % (lang, series, arch),
+            scheme=AUTHENTICATED_API_SCHEME)
+
+    @oauth_protected
+    @validate('complete_only', bool, required=False)
+    @returns_list_of(PistonResponseObject)
+    def subscriptions_for_me(self, complete_only=False):
+        return self._get('subscriptions/',
+            args={'complete_only': complete_only},
+            scheme=AUTHENTICATED_API_SCHEME)
+
+    @oauth_protected
+    @validate('id', int)
+    @returns_json
+    def subscription_by_id(self, id=None):
+        return self._get('subscription/%d' % (id),
+                         scheme=AUTHENTICATED_API_SCHEME)
+
+    @validate_pattern('lang', r'[^/]{1,9}$')
+    @returns_list_of(PistonResponseObject)
+    def exhibits(self, lang):
+        """Retrieve the list of currently published exhibits."""
+        return self._get(
+            'exhibits/%s/' % (lang))

=== modified file 'aptdaemon/worker.py'
--- aptdaemon/worker.py	2011-09-18 06:31:09 +0000
+++ aptdaemon/worker.py	2011-11-10 14:28:46 +0000
@@ -25,6 +25,7 @@
 import logging
 import os
 import re
+import json
 import shutil
 import sys
 import tempfile
@@ -61,6 +62,7 @@
 # core.Transaction.gettext
 _ = lambda s: s
 
+
 class AptWorker(gobject.GObject):
 
     """Worker which processes transactions from the queue."""
@@ -69,6 +71,9 @@
                                         gobject.TYPE_NONE,
                                         (gobject.TYPE_PYOBJECT,))}
 
+    # the basedir under which license keys can be stored
+    LICENSE_KEY_ROOTDIR = "/opt/"
+
     def __init__(self, chroot=None):
         """Initialize a new AptWorker instance."""
         gobject.GObject.__init__(self)
@@ -204,6 +209,8 @@
             elif trans.role == ROLE_UPDATE_CACHE:
                 self.update_cache(trans, **trans.kwargs)
             # Process the transactions which require a consistent cache
+            elif trans.role == ROLE_ADD_LICENSE_KEY:
+                self.add_license_key(trans, **trans.kwargs)
             elif self._cache and self._cache.broken_count:
                 broken = [pkg.name for pkg in self._cache if pkg.is_now_broken]
                 raise TransactionFailed(ERROR_CACHE_BROKEN,
@@ -1168,6 +1175,113 @@
                     log.debug("Removing file %s", path)
                     os.remove(path)
 
+    def add_license_key(self, trans, pkg_name, json_token, server_name):
+        """Add a license key data to the given package.
+
+        Keyword arguemnts:
+        trans -- the coresponding transaction
+        pkg_name -- the name of the corresponding package
+        json_token -- the oauth token as json
+        server_name -- the server to use (ubuntu-production, ubuntu-staging)
+        """
+        # set transaction state to downloading
+        trans.status = STATUS_DOWNLOADING
+        rootdir = apt_pkg.config["Dir"]
+        license_key_helper = os.path.join(
+            rootdir, "usr/share/aptdaemon/helper/ubuntu-license-key-helper")
+        cmd = [license_key_helper,
+               "--server", server_name,
+               "--pkgname", pkg_name,
+              ]
+        proc = subprocess.Popen(cmd,
+                                stdin=subprocess.PIPE,
+                                stderr=subprocess.PIPE,
+                                stdout=subprocess.PIPE, 
+                                preexec_fn=lambda: os.setuid(trans.uid),
+                                close_fds=True)
+        # send json token to the process
+        proc.stdin.write(json_token + "\n")
+        # wait until it finishes
+        while proc.poll() is None:
+            while gobject.main_context_default().pending():
+                gobject.main_context_default().iteration()
+            time.sleep(0.05)
+
+        if proc.returncode != 0:
+            stderr = unicode(proc.stderr.read(),
+                             sys.stdin.encoding or "UTF-8",
+                             errors="replace")
+            raise TransactionFailed(ERROR_LICENSE_KEY_SERVER, stderr)
+
+        # get data from stdout
+        license_key_path = proc.stdout.readline().strip()
+        license_key = proc.stdout.read()
+
+        # ensure stuff is good
+        if not license_key_path or not license_key:
+            raise TransactionFailed(
+                ERROR_LICENSE_KEY_SERVER,
+                _("Recived no license key data from the server."))
+
+        # add license key if we have one
+        self._add_license_key_to_system(pkg_name,
+                                        license_key, 
+                                        license_key_path)
+
+
+    def _add_license_key_to_system(self, pkg_name, license_key, license_key_path):
+        # fixup path
+        license_key_path = os.path.join(apt_pkg.config.find_dir("Dir"),
+                                        license_key_path.lstrip("/"))
+
+        # Perform some very basic security checks
+
+        # Check content of the key
+        if (license_key.strip().startswith("#!") or
+            license_key.startswith("\x7fELF")):
+            raise TransactionFailed(ERROR_LICENSE_KEY_INVALID,
+                                    _("The license key is not allowed to "
+                                      "contain executable code."))
+        # Perform some very basic security checks
+        license_key_path = os.path.normpath(license_key_path)
+        license_key_path_rootdir = os.path.join(apt_pkg.config["Dir"],
+                                           self.LICENSE_KEY_ROOTDIR.lstrip("/"),
+                                           pkg_name)
+        if not license_key_path.startswith(license_key_path_rootdir):
+            raise TransactionFailed(ERROR_LICENSE_KEY_PATH_INVALID,
+                                    _("The license key path %s is invalid"),
+                                    license_key_path)
+        if os.path.lexists(license_key_path):
+            raise TransactionFaild(ERROR_LICENSE_KEY_ALREADY_INSTALLED,
+                                   _("The license key already exists: %s"),
+                                   license_key_path)
+        # Symlink attacks!
+        if os.path.realpath(license_key_path) != license_key_path:
+            raise TransactionFailed(ERROR_LICENSE_KEY_PATH_INVALID,
+                                   _("The location of the license key is "
+                                     "unsecure since it contains symbolic "
+                                     "links. The path %s maps to %s"),
+                                     license_key_path,
+                                     os.path.realpath(licese_key_path))
+        # Check if the directory already exists
+        if not os.path.isdir(os.path.dirname(license_key_path)):
+            raise TransactionFailed(ERROR_LICENSE_KEY_PATH_INVALID,
+                                   _("The directory where to install the key "
+                                     "to doesn't exist yet: %s"),
+                                   license_key_path)
+        # write it
+        log.info("Writing license key to '%s'" % license_key_path)
+        old_umask = os.umask(18)
+        try:
+            with open(license_key_path, "w") as license_file:
+                license_file.write(license_key)
+        except IOError:
+            raise TransactionFailed(ERROR_LICENSE_KEY_PATH_INVALID,
+                                    _("Failed to write key file to: %s"),
+                                    license_key_path)
+        finally:
+            os.umask(old_umask)
+ 
     def _get_broken_details(self, trans, now=True):
         """Return a message which provides debugging information about
         broken packages.

=== added directory 'helper'
=== added file 'helper/ubuntu-license-key-helper'
--- helper/ubuntu-license-key-helper	1970-01-01 00:00:00 +0000
+++ helper/ubuntu-license-key-helper	2011-11-10 14:28:46 +0000
@@ -0,0 +1,68 @@
+#!/usr/bin/python
+
+import json
+from optparse import OptionParser
+import sys
+
+from aptdaemon.piston.scaclient import SoftwareCenterAgentAPI
+import piston_mini_client.auth
+
+import gettext
+gettext.install("aptdaemon")
+
+if __name__ == "__main__":
+
+    parser = OptionParser()
+    parser.add_option("-s", "--server", default="ubuntu-production")
+    parser.add_option("-p", "--pkgname")
+    (options, args) = parser.parse_args()
+    
+    # server to use
+    if options.server == "ubuntu-production":
+        server = "http://software-center.ubuntu.com/api/2.0"
+    elif options.server == "ubuntu-staging":
+        server = "https://sc.staging.ubuntu.com/api/2.0"
+    else:
+        raise Exception("Unknown license key server")
+    SoftwareCenterAgentAPI.default_service_root = server
+
+    # pkgname
+    pkgname = options.pkgname
+
+    # wait for oauth token on stdin
+    json_token = sys.stdin.readline()
+    token = json.loads(json_token)
+       
+    # get the data
+    auth = piston_mini_client.auth.OAuthAuthorizer(token["token_key"],
+                                                   token["token_secret"],
+                                                   token["consumer_key"],
+                                                   token["consumer_secret"])
+    
+    api = SoftwareCenterAgentAPI(auth=auth)
+
+    
+    try:
+        subscriptions =  api.subscriptions_for_me(complete_only=True)
+    except piston_mini_client.APIError as e:
+        sys.stderr.write(_("Failed to get the license key from "
+                           "the server."))
+        sys.exit(1)
+
+    license_key = None
+    license_key_path = None
+    for subscription in subscriptions:
+        if subscription.application["package_name"] == pkg_name:
+            license_key = subscription.license_key
+            license_key_path = subscription.license_key_path
+
+    if license_key and license_key_path:
+        sys.stdout.write(license_key_path)
+        sys.stdout.write(license_key)
+        sys.exit(0)
+
+    # generic error
+    sys.stderr.write(_("Failed to get the license key from "
+                       "the server."))
+    sys.exit(1)
+       

=== modified file 'setup.py'
--- setup.py	2011-08-26 06:37:34 +0000
+++ setup.py	2011-11-10 14:28:46 +0000
@@ -20,7 +20,8 @@
       long_description=readme,
       author="Sebastian Heinlein",
       author_email="[e-mail]",
-      packages=["aptdaemon"],
+      packages=["aptdaemon", 
+                "aptdaemon.piston"],
       scripts=["aptd", "aptdcon"],
       test_suite="unittest2.collector",
       license="GNU LGPL",
@@ -47,7 +48,10 @@
                    ["doc/aptd.1", "doc/aptdcon.1"]),
                   ("share/man/man7",
                    ["doc/org.debian.apt.7",
-                    "doc/org.debian.apt.transaction.7"])],
+                    "doc/org.debian.apt.transaction.7"]),
+                  ("share/aptdaemon/helper",
+                   glob.glob("helper/*")),
+                  ],
       platforms="posix",
       use_2to3=sys.version_info[0] >= 3,
       )

=== modified file 'tests/repo/Packages'
--- tests/repo/Packages	2011-01-10 07:37:44 +0000
+++ tests/repo/Packages	2011-11-10 14:28:46 +0000
@@ -1,61 +1,3 @@
-Package: silly-fail
-Priority: extra
-Section: admin
-Installed-Size: 36
-Maintainer: Sebastian Heinlein <[e-mail]>
-Architecture: all
-Source: silly-packages
-Version: 0.1-0
-Filename: ./silly-fail_0.1-0_all.deb
-Size: 1874
-MD5sum: 623a67e49bb7a1351a9bf1ae72fc6cfb
-SHA1: 76417770f2b788b680ef18be66b5a6c4ec51bc62
-SHA256: 45fea3eb64a427a288a90b12f42cc3a6abea8e8387efd4879b319db736890ebd
-Description: installation fails
- Silly packages is a set of packages which will break your package
- management tool. They are created only for debugging purposes.
- .
- This installation of this package will always fail.
-
-Package: silly-depend-base
-Priority: extra
-Section: admin
-Installed-Size: 32
-Maintainer: Sebastian Heinlein <[e-mail]>
-Architecture: all
-Source: silly-packages
-Version: 0.1-0
-Depends: silly-base
-Filename: ./silly-depend-base_0.1-0_all.deb
-Size: 1812
-MD5sum: 3ee7181283e4926558d2afdf7b2657f1
-SHA1: 8294794b1727e22b123866f9124431a2c7b79380
-SHA256: 5fa74f7bdc0d207188790419130330becb0cf7484a972762ed512090885016f9
-Description: package depending on silly-base
- Silly packages is a set of packages which will break your package
- management tool. They are created only for debugging purposes.
- .
- This package depends on silly-base.
-
-Package: silly-config
-Priority: extra
-Section: admin
-Installed-Size: 44
-Maintainer: Sebastian Heinlein <[e-mail]>
-Architecture: all
-Source: silly-packages
-Version: 0.1-0
-Filename: ./silly-config_0.1-0_all.deb
-Size: 1928
-MD5sum: 565698b052640ed3d514f6b38ad457c7
-SHA1: e7169cc58f10e8ff9481cf31b2ffb947bc99f617
-SHA256: 255f025bae5b24a91158e7daa986f9bf59146ab1895f39452104eb97c412d190
-Description: wants to update a locally changed config file
- Silly packages is a set of packages which will break your package
- management tool. They are created only for debugging purposes.
- .
- This package will install a configuration file.
-
 Package: silly-postinst-input
 Priority: extra
 Section: admin
@@ -75,44 +17,6 @@
  .
  This package will wait for user input in the postinst script.
 
-Package: silly-base
-Priority: extra
-Section: admin
-Installed-Size: 44
-Maintainer: Sebastian Heinlein <[e-mail]>
-Architecture: all
-Source: silly-packages (0.1-0)
-Version: 0.1-0update1
-Filename: ./silly-base_0.1-0update1_all.deb
-Size: 1934
-MD5sum: 8e20af56a63a1e0cf40db3b0d07e7989
-SHA1: 7ce87423d9c7a734478c464021994944d07fbf1b
-SHA256: d3693c0e3e7a9519b2833fdf1301c7e03e0620edf15b95b4c7329d9eb0bee553
-Description: working package
- Silly packages is a set of packages which will break your package
- management tool. They are created only for debugging purposes.
- .
- This package doesn't contain any files and should always be installable.
-
-Package: silly-base
-Priority: extra
-Section: admin
-Installed-Size: 32
-Maintainer: Sebastian Heinlein <[e-mail]>
-Architecture: all
-Source: silly-packages
-Version: 0.1-0
-Filename: ./silly-base_0.1-0_all.deb
-Size: 1824
-MD5sum: 81ba1cf86142c466f35a36a11b5b7b52
-SHA1: f949c8e5962a43fbcd4f7d67df0ebe741052c497
-SHA256: a7c2a30abdb6488d5c3d2894db398f5dfafbc6be098da1135822be4e3ac94b32
-Description: working package
- Silly packages is a set of packages which will break your package
- management tool. They are created only for debugging purposes.
- .
- This package doesn't contain any files and should always be installable.
-
 Package: gstreamer0.10-silly
 Priority: extra
 Section: admin
@@ -133,6 +37,25 @@
  .
  This package is a GStreamer test plugin package.
 
+Package: silly-base
+Priority: extra
+Section: admin
+Installed-Size: 44
+Maintainer: Sebastian Heinlein <[e-mail]>
+Architecture: all
+Source: silly-packages (0.1-0)
+Version: 0.1-0update1
+Filename: ./silly-base_0.1-0update1_all.deb
+Size: 1934
+MD5sum: 8e20af56a63a1e0cf40db3b0d07e7989
+SHA1: 7ce87423d9c7a734478c464021994944d07fbf1b
+SHA256: d3693c0e3e7a9519b2833fdf1301c7e03e0620edf15b95b4c7329d9eb0bee553
+Description: working package
+ Silly packages is a set of packages which will break your package
+ management tool. They are created only for debugging purposes.
+ .
+ This package doesn't contain any files and should always be installable.
+
 Package: silly-essential
 Essential: yes
 Priority: extra
@@ -153,6 +76,25 @@
  .
  This package is an essential one.
 
+Package: silly-base
+Priority: extra
+Section: admin
+Installed-Size: 32
+Maintainer: Sebastian Heinlein <[e-mail]>
+Architecture: all
+Source: silly-packages
+Version: 0.1-0
+Filename: ./silly-base_0.1-0_all.deb
+Size: 1824
+MD5sum: 81ba1cf86142c466f35a36a11b5b7b52
+SHA1: f949c8e5962a43fbcd4f7d67df0ebe741052c497
+SHA256: a7c2a30abdb6488d5c3d2894db398f5dfafbc6be098da1135822be4e3ac94b32
+Description: working package
+ Silly packages is a set of packages which will break your package
+ management tool. They are created only for debugging purposes.
+ .
+ This package doesn't contain any files and should always be installable.
+
 Package: silly-important
 Priority: important
 Section: admin
@@ -172,6 +114,27 @@
  .
  This package is an essential one.
 
+Package: silly-license
+Essential: yes
+Priority: extra
+Section: admin
+Installed-Size: 44
+Maintainer: Sebastian Heinlein <[e-mail]>
+Architecture: all
+Source: silly-packages
+Version: 0.1-0
+Filename: ./silly-license_0.1-0_all.deb
+Size: 3884
+MD5sum: 8498a97dd25e37760f26e215dc16668e
+SHA1: b42846a26132fc771ec2bd8e7eb07e17041c501b
+SHA256: 1eed24cbaa3e5dd54a7e5302b98ab8b1e97c1433f6e9bb1e14f641994249a323
+Description: package with optional license key
+ Silly packages is a set of packages which will break your package
+ management tool. They are created only for debugging purposes.
+ .
+ This package provides allows to install an optional license key file.
+Licensekeypath: /opt/silly-license/NASTY.KEY
+
 Package: silly-broken
 Priority: extra
 Section: admin
@@ -192,3 +155,81 @@
  .
  This package cannot be installed because of a missing dependency.
 
+Package: silly-config
+Priority: extra
+Section: admin
+Installed-Size: 44
+Maintainer: Sebastian Heinlein <[e-mail]>
+Architecture: all
+Source: silly-packages
+Version: 0.1-0
+Filename: ./silly-config_0.1-0_all.deb
+Size: 1928
+MD5sum: 565698b052640ed3d514f6b38ad457c7
+SHA1: e7169cc58f10e8ff9481cf31b2ffb947bc99f617
+SHA256: 255f025bae5b24a91158e7daa986f9bf59146ab1895f39452104eb97c412d190
+Description: wants to update a locally changed config file
+ Silly packages is a set of packages which will break your package
+ management tool. They are created only for debugging purposes.
+ .
+ This package will install a configuration file.
+
+Package: silly-depend-base-lintian-broken
+Priority: extra
+Section: admin
+Installed-Size: 32
+Architecture: all
+Source: silly-packages
+Version: 0.1-0
+Depends: silly-base
+Filename: ./silly-depend-base-lintian-broken_0.1-0_all.deb
+Size: 1758
+MD5sum: ba9e0b746b08fae8f8a8fbb4cf9ba41e
+SHA1: 8bcaf6034b09383e461f0e366762e6b6683e69e2
+SHA256: ff1302170d232c21ab66f332e38c51b2af9b6d06d8f377ae5944465be9467c22
+Description: package depending on silly-base (but lintian broken)
+ Silly packages is a set of packages which will break your package
+ management tool. They are created only for debugging purposes.
+ .
+ This package depends on silly-base and has no "Maintainer" set
+ and the file owner is totally wrong so lintian complains about it.
+
+Package: silly-fail
+Priority: extra
+Section: admin
+Installed-Size: 36
+Maintainer: Sebastian Heinlein <[e-mail]>
+Architecture: all
+Source: silly-packages
+Version: 0.1-0
+Filename: ./silly-fail_0.1-0_all.deb
+Size: 1874
+MD5sum: 623a67e49bb7a1351a9bf1ae72fc6cfb
+SHA1: 76417770f2b788b680ef18be66b5a6c4ec51bc62
+SHA256: 45fea3eb64a427a288a90b12f42cc3a6abea8e8387efd4879b319db736890ebd
+Description: installation fails
+ Silly packages is a set of packages which will break your package
+ management tool. They are created only for debugging purposes.
+ .
+ This installation of this package will always fail.
+
+Package: silly-depend-base
+Priority: extra
+Section: admin
+Installed-Size: 32
+Maintainer: Sebastian Heinlein <[e-mail]>
+Architecture: all
+Source: silly-packages
+Version: 0.1-0
+Depends: silly-base
+Filename: ./silly-depend-base_0.1-0_all.deb
+Size: 1812
+MD5sum: 3ee7181283e4926558d2afdf7b2657f1
+SHA1: 8294794b1727e22b123866f9124431a2c7b79380
+SHA256: 5fa74f7bdc0d207188790419130330becb0cf7484a972762ed512090885016f9
+Description: package depending on silly-base
+ Silly packages is a set of packages which will break your package
+ management tool. They are created only for debugging purposes.
+ .
+ This package depends on silly-base.
+

=== modified file 'tests/repo/Release'
--- tests/repo/Release	2011-01-10 07:37:44 +0000
+++ tests/repo/Release	2011-11-10 14:28:46 +0000
@@ -1,10 +1,10 @@
-Date: Mo, 10 Jan 2011 07:25:04 UTC
+Date: Di, 23 Aug 2011 11:53:15 UTC
 MD5Sum:
- 76890eae32625a32d270e667eadf7672             6466 Packages
+ a4c8c6d48d8429c070d8b2a19c900428             7902 Packages
  d41d8cd98f00b204e9800998ecf8427e                0 Release
 SHA1:
- ad2d57d7fb357429bdf72bd84a30a0ecaf427ccf             6466 Packages
+ 5a3ddd070333e9954d92c20397883a5e58ca86e0             7902 Packages
  da39a3ee5e6b4b0d3255bfef95601890afd80709                0 Release
 SHA256:
- 0a755d4bc1cf098032ba2b74764fcf8f5c22d0c0e5944a0d63032db55af036fa             6466 Packages
+ b7d04a99c3907fa1b0521f2130935fc48597d56739134d2e5453635bf530c015             7902 Packages
  e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 Release

=== modified file 'tests/repo/Release.gpg'
--- tests/repo/Release.gpg	2011-01-10 07:37:44 +0000
+++ tests/repo/Release.gpg	2011-11-10 14:28:46 +0000
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
-iQEcBAABCAAGBQJNKrRcAAoJEGg8U8fPmC0Y0bgIAMJUX9WLV2KMJFtIts+6mI+J
-stbq5GviUNPMVlp1eoVY4aGG+DHx0xtMBfxiBbW6QBrreAttrxXujwe1Jn85qcbn
-Gzz6rSvK999KZN/XjZskKa01hcpA2qYuRLn0buJ2BWno9jBmaZqxbL7aKargh9LJ
-dVDk+/Bw4inTN7I7iboQDGiUTGH88IB4kCO1Xu8hKExicoKvfSu6JtIaTCKhqbpm
-F0PLq/tXwSaBAeHzHqvKXDi5YOFVmeePv6ACUq/MEi3wnvRt+LRIyaZW+TBIc3zW
-yqyeQjTZ2DM9JoE+8F9e4M93KI+t1jwkcM2fWYmpar3ThoLLjdm+KpO5xTVtkvw=
-=6oo7
+iQEcBAABCAAGBQJOU5UdAAoJEGg8U8fPmC0Y8b0IAJJx/g2AXbf743kynB8hM87B
+OzBEdOol3ekdCnryiwxCRiUS1eNCHl2WUMD2wbC7aTU34fmJk7cjAoCiBIEImJXS
+EFN56YM4nhHoC1dUvOsaNHTMzkHpAuYO1Fjy0WiBELqgk4g/+ADZWiJa8zyFghpi
+g48GFMLHBpfNL53MJFwBLjORCBNtrZLhUi0oXkzyRM81gi6k6ds09pyyUiJwdAI8
+ovSPbFHzqSiuefRtxpQk9cyvuaUD40XLAwHBIW2mLOvXsYocRwhR7XCA2d9rJuvO
+EXxb2ALypcwHDZEh2FtNZwbqK+7BNf4RPIAVFjzp7ORB3BLEqyDiQdmUKlEqqZ8=
+=mZj1
 -----END PGP SIGNATURE-----

=== added file 'tests/repo/silly-license_0.1-0_all.deb'
Binary files tests/repo/silly-license_0.1-0_all.deb	1970-01-01 00:00:00 +0000 and tests/repo/silly-license_0.1-0_all.deb	2011-11-10 14:28:46 +0000 differ
=== modified file 'tests/test_client.py'
--- tests/test_client.py	2011-09-15 14:23:50 +0000
+++ tests/test_client.py	2011-11-10 14:28:46 +0000
@@ -6,8 +6,10 @@
 import time
 import unittest2
 
+import dbus
 import defer
-import dbus
+import os
+import json
 
 import aptdaemon.client
 import aptdaemon.loop
@@ -77,6 +79,43 @@
             exit = f(*args, wait=True)
             self.assertEqual(exit, aptdaemon.enums.EXIT_SUCCESS)
 
+    def test_add_license_key(self):
+        os.makedirs(os.path.join(self.chroot.path, "opt/silly-pkg"))
+        helper_dir = os.path.join(self.chroot.path, "usr/share/aptdaemon/helper/") 
+        os.makedirs(helper_dir)
+        # data
+        license_key = "Bli bla blub. I am a BLOB"
+        license_key_path = "/opt/silly-pkg/NASTY.KEY"
+        # write out mock helper
+        helper = os.path.join(helper_dir, "ubuntu-license-key-helper")
+        f=open(helper, "w")
+        f.write("""#!/bin/sh
+echo "%s"
+echo -n "%s"
+""" % (license_key_path, license_key))
+        f.close()
+        os.chmod(helper, 0755)
+        # run test
+        chroot_license_key_path = os.path.join(
+            self.chroot.path, license_key_path[1:])
+        client = aptdaemon.client.AptClient(self.bus)
+        json_token = json.dumps({'token_key' : 'key',
+                                 'token_secret' : 'token_secret',
+                                 'consumer_key' : 'consumer_key',
+                                 'consumer_secret' : 'consumer_secret',
+                                 'subscription_id' : '99',
+                                 'api_version' : '2.0',
+                                })
+        trans = client.add_license_key(
+            "silly-pkg", json_token, "mock")
+        trans.connect("finished", self._on_finished)
+        trans.run()
+        aptdaemon.loop.mainloop.run()
+        self.assertEqual(trans.exit, aptdaemon.enums.EXIT_SUCCESS,
+                         trans.error)
+        self.assertEqual(license_key, open(chroot_license_key_path, "r").read(),
+                         "Specified and stored license key don't match")
+
 
 if __name__ == "__main__":
     if DEBUG:

=== added file 'tests/test_helper.py'
--- tests/test_helper.py	1970-01-01 00:00:00 +0000
+++ tests/test_helper.py	2011-11-10 14:28:46 +0000
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""Tests the helper scripts."""
+
+import logging
+import time
+import unittest2
+
+import dbus
+import defer
+import os
+import json
+import subprocess
+
+import aptdaemon.client
+import aptdaemon.loop
+import aptdaemon.enums
+
+import aptdaemon.test
+
+class HelperTest(aptdaemon.test.AptDaemonTestCase):
+    
+    def setUp(self):
+        basedir = os.path.dirname(__file__)
+        self.basedir = os.path.abspath(os.path.join(basedir, ".."))
+        self.helperdir = os.path.join(self.basedir, "helper")
+    
+    def test_ubuntu_license_key_helper(self):
+        license_key_helper = os.path.join(
+            self.helperdir, "ubuntu-license-key-helper")
+
+        os.environ["PYTHONPATH"] = self.basedir
+
+        p = subprocess.Popen([license_key_helper,
+                              "--pkgname", "2vcard",
+                              "--server", "ubuntu-production"],
+                             stdin=subprocess.PIPE,
+                             stdout=subprocess.PIPE,
+                             stderr=subprocess.PIPE)
+        token = {}
+        token["token_key"] = "foo"
+        token["token_secret"] = "bar"
+        token["consumer_key"] = "baz"
+        token["consumer_secret"] = "foobar"
+        #print json.dumps(token)
+        p.stdin.write(json.dumps(token) + "\n")
+        p.wait()
+        # it fails, that is expected
+        self.assertEqual(p.returncode, 1)
+        stderr = p.stderr.read()
+        stdout = p.stdout.read()
+        self.assertEqual(stdout, "")
+        self.assertEqual(
+            stderr, "Failed to get the license key from the server.")
+        
+
+if __name__ == "__main__":
+    unittest2.main()
+
+# vim: ts=4 et sts=4

=== modified file 'tests/test_worker.py'
--- tests/test_worker.py	2011-09-18 06:29:49 +0000
+++ tests/test_worker.py	2011-11-10 14:28:46 +0000
@@ -30,7 +30,6 @@
 import dbus
 import gobject
 
-
 import aptdaemon.test
 from aptdaemon.worker import AptWorker
 from aptdaemon.core import Transaction
@@ -312,6 +311,41 @@
         self.worker._cache.open()
         self.assertEqual(self.worker._cache.broken_count, 0)
 
+    def test_add_license_key_unsecure(self):
+        """Test if we refuse to install license key files to an unsecure
+        location."""
+        self.chroot.add_test_repository(copy_sig=False)
+        # Should fail because of an untrusted source
+        license_key = "NASTY_BLOB"
+        license_key_path = "/opt/silly-license/NASTY.KEY"
+        pkg_name = "silly-license"
+        self.assertRaises(errors.TransactionFailed, 
+                          self.worker._add_license_key_to_system, 
+                          pkg_name, license_key, license_key_path)
+
+    def test_add_license_key(self):
+        """Test the installation of license key files."""
+        self.chroot.add_test_repository()
+        # Check if we don't allow to install executables
+        with open("/bin/ls", "r") as sample_exec:
+            license_key = sample_exec.read()
+        license_key_path = "/opt/silly-license/NASTY.KEY"
+        pkg_name = "silly-license"
+        self.assertRaises(errors.TransactionFailed, 
+                          self.worker._add_license_key_to_system, 
+                          pkg_name, license_key, license_key_path)
+        # Should finally work
+        os.makedirs(os.path.join(
+                aptdaemon.worker.apt_pkg.config["Dir"], "opt/silly-license/"))
+        license_key = "some key"
+        license_key_path = "/opt/silly-license/NASTY.KEY"
+        self.worker._add_license_key_to_system(pkg_name, license_key, license_key_path)
+        # Check the content of the installed key
+        license_key_path = os.path.join(aptdaemon.worker.apt_pkg.config["Dir"],
+                                        "opt/silly-license/NASTY.KEY")
+        self.assertEqual(license_key, open(license_key_path).read(),
+                         "Content of license key doesn't match")
+
 
 if __name__ == "__main__":
     unittest2.main()