Merge lp:~apachelogger/ubuntuone-client/kwallet-support into lp:ubuntuone-client

[Harald Sitter]

Enable syncdaemon to get tokens from kwallet if present and accessible (falls back to gnome-keyring if that is also present).

Covered cases:
KDE with ubuntuone-kde: kwallet -> success -> hooray
KDE without ubuntuone-kde: kwallet -> fail -> try gnomekeyring -> success -> hooray
GNOME: gnomekeyring -> success -> hooray

(ubuntuone-kde is not supported at this time so this case ought not to be covered, OTOH it might be neat to support it nether the less ... if you wish to do so, we can arange that with cilling the external process call and just try to import kwallet regardless of the environment.

[Tim Cole (tcole)]

review: Approve

[Rodrigo Moya (rodrigo-moya)]

We are removing the use of the gnome keyring since we are moving to use ubuntu-sso, which returns the credentials via DBus, so you'd better add kwallet support there, not here

review: Disapprove

[Guillermo Gonzalez (verterok)]

Hi,

Thanks a lot for putting this together!

Sadly, I must vote Disapprove.

The main reason is that ubuntu-sso will support returning the tokens via dbus, so the gnomekeyring dependency in syncdaemon will be removed as soon ubuntu-sso is ready.

review: Disapprove

Unmerged revisions

602. By Harald Sitter on 2010-07-28

actually ubuntuone-kde uses "ubuntuone" as folder since the realm can be either one.ubuntu.com or ubuntuone.com

601. By Harald Sitter on 2010-07-28

Add as non-intrusive kwallet support as possible to the syncdaemon

=== modified file 'ubuntuone/syncdaemon/main.py'
--- ubuntuone/syncdaemon/main.py	2010-07-16 12:46:42 +0000
+++ ubuntuone/syncdaemon/main.py	2010-07-28 09:47:43 +0000
@@ -4,6 +4,7 @@
 #         John Lenton <[e-mail]>
 #
 # Copyright 2009 Canonical Ltd.
+# Copyright 2010 Harald Sitter <[e-mail]>
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -19,7 +20,6 @@
 """ SyncDaemon Main"""
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop
-import gnomekeyring
 import logging
 import os
 import sys
@@ -305,6 +305,51 @@
 
         If no token is available in the keyring, `NoAccessToken` is raised.
         """
+        import subprocess
+        try:
+            # kcheckrunning returns 0 iff KDE is running
+            k = subprocess.Popen(["kcheckrunning"]).wait()
+        except OSError:
+            # kcheckrunning not found -> no KDE session
+            k = 1
+
+        if k == 0:
+            try:
+                from PyKDE4.kdeui import KWallet
+                from PyQt4.QtCore import QCoreApplication
+
+                # KWallet uses a QEventLoop. This only works if a QApp is present.
+                # We only can have one instance - ever!
+                if QCoreApplication.instance() == None:
+                    a = QCoreApplication([""])
+                    a.setApplicationName("Ubuntu One Sync Daemon")
+
+                wallet = KWallet.Wallet.openWallet(KWallet.Wallet.LocalWallet(), 0, KWallet.Wallet.Synchronous)
+                if wallet.isOpen():
+                    if wallet.setFolder("ubuntuone"):
+                        fail, token = wallet.readPassword(self.consumer.key)
+                        if not fail and not token.isEmpty(): # For some reason fail is not really fail?
+                            return oauth.OAuthToken.from_string(str(token))
+                        else:
+                            raise NoAccessToken("No access token found.")
+                    else:
+                        raise NoAccessToken("Could not access token folder.")
+                else:
+                    raise NoAccessToken("Could not access wallet.")
+            # If PyKDE is missing or KWallet did not contain a token, try to use gnomekeyring:
+            except ImportError as error:
+                try:
+                    import gnomekeyring
+                except ImportError:
+                    raise error
+            except NoAccessToken as error:
+                try:
+                    import gnomekeyring
+                except ImportError:
+                    raise error
+        else: # If KDE is available we fall back to gnomekeyring in appropriate excepts.
+            import gnomekeyring
+
         try:
             items = gnomekeyring.find_items_sync(
                 gnomekeyring.ITEM_GENERIC_SECRET,