fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-13 09:58:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix password bug in encryption

Browse source
This commit is contained in:
Jonathan Wren 2022-09-24 08:47:11 -07:00
parent a76f066a7c
commit 49948c49f7
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
jrnl/encryption/BasePasswordEncryption.py
View file

@ -25,11 +25,7 @@ class BasePasswordEncryption(BaseEncryption):
self._encoding = "utf-8" self._encoding = "utf-8"
# Check keyring first to be ready for decryption # Check keyring first to be ready for decryption
get_keyring_password(self._config["journal"]) self._password = get_keyring_password(self._config["journal"])
# Prompt for password if keyring didn't work
if self.password is None:
self._prompt_password()
@property @property
def password(self): def password(self):
@ -45,6 +41,8 @@ class BasePasswordEncryption(BaseEncryption):
return self._encrypt(text) return self._encrypt(text)
def decrypt(self, text): def decrypt(self, text):
if self.password is None:
self._prompt_password()
while (result := self._decrypt(text)) is None: while (result := self._decrypt(text)) is None:
self._prompt_password() self._prompt_password()