Merge branch 'master' into 'master'
Improvements for windows keyring storage See merge request !38
This commit is contained in:
commit
2be4b0a53a
|
@ -314,6 +314,7 @@ class Config:
|
||||||
'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')],
|
'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')],
|
||||||
'positive_184_ack': [ opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')],
|
'positive_184_ack': [ opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')],
|
||||||
'show_avatar_in_tabs': [ opt_bool, False, _('Show a mini avatar in chat window tabs and in window icon')],
|
'show_avatar_in_tabs': [ opt_bool, False, _('Show a mini avatar in chat window tabs and in window icon')],
|
||||||
|
'use_keyring': [opt_bool, True, _('If True, Gajim will use the Systems Keyring to store account passwords.')],
|
||||||
}, {})
|
}, {})
|
||||||
|
|
||||||
__options_per_key = {
|
__options_per_key = {
|
||||||
|
|
|
@ -52,7 +52,7 @@ class PasswordStorage(object):
|
||||||
class SimplePasswordStorage(PasswordStorage):
|
class SimplePasswordStorage(PasswordStorage):
|
||||||
def get_password(self, account_name):
|
def get_password(self, account_name):
|
||||||
passwd = gajim.config.get_per('accounts', account_name, 'password')
|
passwd = gajim.config.get_per('accounts', account_name, 'password')
|
||||||
if passwd and passwd.startswith('libsecret:'):
|
if passwd and (passwd.startswith('libsecret:') or passwd.startswith('winvault:')):
|
||||||
# this is not a real password, it’s stored through libsecret.
|
# this is not a real password, it’s stored through libsecret.
|
||||||
return None
|
return None
|
||||||
else:
|
else:
|
||||||
|
@ -116,8 +116,14 @@ class SecretWindowsPasswordStorage(PasswordStorage):
|
||||||
self.win_keyring = keyring.get_keyring()
|
self.win_keyring = keyring.get_keyring()
|
||||||
|
|
||||||
def save_password(self, account_name, password):
|
def save_password(self, account_name, password):
|
||||||
|
try:
|
||||||
self.win_keyring.set_password('gajim', account_name, password)
|
self.win_keyring.set_password('gajim', account_name, password)
|
||||||
gajim.config.set_per('accounts', account_name, 'password', 'winvault:')
|
gajim.config.set_per(
|
||||||
|
'accounts', account_name, 'password', 'winvault:')
|
||||||
|
except:
|
||||||
|
log.exception('error:')
|
||||||
|
set_storage(SimplePasswordStorage())
|
||||||
|
storage.save_password(account_name, password)
|
||||||
|
|
||||||
def get_password(self, account_name):
|
def get_password(self, account_name):
|
||||||
log.debug('getting password')
|
log.debug('getting password')
|
||||||
|
@ -127,10 +133,7 @@ class SecretWindowsPasswordStorage(PasswordStorage):
|
||||||
if not conf.startswith('winvault:'):
|
if not conf.startswith('winvault:'):
|
||||||
password = conf
|
password = conf
|
||||||
# migrate the password over to keyring
|
# migrate the password over to keyring
|
||||||
try:
|
|
||||||
self.save_password(account_name, password)
|
self.save_password(account_name, password)
|
||||||
except Exception:
|
|
||||||
log.exception('error: ')
|
|
||||||
return password
|
return password
|
||||||
return self.win_keyring.get_password('gajim', account_name)
|
return self.win_keyring.get_password('gajim', account_name)
|
||||||
|
|
||||||
|
@ -140,6 +143,7 @@ def get_storage():
|
||||||
global storage
|
global storage
|
||||||
if storage is None: # None is only in first time get_storage is called
|
if storage is None: # None is only in first time get_storage is called
|
||||||
global Secret
|
global Secret
|
||||||
|
if gajim.config.get('use_keyring'):
|
||||||
try:
|
try:
|
||||||
gi.require_version('Secret', '1')
|
gi.require_version('Secret', '1')
|
||||||
gir = __import__('gi.repository', globals(), locals(),
|
gir = __import__('gi.repository', globals(), locals(),
|
||||||
|
@ -154,6 +158,8 @@ def get_storage():
|
||||||
storage = SecretWindowsPasswordStorage()
|
storage = SecretWindowsPasswordStorage()
|
||||||
except Exception:
|
except Exception:
|
||||||
storage = SimplePasswordStorage()
|
storage = SimplePasswordStorage()
|
||||||
|
else:
|
||||||
|
storage = SimplePasswordStorage()
|
||||||
return storage
|
return storage
|
||||||
|
|
||||||
def set_storage(storage_):
|
def set_storage(storage_):
|
||||||
|
|
|
@ -69,7 +69,7 @@ class FeaturesWindow:
|
||||||
_('Password encryption'): (self.some_keyring_available,
|
_('Password encryption'): (self.some_keyring_available,
|
||||||
_('Passwords can be stored securely and not just in plaintext.'),
|
_('Passwords can be stored securely and not just in plaintext.'),
|
||||||
_('Requires libsecret and a provider (such as GNOME Keyring and KSecretService).'),
|
_('Requires libsecret and a provider (such as GNOME Keyring and KSecretService).'),
|
||||||
_('Feature not available under Windows.')),
|
_('On Windows the Windows Credential Vault is used.')),
|
||||||
_('Spell Checker'): (self.speller_available,
|
_('Spell Checker'): (self.speller_available,
|
||||||
_('Spellchecking of composed messages.'),
|
_('Spellchecking of composed messages.'),
|
||||||
_('Requires libgtkspell.'),
|
_('Requires libgtkspell.'),
|
||||||
|
@ -183,7 +183,7 @@ class FeaturesWindow:
|
||||||
|
|
||||||
def some_keyring_available(self):
|
def some_keyring_available(self):
|
||||||
if os.name == 'nt':
|
if os.name == 'nt':
|
||||||
return False
|
return True
|
||||||
try:
|
try:
|
||||||
gi.require_version('Secret', '1')
|
gi.require_version('Secret', '1')
|
||||||
from gi.repository import Secret
|
from gi.repository import Secret
|
||||||
|
|
Loading…
Reference in New Issue