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

For git, add plaintext files to .gitignore to prevent accidental additions.

Browse Source
This commit is contained in:
tlimoncelli@stackexchange.com
2014-10-14 14:23:34 +00:00
parent 574bbf50ad
commit 225909cdf3
2 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/blackbox_register_new_file
View File

@@ -49,10 +49,12 @@ fi
IGNOREFILE=".${VCS_TYPE}ignore" IGNOREFILE=".${VCS_TYPE}ignore"
if [[ $VCS_TYPE = 'git' ]]; then if [[ $VCS_TYPE = 'git' ]]; then
if ! grep -Fsx >/dev/null "$unencrypted_file" "$IGNOREFILE"; then ignored_file="$(echo "$unencrypted_file" | sed 's/^\([!#]\)/\\\1/')"
echo "$unencrypted_file" >>"$IGNOREFILE" if ! grep -Fsx >/dev/null "$ignored_file" "$IGNOREFILE"; then
COMMIT_FILES="$COMMIT_FILES $IGNOREFILE" echo "$ignored_file" >>"$IGNOREFILE"
fi COMMIT_FILES="$COMMIT_FILES $IGNOREFILE"
fi
vcs_add "$IGNOREFILE"
fi fi
echo 'NOTE: "already tracked!" messages are safe to ignore.' echo 'NOTE: "already tracked!" messages are safe to ignore.'

48
tools/confidence_test.sh
View File

@@ -52,6 +52,30 @@ function assert_file_group() {
exit 1 exit 1
fi fi
} }
function assert_line_not_exists() {
local target="$1"
local file="$2"
assert_file_exists "$file"
if grep -F -x -s -q >/dev/null "$target" "$file" ; then
echo "ASSERT FAILED: line '$target' should not exist in file $file"
echo ==== file contents: START "$file"
cat "$file"
echo ==== file contents: END "$file"
exit 1
fi
}
function assert_line_exists() {
local target="$1"
local file="$2"
assert_file_exists "$file"
if ! grep -F -x -s -q >/dev/null "$target" "$file" ; then
echo "ASSERT FAILED: line '$target' should not exist in file $file"
echo ==== file contents: START "$file"
cat "$file"
echo ==== file contents: END "$file"
exit 1
fi
}
make_tempdir test_repository make_tempdir test_repository
cd "$test_repository" cd "$test_repository"
@@ -210,13 +234,7 @@ rm secret.txt
PHASE 'Bob removes alice.' PHASE 'Bob removes alice.'
blackbox_removeadmin alice@example.com blackbox_removeadmin alice@example.com
if grep -xs >dev/null 'alice@example.com' keyrings/live/blackbox-admins.txt ; then assert_line_not_exists 'alice@example.com' keyrings/live/blackbox-admins.txt
echo "ASSERT FAILED: alice@example.com should be removed from keyrings/live/blackbox-admins.txt"
echo ==== file start
cat keyrings/live/blackbox-admins.txt
echo ==== file end
exit 1
fi
PHASE 'Bob reencrypts files so alice can not access them.' PHASE 'Bob reencrypts files so alice can not access them.'
blackbox_update_all_files blackbox_update_all_files
@@ -266,6 +284,20 @@ assert_file_exists to/relsecrets.txt.gpg
assert_file_md5hash to/relsecrets.txt "c47f9c3c8ce03d895b883ac22384cb67" assert_file_md5hash to/relsecrets.txt "c47f9c3c8ce03d895b883ac22384cb67"
cd ../.. cd ../..
PHASE 'Bob enrolls !important!.txt'
echo A very important file >'!important!.txt'
blackbox_register_new_file '!important!.txt'
assert_file_missing '!important!.txt'
assert_file_exists '!important!.txt'.gpg
assert_line_exists '\!important!.txt' .gitignore
PHASE 'Bob enrolls #andpounds.txt'
echo A very commented file >'#andpounds.txt'
blackbox_register_new_file '#andpounds.txt'
assert_file_missing '#andpounds.txt'
assert_file_exists '#andpounds.txt'.gpg
assert_line_exists '\#andpounds.txt' .gitignore
# TODO(tlim): Add test to make sure that now alice can NOT decrypt. # TODO(tlim): Add test to make sure that now alice can NOT decrypt.
# #
@@ -277,7 +309,7 @@ if [[ -e $HOME/.gnupg ]]; then
exit 1 exit 1
fi fi
find * -ls find .git?* * -type f -ls
echo cd "$test_repository" echo cd "$test_repository"
echo rm "$test_repository" echo rm "$test_repository"
echo DONE. echo DONE.