summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-03 01:23:51 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-03 01:23:51 -0500
commitbe606510fb37cac8ca7eddadf719efb0598a2ed2 (patch)
tree59bf8f89771af2bae8c882631c0836e3f029bd86
parent10c741dac082844fbf9a2fbbfc4322f718c2abea (diff)
fix up gen/import-key:
- remove stuff about expiration, so we assume keys imported/generated with no expiration - set expiration with 'set-expire' function - update tests to test key importing and generation - fix some bugs
-rwxr-xr-xsrc/monkeysphere-host16
-rw-r--r--src/share/mh/extend_key7
-rw-r--r--src/share/mh/gen_key24
-rw-r--r--src/share/mh/import_key57
-rwxr-xr-xtests/basic33
5 files changed, 58 insertions, 79 deletions
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index f172209..a6fa62f 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -12,6 +12,8 @@
# version 3 or later.
########################################################################
+set -e
+
PGRM=$(basename $0)
SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
@@ -47,7 +49,7 @@ Monkeysphere host admin tool.
subcommands:
show-key (s) output all host key information
- extend-key (e) EXPIRE extend host key expiration
+ set-expire (e) EXPIRE set host key expiration
add-hostname (n+) NAME[:PORT] add hostname user ID to host key
revoke-hostname (n-) NAME[:PORT] revoke hostname user ID
add-revoker (o) FINGERPRINT add a revoker to the host key
@@ -114,7 +116,8 @@ show_key() {
# FIXME: you shouldn't have to be root to see the host key fingerprint
check_host_keyring
fingerprintPGP=$(fingerprint_host_key)
- gpg_host "--fingerprint --list-key --list-options show-unusable-uids $fingerprintPGP" 2>/dev/null
+
+ gpg_host --fingerprint --list-key --list-options show-unusable-uids "0x${fingerprintPGP}!" 2>/dev/null
echo "OpenPGP fingerprint: $fingerprintPGP"
if [ -f "${MHDATADIR}/ssh_host_rsa_key.pub" ] ; then
@@ -124,6 +127,9 @@ show_key() {
else
log info "SSH host key not found."
fi
+
+ # FIXME: show expiration date
+ # FIXME: other relevant key parameters?
}
########################################################################
@@ -169,7 +175,8 @@ case $COMMAND in
show_key
;;
- 'extend-key'|'e')
+ # FIXME: what should we call this command?
+ 'set-expire'|'extend-key'|'e')
check_host_keyring
source "${MHSHAREDIR}/extend_key"
extend_key "$@"
@@ -215,11 +222,8 @@ usage: $PGRM expert <subcommand> [options] [args]
expert subcommands:
import-key (i) [NAME[:PORT]] import existing ssh key to gpg
- --keyfile (-f) FILE key file to import
- --expire (-e) EXPIRE date to expire
gen-key (g) [NAME[:PORT]] generate gpg key for the host
--length (-l) BITS key length in bits (2048)
- --expire (-e) EXPIRE date to expire
diagnostics (d) monkeysphere host status
EOF
diff --git a/src/share/mh/extend_key b/src/share/mh/extend_key
index d03b89a..79ee267 100644
--- a/src/share/mh/extend_key
+++ b/src/share/mh/extend_key
@@ -27,8 +27,9 @@ $extendTo
save
EOF
-echo
-echo "NOTE: Host key expiration date adjusted, but not yet published."
-echo "Run '$PGRM publish-key' to publish the new expiration date."
+cat <<EOF | log info
+NOTE: Host key expiration date adjusted, but not yet published.
+Run '$PGRM publish-key' to publish the new expiration date.
+EOF
}
diff --git a/src/share/mh/gen_key b/src/share/mh/gen_key
index a73d85e..eb951cf 100644
--- a/src/share/mh/gen_key
+++ b/src/share/mh/gen_key
@@ -16,7 +16,7 @@ gen_key() {
local keyType="RSA"
local keyLength="2048"
local keyUsage="auth"
-local keyExpire
+local keyExpire="0"
local hostName=$(hostname -f)
local userID
local keyParameters
@@ -34,17 +34,13 @@ while true ; do
keyLength="$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;
+ shift
break
;;
esac
@@ -52,9 +48,6 @@ done
userID="ssh://${hostName}"
-# prompt about key expiration if not specified
-keyExpire=$(get_gpg_expiration "$keyExpire")
-
# set key parameters
keyParameters=\
"Key-Type: $keyType
@@ -63,7 +56,7 @@ Key-Usage: $keyUsage
Name-Real: $userID
Expire-Date: $keyExpire"
-echo "The following key parameters will be used for the host private key:"
+echo "The following key parameters will be used for the host key:"
echo "$keyParameters"
read -p "Generate key? (Y/n) " OK; OK=${OK:=Y}
@@ -79,6 +72,10 @@ keyParameters=\
%commit
%echo done"
+# create host home
+mkdir -p "$GNUPGHOME_HOST"
+chmod 700 "$GNUPGHOME_HOST"
+
log verbose "generating host key..."
echo "$keyParameters" | gpg_host --batch --gen-key
@@ -88,13 +85,18 @@ fingerprint=$(fingerprint_host_key)
# translate the private key to ssh format, and export to a file
# for sshs usage.
# NOTE: assumes that the primary key is the proper key to use
+log debug "exporting new secret key to ssh format..."
(umask 077 && \
gpg_host --export-secret-key "$fingerprint" | \
openpgp2ssh "$fingerprint" > "${MHDATADIR}/ssh_host_rsa_key")
log info "SSH host private key output to file: ${MHDATADIR}/ssh_host_rsa_key"
+
+log debug "creating ssh public key..."
ssh-keygen -y -f "${MHDATADIR}/ssh_host_rsa_key" > "${MHDATADIR}/ssh_host_rsa_key.pub"
log info "SSH host public key output to file: ${MHDATADIR}/ssh_host_rsa_key.pub"
-gpg_host "--export-options export-minimal --armor --export 0x${fingerprint}\!" > "${MHDATADIR}/ssh_host_rsa_key.pub.gpg"
+
+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"
# show info about new key
diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index e7b713f..2e73a8c 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -13,73 +13,34 @@
import_key() {
-local hostName=$(hostname -f)
-local keyFile="/etc/ssh/ssh_host_rsa_key"
-local keyExpire
+local hostName
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."
-# 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."
-fi
+hostName=${1:-$(hostname -f)}
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 "$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 "$userID" | gpg_host --import)
# find the key fingerprint of the newly converted key
fingerprint=$(fingerprint_host_key)
-# export host ownertrust to authentication keyring
-log verbose "setting ultimate owner trust for host key..."
-echo "${fingerprint}:6:" | gpg_host "--import-ownertrust"
-
# export public key to file
-gpg_host "--export-options export-minimal --armor --export 0x${fingerprint}\!" > "${MHDATADIR}/ssh_host_rsa_key.pub.gpg"
+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"
# show info about new key
diff --git a/tests/basic b/tests/basic
index 5e233aa..a3d0b4f 100755
--- a/tests/basic
+++ b/tests/basic
@@ -182,25 +182,35 @@ EOF
######################################################################
### SERVER HOST SETUP
-# set up monkeysphere host
-echo "##################################################"
-echo "### configuring monkeysphere host..."
-mkdir -p -m 750 "$MONKEYSPHERE_SYSDATADIR"/host
-
# create a new host key
echo "##################################################"
-echo "### generating server host key..."
+echo "### testing host key generation..."
+mkdir -p -m 750 "$MONKEYSPHERE_SYSDATADIR"/host
# add gpg.conf with quick-random
get_gpg_prng_arg >> "$MONKEYSPHERE_SYSCONFIGDIR"/host/gpg.conf
-echo | monkeysphere-host expert gen-key --length 1024 --expire 0 testhost
-# remove the gpg.conf
-rm "$MONKEYSPHERE_SYSCONFIGDIR"/host/gpg.conf
+echo | monkeysphere-host expert gen-key --length 1024 testhost
-# FIXME: need to test import-key as well
+# remove the host home for the next test
+rm -rf "$MONKEYSPHERE_SYSCONFIGDIR"/host
+# import host key
+echo "##################################################"
+echo "### testing host key importing..."
+ssh-keygen -b 1024 -t rsa -N '' -f "$TEMPDIR"/ssh_host_rsa_key
+monkeysphere-host expert import-key testhost < "$TEMPDIR"/ssh_host_rsa_key
+
+# change host key expiration
+echo "##################################################"
+echo "### setting host key expiration..."
+monkeysphere-host set-expire 1
+monkeysphere-host show-key
+# FIXME: how do we check that the expiration has really been set?
+
+echo "##################################################"
+echo "### getting host key fingerprint..."
HOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\ )
-# certify it with the "Admin's Key".
+# certify host key with the "Admin's Key".
# (this would normally be done via keyservers)
echo "##################################################"
echo "### certifying server host key..."
@@ -301,6 +311,7 @@ chmod o-w "$TESTHOME"/.monkeysphere/authorized_user_ids
# FIXME: addtest: remove admin as id-certifier and check ssh failure
+# FIXME: addtest: add hostname on host key
# FIXME: addtest: revoke hostname on host key and check ssh failure
# FIXME: addtest: revoke the host key and check ssh failure