copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[gjc] use correct API to get password from gnome-keyring. Fixes #3631

This commit is contained in:
Yann Leboulanger 2009-01-19 22:19:43 +00:00
parent cb1b0814a8
commit 68550b731b
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/common/passwords.py
View File

@ -25,6 +25,7 @@
__all__ = ['get_password', 'save_password'] __all__ = ['get_password', 'save_password']
import warnings
from common import gajim from common import gajim
USER_HAS_GNOMEKEYRING = False USER_HAS_GNOMEKEYRING = False
@ -66,10 +67,7 @@ class GnomePasswordStorage(PasswordStorage):
conf = gajim.config.get_per('accounts', account_name, 'password') conf = gajim.config.get_per('accounts', account_name, 'password')
if conf is None: if conf is None:
return None return None
try: if not conf.startswith('gnomekeyring:'):
auth_token = conf.split('gnomekeyring:')[1]
auth_token = int(auth_token)
except (IndexError, ValueError):
password = conf password = conf
## migrate the password over to keyring ## migrate the password over to keyring
try: try:
@ -79,8 +77,21 @@ class GnomePasswordStorage(PasswordStorage):
set_storage(SimplePasswordStorage()) set_storage(SimplePasswordStorage())
return password return password
try: try:
return gnomekeyring.item_get_info_sync(self.keyring, attributes = dict(account_name=str(account_name), gajim=1)
auth_token).get_secret() try:
items = gnomekeyring.find_items_sync(
gnomekeyring.ITEM_GENERIC_SECRET,
attributes)
except gnomekeyring.Error:
items = []
if len(items) > 1:
warnings.warn("multiple gnome keyring items found for account %s;"
" trying to use the first one..."
% account_name)
if items:
return items[0].secret
else:
return None
except gnomekeyring.DeniedError: except gnomekeyring.DeniedError:
return None return None
except gnomekeyring.NoKeyringDaemonError: except gnomekeyring.NoKeyringDaemonError:
@ -99,8 +110,8 @@ class GnomePasswordStorage(PasswordStorage):
set_storage(SimplePasswordStorage()) set_storage(SimplePasswordStorage())
storage.save_password(account_name, password) storage.save_password(account_name, password)
return return
token = 'gnomekeyring:%i' % auth_token gajim.config.set_per('accounts', account_name, 'password',
gajim.config.set_per('accounts', account_name, 'password', token) 'gnomekeyring:')
if account_name in gajim.connections: if account_name in gajim.connections:
gajim.connections[account_name].password = password gajim.connections[account_name].password = password