george/blackbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call vcs_ignore bwfore the file is shredded

Browse Source
This commit is contained in:
James Ottaway
2020-04-30 22:26:46 +10:00
committed by Tom Limoncelli
parent 6761bfc356
commit 72253818be
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/blackbox_register_new_file
View File

@@ -29,6 +29,7 @@ function register_new_file() {
prepare_keychain prepare_keychain
encrypt_file "$unencrypted_file" "$encrypted_file" encrypt_file "$unencrypted_file" "$encrypted_file"
add_filename_to_cryptlist "$unencrypted_file" add_filename_to_cryptlist "$unencrypted_file"
vcs_ignore "$unencrypted_file"
# Is the unencrypted file already in HG? (ie. are we correcting a bad situation) # Is the unencrypted file already in HG? (ie. are we correcting a bad situation)
SECRETSEXPOSED=$(is_in_vcs "${unencrypted_file}") SECRETSEXPOSED=$(is_in_vcs "${unencrypted_file}")
@@ -41,7 +42,6 @@ function register_new_file() {
vcs_add "$encrypted_file" vcs_add "$encrypted_file"
fi fi
vcs_ignore "$unencrypted_file"
echo 'NOTE: "already tracked!" messages are safe to ignore.' echo 'NOTE: "already tracked!" messages are safe to ignore.'
vcs_add "$BB_FILES" "$encrypted_file" vcs_add "$BB_FILES" "$encrypted_file"
vcs_commit "registered in blackbox: ${unencrypted_file}" "$BB_FILES" "$encrypted_file" "$(vcs_ignore_file_path)" vcs_commit "registered in blackbox: ${unencrypted_file}" "$BB_FILES" "$encrypted_file" "$(vcs_ignore_file_path)"

2
tools/confidence_test.sh
View File

@@ -161,7 +161,7 @@ assert_file_missing secret.txt
assert_file_exists secret.txt.gpg assert_file_exists secret.txt.gpg
assert_line_exists '/secret.txt' .gitignore assert_line_exists '/secret.txt' .gitignore
PHASE 'She cats secrets.txt.gpg' PHASE 'She cats secrets.txt.gpg.'
make_self_deleting_tempfile catsecret make_self_deleting_tempfile catsecret
blackbox_cat secret.txt.gpg > $catsecret blackbox_cat secret.txt.gpg > $catsecret
assert_line_exists 'this is my secret' $catsecret assert_line_exists 'this is my secret' $catsecret