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

Better handle not available keyring backends

This commit is contained in:
Philipp Hörist 2018-12-01 13:47:15 +01:00
parent 108b087858
commit 5b9c564faf
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gajim/common/passwords.py
View File

@ -31,6 +31,7 @@ log = logging.getLogger('gajim.password')
try: try:
import keyring import keyring
from keyring.core import recommended
KEYRING_AVAILABLE = True KEYRING_AVAILABLE = True
except ImportError: except ImportError:
KEYRING_AVAILABLE = False KEYRING_AVAILABLE = False
@ -53,6 +54,7 @@ class SecretPasswordStorage(PasswordStorage):
def __init__(self): def __init__(self):
self.keyring = keyring.get_keyring() self.keyring = keyring.get_keyring()
log.info('Chose %s backend', self.keyring)
def save_password(self, account_name, password): def save_password(self, account_name, password):
try: try:
@ -83,10 +85,20 @@ class PasswordStorageManager(PasswordStorage):
def connect_backends(self): def connect_backends(self):
"""Initialize backend connections, determining which ones are available. """Initialize backend connections, determining which ones are available.
""" """
# TODO: handle disappearing backends
if app.config.get('use_keyring') and KEYRING_AVAILABLE: if not app.config.get('use_keyring') or not KEYRING_AVAILABLE:
self.secret = SecretPasswordStorage() return
backends = keyring.backend.get_all_keyring()
for backend in backends:
log.info('Found keyring backend: %s', backend)
for backend in backends:
if recommended(backend):
self.secret = SecretPasswordStorage()
return
log.warning('No recommended keyring backend found, '
'plain storage is used')
def get_password(self, account_name): def get_password(self, account_name):
pw = app.config.get_per('accounts', account_name, 'password') pw = app.config.get_per('accounts', account_name, 'password')