Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prompt for password change when using 'jrnl --encrypt' on already encrypted journal #1477

Merged
merged 11 commits into from
May 21, 2022
Merged

Prompt for password change when using 'jrnl --encrypt' on already encrypted journal #1477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
602dad7
Added check for empty config file and if so, use default config
jonakeys Apr 27, 2022
ca96e31
Added check for empty config file and if so, use default config
jonakeys Apr 27, 2022
5b589c5
Fix and add tests for empty config file
micahellison Apr 30, 2022
420a9fc
Merge branch 'jrnl-org:develop' into develop
jonakeys May 1, 2022
321ac70
Exit program with message if config is empty.
jonakeys May 1, 2022
0dd7ec7
Exit program with message if config is empty.
jonakeys May 1, 2022
ad33ade
bdd-test doesn't add version if file is (and should stay) empty.
jonakeys May 1, 2022
a947557
Merge branch 'develop' of github.com:jonakeys/jrnl_jk into develop
jonakeys May 1, 2022
da951d4
Merge branch 'jrnl-org:develop' into develop
jonakeys May 7, 2022
8ea9b58
Create new password if journal already encrypted.
jonakeys May 15, 2022
ed3123e
Add test for encrypting already encrypted journal.
jonakeys May 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions jrnl/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from jrnl.messages import Message
from jrnl.messages import MsgText
from jrnl.messages import MsgType
from jrnl.prompt import create_password


def preconfig_diagnostic(_):
Expand Down Expand Up @@ -84,9 +85,14 @@ def postconfig_encrypt(args, config, original_config, **kwargs):
)
)

journal.config["encrypt"] = True

new_journal = EncryptedJournal.from_journal(journal)

# If journal is encrypted, create new password
if journal.config["encrypt"] is True:
print(f"Journal {journal.name} is already encrypted. Create a new password.")
new_journal.password = create_password(new_journal.name)

journal.config["encrypt"] = True
new_journal.write(args.filename)

print(
Expand Down
7 changes: 4 additions & 3 deletions tests/bdd/features/encrypt.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ Feature: Encrypting and decrypting journals
2013-06-10 15:40 Life is good.


@todo
Scenario: Trying to encrypt an already encrypted journal
# This should warn the user that the journal is already encrypted

Given we use the config "encrypted.yaml"
When we run "jrnl --encrypt" and enter "bad doggie no biscuit"
Then the output should contain "already encrypted. Create a new password."
Then we should be prompted for a password

Scenario Outline: Encrypting a journal
Given we use the config "simple.yaml"
Expand Down