mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-10 16:48:31 +02:00
fcc8d8e3fa
- initial pass through to rework encryption into separate module - little more cleanup - rename function, fix some linting issues - more cleaning - fix password bug in encryption - fix linting issue - more cleanup - move prompt into prompt.py - more cleanup - update the upgrade process for new encryption classes - general cleanup - turn into enum instead of strings - store status code so tests don't fail - standardize the load and store methods in journals - get rid of old PlainJournal class - typing cleanup - more cleanup - format - fix linting issue - Fix obscure Windows line ending issue with decode See https://bugs.python.org/issue40863 - fix for python 3.11 - add more typing - don't use class variables because that's not what we want - fix more type hints - jrnlv1 encryption doesn't support encryption anymore (it's deprecated) - keep logic for password attemps inside the class that uses it - take out old line of code - add some more logging - update logging statements - clean up logging statements - run linters - fix typo - Fix for new test from develop branch There was a new test added for re-encrypting a journal. This updates the refactor to match the old (previously untested) behavior of jrnl. Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
105 lines
4.1 KiB
Gherkin
105 lines
4.1 KiB
Gherkin
# Copyright © 2012-2022 jrnl contributors
|
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
|
|
Feature: Encrypting and decrypting journals
|
|
|
|
Scenario: Decrypting a journal
|
|
Given we use the config "encrypted.yaml"
|
|
And we use the password "bad doggie no biscuit" if prompted
|
|
When we run "jrnl --decrypt"
|
|
Then the output should contain "Journal decrypted"
|
|
And the config for journal "default" should contain "encrypt: false"
|
|
When we run "jrnl -99 --short"
|
|
Then the output should be
|
|
2013-06-09 15:39 My first entry.
|
|
2013-06-10 15:40 Life is good.
|
|
|
|
|
|
@todo
|
|
Scenario: Trying to decrypt an already unencrypted journal
|
|
# This should warn the user that the journal is already encrypted
|
|
Given we use the config "simple.yaml"
|
|
When we run "jrnl --decrypt"
|
|
Then the config for journal "default" should contain "encrypt: false"
|
|
When we run "jrnl -99 --short"
|
|
Then the output should be
|
|
2013-06-09 15:39 My first entry.
|
|
2013-06-10 15:40 Life is good.
|
|
|
|
|
|
Scenario: Trying to encrypt an already encrypted journal
|
|
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"
|
|
When we run "jrnl --encrypt" and enter
|
|
swordfish
|
|
swordfish
|
|
n
|
|
Then we should get no error
|
|
And the output should contain "Journal encrypted"
|
|
And the config for journal "default" should contain "encrypt: true"
|
|
When we run "jrnl -n 1" and enter "swordfish"
|
|
Then we should be prompted for a password
|
|
And the output should contain "2013-06-10 15:40 Life is good"
|
|
|
|
Scenario: Encrypt journal twice and get prompted each time
|
|
Given we use the config "simple.yaml"
|
|
And we don't have a keyring
|
|
When we run "jrnl --encrypt" and enter
|
|
swordfish
|
|
swordfish
|
|
y
|
|
Then we should get no error
|
|
And the output should contain "Journal encrypted"
|
|
When we run "jrnl --encrypt" and enter
|
|
swordfish
|
|
tuna
|
|
tuna
|
|
y
|
|
Then we should get no error
|
|
And the output should contain "Journal default is already encrypted. Create a new password."
|
|
And we should be prompted for a password
|
|
And the config for journal "default" should contain "encrypt: true"
|
|
|
|
Scenario: Encrypt journal twice and get prompted each time with keyring
|
|
Given we use the config "simple.yaml"
|
|
And we have a keyring
|
|
When we run "jrnl --encrypt" and enter
|
|
swordfish
|
|
swordfish
|
|
y
|
|
Then we should get no error
|
|
And the output should contain "Journal encrypted"
|
|
When we run "jrnl --encrypt" and enter
|
|
tuna
|
|
tuna
|
|
y
|
|
Then we should get no error
|
|
And the output should contain "Journal default is already encrypted. Create a new password."
|
|
And we should be prompted for a password
|
|
And the config for journal "default" should contain "encrypt: true"
|
|
|
|
Scenario Outline: Running jrnl with encrypt: true on unencryptable journals
|
|
Given we use the config "<config_file>"
|
|
When we run "jrnl --config-override encrypt true here is a new entry"
|
|
Then the error output should contain "journal can't be encrypted"
|
|
|
|
Examples: configs
|
|
| config_file |
|
|
| basic_folder.yaml |
|
|
| basic_dayone.yaml |
|
|
|
|
|
|
Scenario Outline: Attempt to encrypt a folder or DayOne journal should result in an error
|
|
Given we use the config "<config_file>"
|
|
When we run "jrnl --encrypt"
|
|
Then the error output should contain "can't be encrypted"
|
|
|
|
Examples: configs
|
|
| config_file |
|
|
| basic_folder.yaml |
|
|
| basic_dayone.yaml |
|