X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fshare%2Fmh%2Fimport_key;h=6f12b7fd1381c6b2a1a9e1a6ee769981fd0b4038;hb=d2874b94fedbe6d043d44ca3562879251e6ea10f;hp=0f16d2791cf66359a13d4ab43c8af729904077e8;hpb=89e447e2001c0406fab6d2e6ca300a19d492435b;p=monkeysphere.git

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 0f16d27..6f12b7f 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -13,74 +13,55 @@
 
 import_key() {
 
-local hostName=$(hostname -f)
-local keyFile="/etc/ssh/ssh_host_rsa_key"
-local keyExpire
+local hostName
+local domain
 local userID
 
-# check for presense of secret key
-# FIXME: is this the proper test to be doing here?
-fingerprint_server_key >/dev/null \
-	&& failure "An OpenPGP host key already exists."
-
-# get options
-while true ; do
-	case "$1" in
-	    -f|--keyfile)
-		keyFile="$2"
-		shift 2
-		;;
-	    -e|--expire)
-		keyExpire="$2"
-		shift 2
-		;;
-	    *)
-		if [ "$(echo "$1" | cut -c 1)" = '-' ] ; then
-		    failure "Unknown option '$1'.
-Type '$PGRM help' for usage."
-		fi
-		hostName="$1"
-		shift
-		;;
-		break
-		;;
-	esac
-done
-
-if [ ! -f "$keyFile" ] ; then
-	failure "SSH secret key file '$keyFile' not found."
+hostName="$1"
+
+# use the default hostname if not specified
+if [ -z "$hostName" ] ; then
+    hostName=$(hostname -f)
+    # test that the domain is not obviously illegitimate
+    domain=${foo##*.}
+    case $domain in
+	'local'|'localdomain')
+	    failure "Host domain '$domain' is not legitimate.  Aborting key import."
+	    ;;
+    esac
+    # test that there are at least two parts
+    if (( $(echo "$hostName" | tr . ' ' | wc -w) < 2 )) ; then
+	failure "Host name '$hostName' is not legitimate.  Aborting key import."
+    fi
 fi
 
 userID="ssh://${hostName}"
 
-# prompt about key expiration if not specified
-keyExpire=$(get_gpg_expiration "$keyExpire")
-
-echo "The following key parameters will be used for the host private key:"
-echo "Import: $keyFile"
-echo "Name-Real: $userID"
-echo "Expire-Date: $keyExpire"
-
-read -p "Import key? (Y/n) " OK; OK=${OK:=Y}
-if [ ${OK/y/Y} != 'Y' ] ; then
-	failure "aborting."
-fi
+# create host home
+mkdir -p "${MHDATADIR}"
+mkdir -p "${MHTMPDIR}"
+mkdir -p "${GNUPGHOME_HOST}"
+chmod 700 "${GNUPGHOME_HOST}"
 
 log verbose "importing ssh key..."
 # translate ssh key to a private key
-(umask 077 && \
-	pem2openpgp "$userID" "$keyExpire" < "$sshKey" | gpg_host --import)
+PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \
+    | gpg_host --import
+
+# load the new host fpr into the fpr variable.  this is so we can
+# create the gpg pub key file.  we have to do this from the secret key
+# ring since we obviously don't have the gpg pub key file yet, since
+# that's what we're trying to produce (see below).
+load_fingerprint_secret
 
-# find the key fingerprint of the newly converted key
-fingerprint=$(fingerprint_server_key)
+# set ultimate owner trust on the newly imported key
+printf "%s:6:\n" "$HOST_FINGERPRINT" | gpg_host --import-ownertrust
 
-# export host ownertrust to authentication keyring
-log verbose "setting ultimate owner trust for host key..."
-echo "${fingerprint}:6:" | gpg_host "--import-ownertrust"
+# update trustdb
+gpg_host --check-trustdb
 
-# export public key to file
-gpg_host "--export-options export-minimal --armor --export 0x${fingerprint}\!" > "${MHDATADIR}/ssh_host_rsa_key.pub.gpg"
-log info "SSH host public key in OpenPGP form: ${MHDATADIR}/ssh_host_rsa_key.pub.gpg"
+# export to gpg public key to file
+update_gpg_pub_file
 
 # show info about new key
 show_key