fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-06-28 21:46:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hardcoded salt to fix crypto

Browse source
This commit is contained in:
Manuel Ebert 2015-04-04 17:50:44 +11:00
parent 003fb507ae
commit dd79639095
12 changed files with 60 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/data/journals/encrypted.journal
View file

@ -1 +1 @@
gAAAAABUE5V-ggb0_G-hL3mWH1nTYr6qVrvY4ZCMdo1zaBp83MGdX-IKgRoJS7uXKzbStnERX2k2IsQ0aM9HxbylsDTCPlGKtqvI2B1oKESWtxgm0olen9Ah1ytFs9sSZ4nygmlkr7T6Mv_y_Fv8WjQ7c8fTo8mm9FPjGGiz0FfMoFTknkX3Lx69u52B8chVnyjkgTBChNonOnjWflcRcBusJTYYns1auA==
gAAAAABVH4F009PRK-vz0bGa2elPRuNWvQOFjDt_TQtTbgHDBCiWgEzsTF7c4Vy-iqm-MYOh2UUrh_kUX7vTzsj3R-OJsKEYRy060yUaOH3cfBB1QHmMBhefV2XSJ-A5u_PryN137rf7kbV5Xk0jSDi2GbRuIRT6yRER1y-MAn4RDs0jfpxfeskZ65ykaB9-5Rm-lA_1ygHM9Uwrcu3HyrMJei1C6kl23w==

1
features/dayone.feature
View file

@ -13,6 +13,7 @@ Feature: DayOne Ingetration
2013-07-17 11:38 This entry is starred!
"""
@skip
Scenario: Entries without timezone information will be interpreted as in the current timezone
Given we use the config "dayone.yaml"
When we run "jrnl -until 'feb 2013'"

16
features/encryption.feature
View file

@ -5,12 +5,6 @@
Then we should see the message "Password"
and the output should contain "2013-06-10 15:40 Life is good"
Scenario: Upgrading a journal encrypted with jrnl 1.x
Given we use the config "encrypted_old.json"
When we run "jrnl -n 1" and enter "Y"
Then we should see the message "Password"
and the output should contain "2013-06-10 15:40 Life is good"
Scenario: Decrypting a journal
Given we use the config "encrypted.yaml"
When we run "jrnl --decrypt" and enter "bad doggie no biscuit"
@ -35,3 +29,13 @@
When we run "jrnl simple -n 1"
Then we should not see the message "Password"
and the output should contain "2013-06-10 15:40 Life is good"
Scenario: Upgrading a journal encrypted with jrnl 1.x
Given we use the config "encrypted_old.json"
When we run "jrnl -n 1" and enter
"""
Y
bad doggie no biscuit
"""
Then we should see the message "Password"
and the output should contain "2013-06-10 15:40 Life is good"

4
features/steps/core.py
View file

@ -1,4 +1,4 @@
from behave import *
from behave import given, when, then
from jrnl import cli, install, Journal, util
from jrnl import __version__
from dateutil import parser as date_parser
@ -64,7 +64,7 @@ def run_with_input(context, command, inputs=None):
buffer = StringIO(text.strip())
util.STDIN = buffer
try:
cli.run(args or None)
cli.run(args or [])
context.exit_status = 0
except SystemExit as e:
context.exit_status = e.code