Merge lp:~roignac/gwibber/Bug441641 into lp:gwibber

[Vadim Rutkovsky]

This branch saves Gwibber preferences in Seahorse with name 'Gwibber <field name> for <username> on <service>' - e.g. 'Gwibber password for roignac on identica'.
Also, I've updated keyring code to be kept in one place and correctly being handled.

[Robert Bruce Park (robru)]

Thanks for taking the time to submit this patch, unfortunately Gwibber has gone through extensive changes recently and your patch no longer applies to the latest codebase.

Unfortunately, the feature you were attempting to fix has been superceded. Password management is now handled by Ubuntu Online Accounts, so Gwibber does not even have to worry about handling passwords in the first place.

Please try out the latest Gwibber, I think you'll be quite pleased with what we've accomplished.

review: Disapprove

Unmerged revisions

852. By Vadim Rutkovsky on 2010-09-13

Moved all keyring-related code to one library

851. By Vadim Rutkovsky on 2010-09-13

Moved to a format of string secrets in Seahorse

=== modified file 'gwibber/accounts.py'
--- gwibber/accounts.py	2010-09-03 19:03:56 +0000
+++ gwibber/accounts.py	2010-09-13 22:20:59 +0000
@@ -18,11 +18,6 @@
 # Accounts interface for Gwibber
 #
 
-try:
-  import gnomekeyring
-except:
-  gnomekeyring = None
-
 import gettext
 from gettext import lgettext as _
 if hasattr(gettext, 'bind_textdomain_codeset'):
@@ -35,6 +30,7 @@
 
 from gwibber.lib import GwibberPublic
 from gwibber.lib.gtk import *
+from microblog.util.keyring import GwibberKeyring
 
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
@@ -42,6 +38,7 @@
 class GwibberAccountManager(object):
   def __init__(self):
     self.gwibber = GwibberPublic()
+    self.keyring = GwibberKeyring()
     self.services = json.loads(self.gwibber.GetServices())
     
     self.ui = gtk.Builder()
@@ -115,21 +112,6 @@
     icf = resources.get_ui_asset("icons/breakdance/16x16/%s.png" % name)
     return gtk.gdk.pixbuf_new_from_file(icf) if os.path.exists(icf) else None
 
-  def get_from_keyring(self, acctid, name):
-    item = {"id": str("%s/%s" % (acctid, name))}
-    try:
-      return gnomekeyring.find_items_sync(gnomekeyring.ITEM_GENERIC_SECRET, item)[0].secret
-    except gnomekeyring.NoMatchError:
-      return None
-
-  def put_in_keyring(self, acctid, name, value):
-    id = "%s/%s" % (acctid, name)
-    return gnomekeyring.item_create_sync(
-        gnomekeyring.get_default_keyring_sync(),
-        gnomekeyring.ITEM_GENERIC_SECRET,
-        "Gwibber preference: %s" % id,
-        {"id": str(id)}, str(value), True)
-
   def populate_account_tree(self):
     self.account_store.clear()
     accounts = json.loads(self.gwibber.GetAccounts())
@@ -141,7 +123,7 @@
         for f in private_fields:
           if not account.has_key(f): account[f] = ":KEYRING:MISSING"
           if account[f].startswith(":KEYRING:"):
-            value = self.get_from_keyring(account["id"], f)
+            value =  self.keyring.get_value("Gwibber %s for %s on %s" % (f, account["username"], account["service"]))
             if value is None:
               color = "pink"
         self.account_store.append(None, [name, icon, account, color])
@@ -169,7 +151,7 @@
         for f in private_fields:
           if self.account[f].startswith(":KEYRING:"):
             keyring_id = int(self.account[f].split(":")[-1])
-            gnomekeyring.item_delete_sync(gnomekeyring.get_default_keyring_sync(), keyring_id)
+            self.keyring.delete_secret(keyring_id)
       except:
         pass  
       self.gwibber.accounts.Delete(self.account["id"])
@@ -198,8 +180,9 @@
 
       if is_private and self.account.has_key(config):
         if not self.account[config].startswith(":KEYRING:"):
-	  self.account[config] = ":KEYRING:%s" % self.put_in_keyring(
-	      self.account["id"], config, self.account[config])
+          keyringtext = "Gwibber %s for %s on %s" % (config, self.account["username"], self.account["service"]) 
+          self.account[config] = ":KEYRING:%s" % self.keyring.set_value(
+            keyringtext, self.account[config])
 
       if value:
         if isinstance(value, gtk.gdk.Color):
@@ -280,7 +263,8 @@
           
           if isinstance(widget, gtk.Entry):
             if is_private and account[config].startswith(":KEYRING:"):
-              value = self.get_from_keyring(account["id"], config)
+              value =  self.keyring.get_value("Gwibber %s for %s on %s" % 
+                (config, account["username"], account["service"]))
               if not value:
                 widget.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse("pink"))
             if value:

=== modified file 'gwibber/microblog/brightkite.py'
--- gwibber/microblog/brightkite.py	2010-08-19 12:50:51 +0000
+++ gwibber/microblog/brightkite.py	2010-09-13 22:20:59 +0000
@@ -14,9 +14,9 @@
   "version": 0.2,
   
   "config": [
-    "password",
     "username",
-    "message_color",
+    "private:password",
+    "color",
     "receive_enabled",
     "send_enabled"
   ],

=== modified file 'gwibber/microblog/buzz.py'
--- gwibber/microblog/buzz.py	2010-05-24 02:16:38 +0000
+++ gwibber/microblog/buzz.py	2010-09-13 22:20:59 +0000
@@ -6,12 +6,12 @@
   "version": "1.0",
 
   "config": [
+    "username",
     "color",
     "receive_enabled",
     "send_enabled",
-    "username",
     "access_token",
-    "secret_token",
+    "private:secret_token",
   ],
 
   "authtype": "oauth1a",

=== modified file 'gwibber/microblog/dispatcher.py'
--- gwibber/microblog/dispatcher.py	2010-09-13 18:00:25 +0000
+++ gwibber/microblog/dispatcher.py	2010-09-13 22:20:59 +0000
@@ -123,7 +123,7 @@
   def get_passwords(self, acct):
     for key, val in acct.items():
       if hasattr(val, "startswith") and val.startswith(":KEYRING:"):
-        id = "%s/%s" % (acct["id"], key)
+        id = "Gwibber %s for %s on %s" % (key, acct["username"], acct["service"])
         try:
           acct[key] = self.dispatcher.accounts.passwords[id]
         except:

=== modified file 'gwibber/microblog/friendfeed.py'
--- gwibber/microblog/friendfeed.py	2010-08-19 15:55:03 +0000
+++ gwibber/microblog/friendfeed.py	2010-09-13 22:20:59 +0000
@@ -9,8 +9,8 @@
   "version": 0.1,
   
   "config": [
+    "username",
     "private:secret_key",
-    "username",
     "color",
     "receive_enabled",
     "send_enabled",

=== modified file 'gwibber/microblog/greader.py'
--- gwibber/microblog/greader.py	2010-08-19 12:50:51 +0000
+++ gwibber/microblog/greader.py	2010-09-13 22:20:59 +0000
@@ -19,8 +19,8 @@
   "version": 0.1,
 
   "config": [
+    "username",
     "private:password",
-    "username",
     "message_color",
     "receive_enabled",
   ],

=== modified file 'gwibber/microblog/identica.py'
--- gwibber/microblog/identica.py	2010-08-25 20:41:55 +0000
+++ gwibber/microblog/identica.py	2010-09-13 22:20:59 +0000
@@ -9,8 +9,8 @@
   "version": 1.0,
   
   "config": [
+    "username",
     "private:password",
-    "username",
     "color",
     "receive_enabled",
     "send_enabled",

=== modified file 'gwibber/microblog/jaiku.py'
--- gwibber/microblog/jaiku.py	2010-08-19 12:50:51 +0000
+++ gwibber/microblog/jaiku.py	2010-09-13 22:20:59 +0000
@@ -14,8 +14,8 @@
   "version": 0.3,
   
   "config": [
+    "username",
     "private:password",
-    "username",
     "message_color",
     "comment_color",
     "receive_enabled",

=== modified file 'gwibber/microblog/opencollaboration.py'
--- gwibber/microblog/opencollaboration.py	2010-08-19 12:50:51 +0000
+++ gwibber/microblog/opencollaboration.py	2010-09-13 22:20:59 +0000
@@ -14,8 +14,8 @@
   "version": 0.1,
   
   "config": [
+    "username",
     "private:password",
-    "username",
     "domain",
     "message_color",
     "receive_enabled",

=== modified file 'gwibber/microblog/qaiku.py'
--- gwibber/microblog/qaiku.py	2010-07-25 23:13:46 +0000
+++ gwibber/microblog/qaiku.py	2010-09-13 22:20:59 +0000
@@ -7,8 +7,8 @@
   "version": "1.0",
   
   "config": [
+    "username",
     "private:password",
-    "username",
     "color",
     "receive_enabled",
     "send_enabled",

=== modified file 'gwibber/microblog/statusnet.py'
--- gwibber/microblog/statusnet.py	2010-08-25 20:51:11 +0000
+++ gwibber/microblog/statusnet.py	2010-09-13 22:20:59 +0000
@@ -9,8 +9,8 @@
   "version": 1.0,
   
   "config": [
+    "username",
     "private:password",
-    "username",
     "domain",
     "color",
     "receive_enabled",

=== modified file 'gwibber/microblog/storage.py'
--- gwibber/microblog/storage.py	2010-09-03 19:23:01 +0000
+++ gwibber/microblog/storage.py	2010-09-13 22:20:59 +0000
@@ -4,6 +4,7 @@
 import gtk, gobject, dbus, dbus.service
 import util, util.keyring, atexit
 from util import log
+from util.keyring import GwibberKeyring
 from dbus.mainloop.glib import DBusGMainLoop
 
 DBusGMainLoop(set_as_default=True)
@@ -199,6 +200,7 @@
     bus_name = dbus.service.BusName("com.Gwibber.Accounts", bus=self.bus)
     dbus.service.Object.__init__(self, bus_name, self.__dbus_object_path__)
     self.db = db
+    self.keyring = GwibberKeyring()
 
     if not self.db.execute("PRAGMA table_info(accounts)").fetchall():
       self.setup_table()
@@ -231,13 +233,13 @@
   def unlock_password_cache(self):
     log.logger.debug("Unlocking password cache!")
     for id in self.passwords:
-      util.keyring.munlock(self.passwords[id])
+      self.keyring.munlock(self.passwords[id])
 
   def update_password_cache(self, acct):
     for key, val in acct.items():
       if hasattr(val, "startswith") and val.startswith(":KEYRING:"):
-        id = "%s/%s" % (acct["id"], key)
-        self.passwords[id] = util.keyring.get_secret(id)
+        id = "Gwibber %s for %s on %s" % (key, acct["username"], acct["service"])
+        self.passwords[id] = self.keyring.get_value(id)
 
   @dbus.service.signal("com.Gwibber.Accounts", signature="s")
   def Updated(self, data):

=== modified file 'gwibber/microblog/twitter.py'
--- gwibber/microblog/twitter.py	2010-08-30 19:38:08 +0000
+++ gwibber/microblog/twitter.py	2010-09-13 22:20:59 +0000
@@ -10,9 +10,9 @@
   "version": "1.0",
   
   "config": [
+    "username",
     "private:secret_token",
     "access_token",
-    "username",
     "color",
     "receive_enabled",
     "send_enabled",

=== modified file 'gwibber/microblog/util/keyring.py'
--- gwibber/microblog/util/keyring.py	2010-08-19 15:55:03 +0000
+++ gwibber/microblog/util/keyring.py	2010-09-13 22:20:59 +0000
@@ -1,26 +1,55 @@
 from const import *
 
+
+try:
+  import gnomekeyring
+except:
+  gnomekeyring = None
+import exceptions
 import ctypes
-import gnomekeyring
-import exceptions
-
-def get_secret(id):
-  value = ""
-  try:
-    value = gnomekeyring.find_items_sync(
-        gnomekeyring.ITEM_GENERIC_SECRET,
-        {"id": str(id)})[0].secret
-    #mlock(value)
-  except gnomekeyring.NoMatchError:
-    print id
-    raise exceptions.GwibberServiceError("keyring")
-
-  return value
-
-libc = ctypes.CDLL("libc.so.6")
-
-def mlock(var):
+
+class GwibberKeyring:
+
+  libc = ctypes.CDLL("libc.so.6")
+
+  def get_value(self, id):
+    val = ""
+    try:
+      val = gnomekeyring.find_items_sync(
+          gnomekeyring.ITEM_GENERIC_SECRET,
+          {"id": str(id)})[0].secret
+      #mlock(value)
+    except gnomekeyring.NoMatchError:
+       print "Can't get a keyring with id '%s'" % id
+       raise exceptions.GwibberServiceError("keyring")
+
+    return val
+  
+  def set_value(self, keyring_name, value):
+    id = ""
+    try:
+      id = gnomekeyring.item_create_sync(
+          gnomekeyring.get_default_keyring_sync(),
+          gnomekeyring.ITEM_GENERIC_SECRET,
+          keyring_name, {"id": str(keyring_name)}, str(value), True)
+      #mlock(value)
+    except gnomekeyring.NoMatchError:
+      print "Can't set keyring with keyring_name '%s' to value '%s'" % (keyring_name, value)
+      raise exceptions.GwibberServiceError("keyring")
+
+    return id
+    
+  def delete_secret(self, id):
+    try:
+      gnomekeyring.item_delete_sync(gnomekeyring.get_default_keyring_sync(), id)
+    except gnomekeyring.NoMatchError:
+      print "Can't delete keyring with id '%s'" % id
+      raise exceptions.GwibberServiceError("keyring")
+
+    return value
+
+  def mlock(self, var):
     libc.mlock(var, len(var))
 
-def munlock(var):
+  def munlock(self, var):
     libc.munlock(var, len(var))