mirror/vorta
1
0
Fork 0
mirror of https://github.com/borgbase/vorta synced 2025-01-03 13:45:49 +00:00
Code Issues Releases Wiki Activity

Improve kwallet verification. By @samuel-w (#889)

Browse source
This commit is contained in:
samuel-w 2021-02-24 07:25:17 -06:00 committed by GitHub
parent 8da81e73b6
commit 46c3eee9a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vorta/keyring/kwallet.py
View file

@ -20,7 +20,7 @@ def __init__(self):
self.object_path, self.object_path,
self.interface_name, self.interface_name,
QtDBus.QDBusConnection.sessionBus()) QtDBus.QDBusConnection.sessionBus())
if not (self.iface.isValid() and self.get_result("isEnabled")): if not (self.iface.isValid() and self.get_result("isEnabled") is True):
raise KWalletNotAvailableException raise KWalletNotAvailableException
def set_password(self, service, repo_url, password): def set_password(self, service, repo_url, password):
@ -49,7 +49,10 @@ def try_unlock(self):
wId = QVariant(0) wId = QVariant(0)
wId.convert(4) wId.convert(4)
output = self.get_result("open", args=[wallet_name, wId, 'vorta-repo']) output = self.get_result("open", args=[wallet_name, wId, 'vorta-repo'])
self.handle = int(output) try:
self.handle = int(output)
except ValueError: # For when kwallet is disabled or dbus otherwise broken
return -2
class KWalletNotAvailableException(Exception): class KWalletNotAvailableException(Exception):