jigen/git-remote-gcrypt
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Merge branch 'better_signature_validation' of https://github.com/jburnham/git-remote-gcrypt

Browse source
This commit is contained in:
Joey Hess 2013-09-19 13:00:58 -04:00
commit 29ed089cce
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
git-remote-gcrypt
View file

@ -388,7 +388,7 @@ make_new_repo()
# $1 return var for goodsig match, $2 return var for signers text # $1 return var for goodsig match, $2 return var for signers text
read_config() read_config()
{ {
local recp_= r_keyinfo= cap_= conf_part= good_sig= signers_= local recp_= r_keyinfo= r_keyfpr= gpg_list= cap_= conf_part= good_sig= signers_=
Conf_signkey=$(git config --get "remote.$NAME.gcrypt-signingkey" '.+' || Conf_signkey=$(git config --get "remote.$NAME.gcrypt-signingkey" '.+' ||
git config --path user.signingkey || :) git config --path user.signingkey || :)
conf_part=$(git config --get "remote.$NAME.gcrypt-participants" '.+' || conf_part=$(git config --get "remote.$NAME.gcrypt-participants" '.+' ||
@ -407,16 +407,21 @@ read_config()
for recp_ in $conf_part for recp_ in $conf_part
do do
filter_to @r_keyinfo "pub*" \ gpg_list=$(gpg --with-colons --fast-list --fingerprint -k "$recp_")
"$(gpg --with-colons --fast-list -k "$recp_")" filter_to @r_keyinfo "pub*" "$gpg_list"
filter_to @r_keyfpr "fpr*" "$gpg_list"
isnull "$r_keyinfo" || isnonnull "${r_keyinfo##*"$Newline"*}" || isnull "$r_keyinfo" || isnonnull "${r_keyinfo##*"$Newline"*}" ||
echo_info "WARNING: '$recp_' matches multiple keys, using one" echo_info "WARNING: '$recp_' matches multiple keys, using one"
isnull "$r_keyfpr" || isnonnull "${r_keyfpr##*"$Newline"*}" ||
echo_info "WARNING: '$recp_' matches multiple fingerprints, using one"
r_keyinfo=${r_keyinfo%%"$Newline"*} r_keyinfo=${r_keyinfo%%"$Newline"*}
r_keyfpr=${r_keyfpr%%"$Newline"*}
keyid_=$(xfeed "$r_keyinfo" cut -f 5 -d :) keyid_=$(xfeed "$r_keyinfo" cut -f 5 -d :)
fprid_=$(xfeed "$r_keyfpr" cut -f 10 -d :)
isnonnull "$keyid_" && isnonnull "$fprid_" &&
signers_="$signers_ $keyid_" && signers_="$signers_ $keyid_" &&
append_to @good_sig "^\[GNUPG:\] GOODSIG $keyid_" || { append_to @good_sig "^\[GNUPG:\] VALIDSIG .*$fprid_$" || {
echo_info "WARNING: Skipping missing key $recp_" echo_info "WARNING: Skipping missing key $recp_"
continue continue
} }