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

Don't try to decrypt empty strings

Browse source
This commit is contained in:
Manuel Ebert 2012-04-16 21:36:43 +02:00
parent d19d858dba
commit 7bec54f2b0
1 changed files with 35 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
jrnl.py
View file

@ -90,6 +90,8 @@ class Journal:
def _decrypt(self, cipher): def _decrypt(self, cipher):
"""Decrypts a cipher string using self.key as the key and the first 16 byte of the cipher as the IV""" """Decrypts a cipher string using self.key as the key and the first 16 byte of the cipher as the IV"""
if not cipher:
return ""
crypto = AES.new(self.key, AES.MODE_CBC, cipher[:16]) crypto = AES.new(self.key, AES.MODE_CBC, cipher[:16])
plain = crypto.decrypt(cipher[16:]) plain = crypto.decrypt(cipher[16:])
if plain[-1] != " ": # Journals are always padded if plain[-1] != " ": # Journals are always padded
@ -118,7 +120,7 @@ class Journal:
if self.config['encrypt']: if self.config['encrypt']:
decrypted = None decrypted = None
attempts = 0 attempts = 0
while not decrypted: while decrypted is None:
password = self.config['password'] or getpass.getpass() password = self.config['password'] or getpass.getpass()
self.key = hashlib.sha256(password).digest() self.key = hashlib.sha256(password).digest()
decrypted = self._decrypt(journal) decrypted = self._decrypt(journal)
@ -260,9 +262,7 @@ class Journal:
self.entries.append(Entry(self, date, title, body)) self.entries.append(Entry(self, date, title, body))
self.sort() self.sort()
if __name__ == "__main__": def setup(config_path):
config_path = os.path.expanduser('~/.jrnl_config')
if not os.path.exists(config_path):
def autocomplete(text, state): def autocomplete(text, state):
expansions = glob.glob(os.path.expanduser(text)+'*') expansions = glob.glob(os.path.expanduser(text)+'*')
expansions = [e+"/" if os.path.isdir(e) else e for e in expansions] expansions = [e+"/" if os.path.isdir(e) else e for e in expansions]
@ -272,21 +272,31 @@ if __name__ == "__main__":
readline.parse_and_bind("tab: complete") readline.parse_and_bind("tab: complete")
readline.set_completer(autocomplete) readline.set_completer(autocomplete)
# Where to create the journal?
path_query = 'Path to your journal file (leave blank for ~/journal.txt): ' path_query = 'Path to your journal file (leave blank for ~/journal.txt): '
journal_path = raw_input(path_query).strip() or os.path.expanduser('~/journal.txt') journal_path = raw_input(path_query).strip() or os.path.expanduser('~/journal.txt')
default_config['journal'] = os.path.expanduser(journal_path) default_config['journal'] = os.path.expanduser(journal_path)
# Encrypt it?
password = getpass.getpass("Enter password for journal (leave blank for no encryption): ") password = getpass.getpass("Enter password for journal (leave blank for no encryption): ")
if password: if password:
default_config['encrypt'] = True default_config['encrypt'] = True
print("Journal will be encrypted.") print("Journal will be encrypted.")
print("If you want to, you can store your password in .jrnl_config and will never be bothered about it again.") print("If you want to, you can store your password in .jrnl_config and will never be bothered about it again.")
open(default_config['journal'], 'a').close() # Touch to make sure it's there open(default_config['journal'], 'a').close() # Touch to make sure it's there
# Write config to ~/.jrnl_conf
with open(config_path, 'w') as f: with open(config_path, 'w') as f:
json.dump(default_config, f, indent=2) json.dump(default_config, f, indent=2)
config = default_config config = default_config
if password: if password:
config['password'] = password config['password'] = password
return config
if __name__ == "__main__":
config_path = os.path.expanduser('~/.jrnl_config')
if not os.path.exists(config_path):
config = setup(config_path)
else: else:
with open(config_path) as f: with open(config_path) as f:
config = json.load(f) config = json.load(f)