diff options
Diffstat (limited to '')
| -rwxr-xr-x | tests/setup.sh | 6 | ||||
| -rwxr-xr-x | tests/t0001-sanity-checks.sh | 4 | ||||
| -rwxr-xr-x | tests/t0010-generate-tests.sh | 6 | ||||
| -rwxr-xr-x | tests/t0020-show-tests.sh | 8 | ||||
| -rwxr-xr-x | tests/t0050-mv-tests.sh | 6 | ||||
| -rwxr-xr-x | tests/t0060-rm-tests.sh | 8 | ||||
| -rwxr-xr-x | tests/t0100-insert-tests.sh | 6 | ||||
| -rwxr-xr-x | tests/t0200-edit-tests.sh | 8 | ||||
| -rwxr-xr-x | tests/t0300-reencryption.sh | 40 |
9 files changed, 46 insertions, 46 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 90896a7..d23cda9 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -29,12 +29,13 @@ if [[ ! -e $PASS ]]; then echo "Could not find password-store.sh" exit 1 fi +alias pass="command \"$PASS\"" # Note: the assumption is the test key is unencrypted. export GNUPGHOME="$TEST_HOME/gnupg/" chmod 700 "$GNUPGHOME" -GPG="gpg" -which gpg2 &>/dev/null && GPG="gpg2" +alias gpg="command gpg" +which gpg2 &>/dev/null && alias gpg="command gpg2" # We don't want to use any running agent. # We want an agent to appear to pass to be running. @@ -46,4 +47,3 @@ KEY2="D774A374" # pass test key 2 KEY3="EB7D54A8" # pass test key 3 KEY4="E4691410" # pass test key 4 KEY5="39E5020C" # pass test key 5 - diff --git a/tests/t0001-sanity-checks.sh b/tests/t0001-sanity-checks.sh index e6be9ea..17d270a 100755 --- a/tests/t0001-sanity-checks.sh +++ b/tests/t0001-sanity-checks.sh @@ -4,11 +4,11 @@ test_description='Sanity checks' . ./setup.sh test_expect_success 'Make sure we can run pass' ' - $PASS --help | grep "pass: the standard unix password manager" + pass --help | grep "pass: the standard unix password manager" ' test_expect_success 'Make sure we can initialize our test store' ' - $PASS init $KEY1 && + pass init $KEY1 && [[ -e "$PASSWORD_STORE_DIR/.gpg-id" ]] && [[ $(cat "$PASSWORD_STORE_DIR/.gpg-id") == "$KEY1" ]] ' diff --git a/tests/t0010-generate-tests.sh b/tests/t0010-generate-tests.sh index d717c00..fea9d44 100755 --- a/tests/t0010-generate-tests.sh +++ b/tests/t0010-generate-tests.sh @@ -4,9 +4,9 @@ test_description='Test generate' . ./setup.sh test_expect_success 'Test "generate" command' ' - $PASS init $KEY1 && - $PASS generate cred 19 && - [[ $($PASS show cred | wc -m) -eq 20 ]] + pass init $KEY1 && + pass generate cred 19 && + [[ $(pass show cred | wc -m) -eq 20 ]] ' test_done diff --git a/tests/t0020-show-tests.sh b/tests/t0020-show-tests.sh index 6bd0165..ede7cd1 100755 --- a/tests/t0020-show-tests.sh +++ b/tests/t0020-show-tests.sh @@ -4,13 +4,13 @@ test_description='Test show' . ./setup.sh test_expect_success 'Test "show" command' ' - $PASS init $KEY1 && - $PASS generate cred1 20 && - $PASS show cred1 + pass init $KEY1 && + pass generate cred1 20 && + pass show cred1 ' test_expect_success 'Test "show" of nonexistant password' ' - test_must_fail $PASS show cred2 + test_must_fail pass show cred2 ' test_done diff --git a/tests/t0050-mv-tests.sh b/tests/t0050-mv-tests.sh index 57472c1..1b1fef2 100755 --- a/tests/t0050-mv-tests.sh +++ b/tests/t0050-mv-tests.sh @@ -7,9 +7,9 @@ TEST_CRED="test_cred" TEST_CRED_NEW="test_cred_new" test_expect_success 'Test "mv" command' ' - $PASS init $KEY1 && - $PASS generate cred1 39 && - $PASS mv cred1 cred2 && + pass init $KEY1 && + pass generate cred1 39 && + pass mv cred1 cred2 && [[ -e $PASSWORD_STORE_DIR/cred2.gpg && ! -e $PASSWORD_STORE_DIR/cred1.gpg ]] ' diff --git a/tests/t0060-rm-tests.sh b/tests/t0060-rm-tests.sh index 50f2790..f434794 100755 --- a/tests/t0060-rm-tests.sh +++ b/tests/t0060-rm-tests.sh @@ -4,14 +4,14 @@ test_description='Test rm' . ./setup.sh test_expect_success 'Test "rm" command' ' - $PASS init $KEY1 && - $PASS generate cred1 43 && - echo "y" | $PASS rm cred1 && + pass init $KEY1 && + pass generate cred1 43 && + echo "y" | pass rm cred1 && [[ ! -e $PASSWORD_STORE_DIR/cred1.gpg ]] ' test_expect_success 'Test "rm" of non-existent password' ' - test_must_fail $PASS rm does-not-exist + test_must_fail pass rm does-not-exist ' test_done diff --git a/tests/t0100-insert-tests.sh b/tests/t0100-insert-tests.sh index 28c50d2..5820e45 100755 --- a/tests/t0100-insert-tests.sh +++ b/tests/t0100-insert-tests.sh @@ -4,9 +4,9 @@ test_description='Test insert' . ./setup.sh test_expect_success 'Test "insert" command' ' - $PASS init $KEY1 && - echo "Hello world" | $PASS insert -e cred1 && - [[ $($PASS show cred1) == "Hello world" ]] + pass init $KEY1 && + echo "Hello world" | pass insert -e cred1 && + [[ $(pass show cred1) == "Hello world" ]] ' test_done diff --git a/tests/t0200-edit-tests.sh b/tests/t0200-edit-tests.sh index fc88bd5..dfc0d10 100755 --- a/tests/t0200-edit-tests.sh +++ b/tests/t0200-edit-tests.sh @@ -4,12 +4,12 @@ test_description='Test edit' . ./setup.sh test_expect_success 'Test "edit" command' ' - $PASS init $KEY1 && - $PASS generate cred1 90 && + pass init $KEY1 && + pass generate cred1 90 && export FAKE_EDITOR_PASSWORD="big fat fake password" && export EDITOR="$TEST_HOME/fake-editor-change-password.sh" && - $PASS edit cred1 && - [[ $($PASS show cred1) == "$FAKE_EDITOR_PASSWORD" ]] + pass edit cred1 && + [[ $(pass show cred1) == "$FAKE_EDITOR_PASSWORD" ]] ' test_done diff --git a/tests/t0300-reencryption.sh b/tests/t0300-reencryption.sh index fed4b5b..0d71476 100755 --- a/tests/t0300-reencryption.sh +++ b/tests/t0300-reencryption.sh @@ -6,13 +6,13 @@ test_description='Reencryption consistency' INITIAL_PASSWORD="will this password live? a big question indeed..." canonicalize_gpg_keys() { - $GPG --list-keys --keyid-format long "$@" | sed -n 's/sub *.*\/\([A-F0-9]\{16\}\) .*/\1/p' | sort -u + gpg --list-keys --keyid-format long "$@" | sed -n 's/sub *.*\/\([A-F0-9]\{16\}\) .*/\1/p' | sort -u } gpg_keys_from_encrypted_file() { - $GPG -v --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | sort -u + gpg -v --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | sort -u } gpg_keys_from_group() { - local output="$($GPG --list-config --with-colons | sed -n "s/^cfg:group:$1:\\(.*\\)/\\1/p" | head -n 1)" + local output="$(gpg --list-config --with-colons | sed -n "s/^cfg:group:$1:\\(.*\\)/\\1/p" | head -n 1)" local saved_ifs="$IFS" IFS=";" local keys=( $output ) @@ -21,75 +21,75 @@ gpg_keys_from_group() { } test_expect_success 'Setup initial key and git' ' - $PASS init $KEY1 && $PASS git init + pass init $KEY1 && pass git init ' test_expect_success 'Root key encryption' ' - $PASS insert -e folder/cred1 <<<"$INITIAL_PASSWORD" && + pass insert -e folder/cred1 <<<"$INITIAL_PASSWORD" && [[ $(canonicalize_gpg_keys "$KEY1") == "$(gpg_keys_from_encrypted_file "$PASSWORD_STORE_DIR/folder/cred1.gpg")" ]] ' test_expect_success 'Reencryption root single key' ' - $PASS init $KEY2 && + pass init $KEY2 && [[ $(canonicalize_gpg_keys "$KEY2") == "$(gpg_keys_from_encrypted_file "$PASSWORD_STORE_DIR/folder/cred1.gpg")" ]] ' test_expect_success 'Reencryption root multiple key' ' - $PASS init $KEY2 $KEY3 $KEY1 && + pass init $KEY2 $KEY3 $KEY1 && [[ $(canonicalize_gpg_keys $KEY2 $KEY3 $KEY1) == "$(gpg_keys_from_encrypted_file "$PASSWORD_STORE_DIR/folder/cred1.gpg")" ]] ' test_expect_success 'Reencryption root multiple key with string' ' - $PASS init $KEY2 $KEY3 $KEY1 "pass test key 4" && + pass init $KEY2 $KEY3 $KEY1 "pass test key 4" && [[ $(canonicalize_gpg_keys $KEY2 $KEY3 $KEY1 $KEY4) == "$(gpg_keys_from_encrypted_file "$PASSWORD_STORE_DIR/folder/cred1.gpg")" ]] ' test_expect_success 'Reencryption root group' ' - $PASS init group1 && + pass init group1 && [[ $(gpg_keys_from_group group1) == "$(gpg_keys_from_encrypted_file "$PASSWORD_STORE_DIR/folder/cred1.gpg")" ]] ' test_expect_success 'Reencryption root group with spaces' ' - $PASS init "big group" && + pass init "big group" && [[ $(gpg_keys_from_group "big group") == "$(gpg_keys_from_encrypted_file "$PASSWORD_STORE_DIR/folder/cred1.gpg")" ]] ' test_expect_success 'Reencryption root group with spaces and other keys' ' - $PASS init "big group" $KEY3 $KEY1 $KEY2 && + pass init "big group" $KEY3 $KEY1 $KEY2 && [[ $(canonicalize_gpg_keys $KEY3 $KEY1 $KEY2 $(gpg_keys_from_group "big group")) == "$(gpg_keys_from_encrypted_file "$PASSWORD_STORE_DIR/folder/cred1.gpg")" ]] ' test_expect_success 'Reencryption root group and other keys' ' - $PASS init group2 $KEY3 $KEY1 $KEY2 && + pass init group2 $KEY3 $KEY1 $KEY2 && [[ $(canonicalize_gpg_keys $KEY3 $KEY1 $KEY2 $(gpg_keys_from_group group2)) == "$(gpg_keys_from_encrypted_file "$PASSWORD_STORE_DIR/folder/cred1.gpg")" ]] ' test_expect_success 'Reencryption root group to identical individual with no file change' ' oldfile="$SHARNESS_TRASH_DIRECTORY/$RANDOM.$RANDOM.$RANDOM.$RANDOM.$RANDOM" && - $PASS init group1 && + pass init group1 && cp "$PASSWORD_STORE_DIR/folder/cred1.gpg" "$oldfile" && - $PASS init $KEY4 $KEY2 && + pass init $KEY4 $KEY2 && test_cmp "$PASSWORD_STORE_DIR/folder/cred1.gpg" "$oldfile" ' test_expect_success 'Reencryption subfolder multiple keys, copy' ' - $PASS init -p anotherfolder $KEY3 $KEY1 && - $PASS cp folder/cred1 anotherfolder/ && + pass init -p anotherfolder $KEY3 $KEY1 && + pass cp folder/cred1 anotherfolder/ && [[ $(canonicalize_gpg_keys $KEY1 $KEY3) == "$(gpg_keys_from_encrypted_file "$PASSWORD_STORE_DIR/anotherfolder/cred1.gpg")" ]] ' test_expect_success 'Reencryption subfolder multiple keys, move, deinit' ' - $PASS init -p anotherfolder2 $KEY3 $KEY4 $KEY2 && - $PASS mv -f anotherfolder anotherfolder2/ && + pass init -p anotherfolder2 $KEY3 $KEY4 $KEY2 && + pass mv -f anotherfolder anotherfolder2/ && [[ $(canonicalize_gpg_keys $KEY1 $KEY3) == "$(gpg_keys_from_encrypted_file "$PASSWORD_STORE_DIR/anotherfolder2/anotherfolder/cred1.gpg")" ]] && - $PASS init -p anotherfolder2/anotherfolder "" && + pass init -p anotherfolder2/anotherfolder "" && [[ $(canonicalize_gpg_keys $KEY3 $KEY4 $KEY2) == "$(gpg_keys_from_encrypted_file "$PASSWORD_STORE_DIR/anotherfolder2/anotherfolder/cred1.gpg")" ]] ' #TODO: test with more varieties of move and copy! test_expect_success 'Password lived through all transformations' ' - [[ $($PASS show anotherfolder2/anotherfolder/cred1) == "$INITIAL_PASSWORD" ]] + [[ $(pass show anotherfolder2/anotherfolder/cred1) == "$INITIAL_PASSWORD" ]] ' test_expect_success 'Git picked up all changes throughout' ' |