From 32c88c4af59b88b331a223d93178ab33d52dbb32 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Wed, 23 Apr 2014 17:21:23 +0200
Subject: tests: make more gritty, less setup

---
 tests/setup.sh | 173 +++------------------------------------------------------
 1 file changed, 9 insertions(+), 164 deletions(-)

(limited to 'tests/setup.sh')

diff --git a/tests/setup.sh b/tests/setup.sh
index 130589d..ac2d58a 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -6,25 +6,24 @@
 #   $KEY{1..5}	GPG key ids of testing keys
 #   $TEST_HOME	This folder
 
-#
-# Constants
+. ./sharness.sh
 
-TEST_HOME="$(cd "$(dirname "$BASH_SOURCE")"; pwd)"
+TEST_HOME="$(cd "$(dirname "$SHARNESS_TEST_FILE")/.."; pwd)"
 
-#
-# Find the pass script
+export PASSWORD_STORE_DIR="$SHARNESS_TRASH_DIRECTORY/test-store/"
+rm -rf "$PASSWORD_STORE_DIR"
+mkdir -p "$PASSWORD_STORE_DIR"
+if [[ ! -d $PASSWORD_STORE_DIR ]]; then
+	echo "Could not create $PASSWORD_STORE_DIR"
+	exit 1
+fi
 
 PASS="$TEST_HOME/../src/password-store.sh"
-
 if [[ ! -e $PASS ]]; then
 	echo "Could not find password-store.sh"
 	exit 1
 fi
 
-#
-# GnuPG configuration
-
-# Where the test keyring and test key id
 # Note: the assumption is the test key is unencrypted.
 export GNUPGHOME="$TEST_HOME/gnupg/"
 chmod 700 "$GNUPGHOME"
@@ -42,157 +41,3 @@ KEY3="EB7D54A8"  # pass test key 3
 KEY4="E4691410"  # pass test key 4
 KEY5="39E5020C"  # pass test key 5
 
-# pass_init()
-#
-# Initialize a password store, setting PASSWORD_STORE_DIR
-#
-# Arguments: None
-# Returns: Nothing, sets PASSWORD_STORE_DIR
-pass_init() {
-	export PASSWORD_STORE_DIR="$SHARNESS_TRASH_DIRECTORY/test-store/"
-	echo "Initializing test password store ($PASSWORD_STORE_DIR) with key $KEY1"
-
-	if [[ -d $PASSWORD_STORE_DIR ]] ; then
-		rm -rf "$PASSWORD_STORE_DIR"
-		if [[ -d $PASSWORD_STORE_DIR ]] ; then
-			echo "Removal of old store failed."
-			return 1
-		fi
-	fi
-
-	$PASS init $KEY1 || return 1
-}
-
-# check_cred()
-#
-# Check to make sure the given credential looks valid.
-# Meaning it exists and has at least one line.
-#
-# Arguments: <credential name>
-# Returns: 0 if valid looking, 1 otherwise
-check_cred() {
-	if [[ "$#" -ne 1 ]]; then
-		echo "$0: Bad arguments"
-		return 1
-	fi
-	local cred="$1"
-	echo "Checking credential $cred"
-	if ! $PASS show "$cred"; then
-		echo "Credential $cred does not exist"
-		return 1
-	fi
-	if [[ -z "$($PASS show "$cred")" ]]; then
-		echo "Credential $cred empty"
-		return 1
-	fi
-}
-
-# check_no_cred()
-#
-# Check to make sure the given credential does not exist.
-# Use to validate removal, moving, etc.
-#
-# Arguments: <credential name>
-# Returns: 0 if credential does not exist, 1 otherwise
-check_no_cred() {
-	if [[ "$#" -ne 1 ]]; then
-		echo "$0: Bad arguments"
-		return 1
-	fi
-	local cred="$1"
-	echo "Checking for lack of credential $cred"
-	$PASS show "$cred" || return 0 
-	echo "Credential $cred exists."
-	return 1
-}
-
-# create_cred()
-#
-# Create a credential with the given name and, optionally, password.
-# Credential must not already exist.
-#
-# Arguments: <credential name> [<password>]
-# Returns: 0 on success, 1 otherwise.
-create_cred() {
-	if ! [[ "$#" -gt 0 && "$#" -lt 3 ]]; then
-		echo "$0: Bad arguments"
-		return 1
-	fi
-	local cred="$1"
-	echo "Creating credential $cred"
-	if ! check_no_cred "$cred"; then
-		echo "Credential already exists"
-		return 1
-	fi
-	if [[ "$#" -eq 1 ]]; then
-		local password="$1"
-		echo "Using password \"$password\" for $cred"
-		$PASS insert -f -e "$cred" <<<"$password" || return 1
-	else
-		echo "Generating random password for $cred"
-		if ! $PASS generate -f "$cred" 24 > /dev/null; then
-			echo "Failed to create credential $cred"
-			return 1
-		fi
-	fi
-	return 0
-}
-
-# verify_password()
-#
-# Verify a given credential exists and has the given password.
-#
-# Arguments: <credential name> <password>
-# Returns: 0 on success, 1 otherwise.
-verify_password() {
-	if [[ "$#" -ne 2 ]]; then
-		echo "$0: Bad arguments"
-		return 1
-	fi
-	local cred="$1" expected="$2"
-	echo "Verifing credential $cred has password \"$expected\""
-	check_cred "$cred" || return 1
-	local actualfile="$SHARNESS_TRASH_DIRECTORY/verify-password-actual.$RANDOM.$RANDOM.$RANDOM.$RANDOM"
-	local expectedfile="$SHARNESS_TRASH_DIRECTORY/verify-password-expected.$RANDOM.$RANDOM.$RANDOM.$RANDOM"
-	$PASS show "$TEST_CRED" | sed -n 1p > "$actualfile" &&
-	echo "$expected" > "$expectedfile" &&
-	test_cmp "$expectedfile" "$actualfile"
-}
-
-# canonicalize_gpg_keys()
-#
-# Resolves key names to key ids.
-#
-# Arguments: <key name>...
-# Returns: 0, and echos keys on new lines
-canonicalize_gpg_keys() {
-	$GPG --list-keys --keyid-format long "$@" | sed -n 's/sub *.*\/\([A-F0-9]\{16\}\) .*/\1/p' | sort -u
-}
-
-# gpg_keys_from_encrypted_file()
-#
-# Finds keys used to encrypt a .gpg file.
-#
-# Arguments: <gpg file>
-# Returns 0, and echos keys on new lines
-gpg_keys_from_encrypted_file() {
-	$GPG -v --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | sort -u
-}
-
-# gpg_keys_from_group()
-#
-# Finds keys used in gpg.conf group
-#
-# Arguments: <group>
-# Returns: 0, and echos keys on new lines
-gpg_keys_from_group() {
-	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 )
-	IFS="$saved_ifs"
-	canonicalize_gpg_keys "${keys[@]}"
-}
-
-# Initialize the test harness
-. ./sharness.sh
-- 
cgit v1.2.3