X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fimport_key;h=6394ad734fec1e601f92d1362329ae9ba51f06ad;hb=c073811aa573d0e3486c39ed9514c46e0a7a077f;hp=2e73a8c6cc32878a11e413ca706f5290d91e55c7;hpb=be606510fb37cac8ca7eddadf719efb0598a2ed2;p=monkeysphere.git

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 2e73a8c..6394ad7 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -13,35 +13,61 @@
 
 import_key() {
 
+local sshKeyFile
 local hostName
+local domain
 local userID
-local fingerprint
 
-# check for presense of secret key
-# FIXME: is this the proper test to be doing here?
-fingerprint_host_key >/dev/null \
-	&& failure "An OpenPGP host key already exists."
+sshKeyFile="$1"
+hostName="$2"
 
-hostName=${1:-$(hostname -f)}
+# use the default hostname if not specified
+if [ -z "$hostName" ] ; then
+    hostName=$(hostname -f) || failure "Could not determine hostname."
+    # 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}"
 
 # create host home
-mkdir -p "$GNUPGHOME_HOST"
-chmod 700 "$GNUPGHOME_HOST"
+mkdir -p "${MHDATADIR}"
+mkdir -p "${GNUPGHOME_HOST}"
+chmod 700 "${GNUPGHOME_HOST}"
 
-log verbose "importing ssh key..."
-# translate ssh key to a private key
-(umask 077 && \
-	pem2openpgp "$userID" | gpg_host --import)
+# import ssh key to a private key
+if [ -z "$sshKeyFile" ] ; then
+    failure "Must specify ssh key file to import, or specify '-' for stdin."
+elif [ "$sshKeyFile" = '-' ] ; then
+    log verbose "importing ssh key from stdin..."
+    PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \
+	| gpg_host --import
+else
+    log verbose "importing ssh key from file '$sshKeyFile'..."
+    PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \
+	<"$sshKeyFile" \
+	| gpg_host --import
+fi
 
-# find the key fingerprint of the newly converted key
-fingerprint=$(fingerprint_host_key)
+# 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
 
-# export public key to file
-log debug "exporting openpgp public key..."
-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
+
+log info "host key imported:"
 
 # show info about new key
 show_key