Page MenuHome GnuPG
Files F25781753

No OneTemporary
Actions

View Options

diff --git a/autotests/testenvs/templates/entries/team/certs.sh b/autotests/testenvs/templates/entries/team/certs.sh
index 9bf287e..a1e168f 100755
--- a/autotests/testenvs/templates/entries/team/certs.sh
+++ b/autotests/testenvs/templates/entries/team/certs.sh
@@ -1,24 +1,24 @@
#!/usr/bin/env bash
# folders encrypted for each encryption key + all main certs
set -eu
source "$(dirname "$0")/../../utils.sh"
-mainFprs="$(pubFprs "default.1")"
+mainKeyids="$(pubKeyids "default.1")"
# one folder for each encryption key (+ encrypted for all main user certs)
for keyid in $(encKeyids); do
id="$(getId $keyid)"
userid="$(getUid $keyid)"
entry="certs/$id-e-$keyid"
- pass init -p "$entry" "$mainFprs" "$keyid!" > /dev/null
+ pass init -p "$entry" "$mainKeyids" "$keyid!" > /dev/null
cat <<EOF | pass insert -mf "$entry/entry" > /dev/null
id: $id
userid: $userid
keyid: $keyid
-main fingerprints:
-$(for fpr in $mainFprs; do echo "- $fpr | $(getUid "$fpr")"; done)
+main keyids:
+$(for keyid in $mainKeyids; do echo "- $keyid | $(getUid "$keyid")"; done)
EOF
done
diff --git a/autotests/testenvs/templates/entries/team/without.sh b/autotests/testenvs/templates/entries/team/without.sh
index 7df2202..f124f00 100755
--- a/autotests/testenvs/templates/entries/team/without.sh
+++ b/autotests/testenvs/templates/entries/team/without.sh
@@ -1,22 +1,22 @@
#!/usr/bin/env bash
# folders for each user excluded
set -eu
source "$(dirname "$0")/../../utils.sh"
users="$users"
# one folder for each user excluded
for excluded in $users; do
included=
for user in $users; do
[ "$user" = "$excluded" ] && continue
included+="$user.default.1 "
done
- fprs="$(pubFprs $included)"
- pass init -p "without/$excluded" "$fprs" > /dev/null
+ keyids="$(pubKeyids $included)"
+ pass init -p "without/$excluded" "$keyids" > /dev/null
cat <<EOF | pass insert -mf "without/$excluded/entry" > /dev/null
excluded: $excluded.default.1
included: $included
EOF
done
diff --git a/autotests/testenvs/templates/files/gpgpass b/autotests/testenvs/templates/files/gpgpass
index 301bf8c..818f1f7 100644
--- a/autotests/testenvs/templates/files/gpgpass
+++ b/autotests/testenvs/templates/files/gpgpass
@@ -1,64 +1,64 @@
#!/usr/bin/env bash
# env
userDir="$(dirname "$(readlink -vf "$0")")"
source "$userDir/prefix.sh"
user="$user"
env="$env"
envDir="$envDir"
logFile="$logFile"
buildDir="$buildDir"
# certs: empty
if [ -L "$userDir/gnupg" ]; then
certs="/tmp/gpgpass/certs/$env/$user"
rm -rf "$certs"; mkdir -p "$certs"; chmod 700 "$certs"
export GNUPGHOME="$certs"
gpg --update-trustdb > /dev/null 2>&1
fi
# store: empty
if [ -L "$userDir/store-empty" ]; then
store="/tmp/gpgpass/stores/$env/$user"
rm -rf "$store"; mkdir -p "$store"
- fpr="$(gpg -k --with-colons "$user.default.1" | grep fpr | head -n1 | cut -d':' -f10)"
- PASSWORD_STORE_DIR="$store" pass init "$fpr" > /dev/null
+ keyid="$(gpg -k --with-colons "$user.default.1" | grep pub | head -n1 | cut -d':' -f5)"
+ PASSWORD_STORE_DIR="$store" pass init "$keyid" > /dev/null
fi
# log
envInfo () { [ -f $envDir/info ] && echo "($(cat $envDir/info))"; }
gpgVersion () { gpg --version | head -n1 | sed "s/.* //"; }
passVersion () { pass --version | head -n4 | tail -n1 | sed -e "s/= *//" -e "s/ *=//"; }
storesList () {
local config="$XDG_CONFIG_HOME/gpgpassrc"
[ ! -f "$config" ] && echo -e "$userDir/stores-new (new)\n" && return
grep -e Name -e Path "$config" | while read name; read dir; do
echo -ne "${dir#'Path[$e]='} (${name#'Name='})\n "
done
}
cat <<EOF | tee -a "$logFile"
--- START | $env | $user | $(date)
- user: $user
- env: $env $(envInfo)
- certs: $GNUPGHOME
- stores: $(storesList)
- gpg: $(which gpg) ($(gpgVersion))
- pass: $(which pass) ($(passVersion))
$PASSWORD_STORE_DIR (PASSWORD_STORE_DIR)
- gpgpass: $(which gpgpass)
$buildDir (build)
$XDG_CONFIG_HOME/gpgpassrc (config)
$XDG_STATE_HOME/gpgpassstaterc (state)
- log: $logFile
EOF
# exec
cd "$userDir"
trap 'echo -e "\n--- END | $env | $user | $(date)" | tee -a "$logFile"' EXIT
gpgpass -name dev 2>&1 | tee -a "$logFile"
diff --git a/autotests/testenvs/templates/stores.sh b/autotests/testenvs/templates/stores.sh
index c379d61..81272b8 100755
--- a/autotests/testenvs/templates/stores.sh
+++ b/autotests/testenvs/templates/stores.sh
@@ -1,62 +1,62 @@
#!/usr/bin/env bash
#
# Generates several password stores (using certs).
#
# Note: The store entries are generated with `pass`.
#
# user: single user with user store
# team: multi user with shared store
# template: tests for template parser
#
# Usage: ./stores.sh [<dir>]
#
# dir: path - directory, where the stores will be created (default: `./stores`)
set -eu
source "$(dirname "$0")/utils.sh"
certsDir="$certsDir"
entriesDir="$entriesDir"
users="$users"
# args
scriptName="$(basename "$0")"
storesDir="$(realpath ${1:-"$storesDir"})"
[ -d $storesDir ] && echo "$storesDir already exist. exiting." >&2 && exit 1
# paths
export GNUPGHOME="$certsDir/all"
# start
echo "> $scriptName: generating stores ..."
# store: user
for user in $users; do
export PASSWORD_STORE_DIR="$storesDir/user/$user"
echo -e "\n- user ($user)"
- pass init "$(pubFpr "$user.default.1")" > /dev/null
+ pass init "$(pubKeyid "$user.default.1")" > /dev/null
for entry in "$entriesDir"/user/*.sh; do
echo " ./entries/user/$(basename $entry)"
$entry
done
done
# store: team
export PASSWORD_STORE_DIR="$storesDir/team"
echo -e "\n- team ($users)"
-pass init "$(pubFprs "default.1")" > /dev/null
+pass init "$(pubKeyids "default.1")" > /dev/null
for entry in "$entriesDir"/team/*.sh; do
echo -e " ./entries/team/$(basename $entry)"
$entry
done
# store: template
export PASSWORD_STORE_DIR="$storesDir/template"
echo -e "\n- template ($users)"
-pass init "$(pubFprs "default.1")" > /dev/null
+pass init "$(pubKeyids "default.1")" > /dev/null
for entry in "$entriesDir"/template/*.sh; do
echo -e " ./entries/template/$(basename $entry)"
$entry
done
# end
echo -e "\n> $scriptName: done.\n"

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jul 12, 10:17 AM (2 h, 26 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
c5/0a/f3e4ccb1b5d6ec5d5eb0d907b24b

Event Timeline