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

Only soft-deprecate passwords in config

Browse source
This commit is contained in:
Manuel Ebert 2013-10-20 13:42:55 -07:00
parent e81e388696
commit 30275492d4
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
jrnl/Journal.py
View file

@ -99,14 +99,21 @@ class Journal(object):
Entries have the form (date, title, body).""" Entries have the form (date, title, body)."""
filename = filename or self.config['journal'] filename = filename or self.config['journal']
def validate_password(journal, password):
self.make_key(password)
return self._decrypt(journal)
if self.config['encrypt']: if self.config['encrypt']:
with open(filename, "rb") as f: with open(filename, "rb") as f:
journal_encrypted = f.read() journal_encrypted = f.read()
journal = util.get_password(keychain=self.name, validator=partial(validate_password, journal_encrypted))
def validate_password(password):
self.make_key(password)
return self._decrypt(journal_encrypted)
# Soft-deprecated:
journal = None
if 'password' in self.config:
journal = validate_password(self.config['password'])
if not journal:
journal = util.get_password(keychain=self.name, validator=validate_password)
else: else:
with codecs.open(filename, "r", "utf-8") as f: with codecs.open(filename, "r", "utf-8") as f:
journal = f.read() journal = f.read()