From 3d9b9cfba8646bb7711dae5a8d917c2acd21519a Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 21 Jun 2008 16:26:35 -0400 Subject: [PATCH] Add some more checks to gen-subkey --- src/monkeysphere | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/monkeysphere b/src/monkeysphere index 58f0fdc..e111d8e 100755 --- a/src/monkeysphere +++ b/src/monkeysphere @@ -54,11 +54,27 @@ gen_subkey(){ gpgOut=$(gpg --quiet --fixed-list-mode --list-keys --with-colons \ "$keyID" 2> /dev/null) - # return 1 if there only "tru" lines are output from gpg + # fail if there only "tru" lines are output from gpg, which + # indicates the key was not found. if [ -z "$(echo "$gpgOut" | grep -v '^tru:')" ] ; then failure "Key ID '$keyID' not found." fi + # fail if multiple pub lines are returned, which means the id given + # is not unique + if [ $(echo "$gpgOut" | grep '^pub:' | wc -l) -gt '1' ] ; then + failure "Key ID '$keyID' is not unique." + fi + + # prompt if an authentication subkey already exists + if echo "$gpgOut" | egrep "^(pub|sub):" | cut -d: -f 12 | grep -q a ; then + echo "An authentication subkey already exists for key '$keyID'." + read -p "Are you sure you would like to generate another one? [y|N]: " OK; OK=${OK:N} + if [ "${OK/y/Y}" != 'Y' ] ; then + failure "aborting." + fi + fi + # set subkey defaults SUBKEY_TYPE=${SUBKEY_TYPE:-"RSA"} #SUBKEY_LENGTH=${SUBKEY_LENGTH:-"2048"} -- 2.25.1