Philipp Hörist pushed to branch master at gajim / gajim
Commits: c58c7cc4 by Philipp Hörist at 2019-03-02T18:59:27Z Make passwords module more resilient
- Catch more exceptions - Add more log output
- - - - -
2 changed files:
- gajim/common/passwords.py - gajim/config.py
Changes:
===================================== gajim/common/passwords.py ===================================== @@ -35,7 +35,7 @@ try: KEYRING_AVAILABLE = True except ImportError: KEYRING_AVAILABLE = False - log.debug('python-keyring missing, falling back to plaintext storage') + log.warning('python-keyring missing, falling back to plaintext storage')
class PasswordStorage: @@ -58,24 +58,32 @@ class SecretPasswordStorage(PasswordStorage):
def __init__(self): self.keyring = keyring.get_keyring() - log.info('Chose %s backend', self.keyring) + log.info('Select %s backend', self.keyring)
def save_password(self, account_name, password): try: + log.info('Save password to keyring') self.keyring.set_password('gajim', account_name, password) return True - except Exception as error: - log.warning('Save password failed') - log.debug(error) + except Exception: + log.exception('Save password failed') return False
def get_password(self, account_name): - log.debug('getting password') - return self.keyring.get_password('gajim', account_name) + log.info('Request password from keyring') + try: + return self.keyring.get_password('gajim', account_name) + except Exception: + log.exception('Request password failed') + return
def delete_password(self, account_name): - return self.keyring.delete_password('gajim', account_name) - + log.info('Remove password from keyring') + try: + return self.keyring.delete_password('gajim', account_name) + except Exception: + log.exception('Remove password failed') + return
class PasswordStorageManager(PasswordStorage): """Access all the implemented password storage backends, knowing which ones @@ -119,22 +127,23 @@ class PasswordStorageManager(PasswordStorage):
if backend: pw = backend.get_password(account_name) + if backend != self.preferred_backend: # migrate password to preferred_backend self.save_password(account_name, pw) - # TODO: remove from old backend return pw
def save_password(self, account_name, password): if account_name in app.connections: app.connections[account_name].password = password + if not app.config.get_per('accounts', account_name, 'savepass'): return True
if self.preferred_backend: if self.preferred_backend.save_password(account_name, password): app.config.set_per('accounts', account_name, 'password', - self.preferred_backend.identifier) + self.preferred_backend.identifier) else: app.config.set_per('accounts', account_name, 'password', password) return True @@ -143,10 +152,9 @@ class PasswordStorageManager(PasswordStorage): if account_name in app.connections: app.connections[account_name].password = None
- if not self.preferred_backend: + if self.preferred_backend is not None: self.preferred_backend.delete_password(account_name) - else: - app.config.set_per('accounts', account_name, 'password', None) + app.config.set_per('accounts', account_name, 'password', None) return True
def set_preferred_backend(self):
===================================== gajim/config.py ===================================== @@ -31,6 +31,7 @@ from gi.repository import Gtk from gi.repository import GObject
from gajim.common import app +from gajim.common import passwords from gajim.common.i18n import _
from gajim import dialogs @@ -213,6 +214,7 @@ class RemoveAccountWindow: app.interface.roster.setup_and_draw_roster() app.app.remove_account_actions(self.account) gui_menu_builder.build_accounts_menu() + passwords.delete_password(self.account)
window = app.get_app_window('AccountsWindow') if window is not None:
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c58c7cc4a0ff5ad237db0c3d72de0ab088e...
-
Philipp Hörist