########################################################################
set -e
+# set the pipefail option so pipelines fail on first command failure
+set -o pipefail
+
PGRM=$(basename $0)
SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
# datadir for host functions
MHDATADIR="${SYSDATADIR}/host"
+# host pub key files
+HOST_KEY_PUB="${SYSDATADIR}/ssh_host_rsa_key.pub"
+HOST_KEY_PUB_GPG="${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
+
# UTC date in ISO 8601 format if needed
DATE=$(date -u '+%FT%T')
EOF
}
-# function to run command as monkeysphere user
-su_monkeysphere_user() {
- # if the current user is the monkeysphere user, then just eval
- # command
- if [ $(id -un) = "$MONKEYSPHERE_USER" ] ; then
- eval "$@"
+# function to interact with the gpg keyring
+gpg_host() {
+ GNUPGHOME="$GNUPGHOME_HOST" gpg "$@"
+}
+
+# command to list the info about the host key, in colon format
+gpg_host_list() {
+ gpg_host --list-keys --with-colons --fixed-list-mode \
+ --with-fingerprint --with-fingerprint \
+ "0x${HOST_FINGERPRINT}!"
- # otherwise su command as monkeysphere user
+}
+
+# command for edit key scripts, takes scripts on stdin
+gpg_host_edit() {
+ gpg_host --quiet --command-fd 0 --edit-key \
+ "0x${HOST_FINGERPRINT}!" "$@"
+}
+
+# export the host key to stdout
+gpg_host_export() {
+ gpg_host --export --armor --export-options export-minimal \
+ "0x${HOST_FINGERPRINT}!"
+}
+
+# export the host secret key to the monkeysphere ssh sec key file
+# NOTE: assumes that the primary key is the proper key to use
+create_ssh_sec_file() {
+ log debug "creating ssh secret key file..."
+ (umask 077 && \
+ gpg_host --export-secret-key "$HOST_FINGERPRINT" | \
+ openpgp2ssh "$HOST_FINGERPRINT" > "${MHDATADIR}/ssh_host_rsa_key")
+ log info "SSH host secret key file: ${MHDATADIR}/ssh_host_rsa_key"
+}
+
+# export the host public key to the monkeysphere ssh pub key file
+create_ssh_pub_file() {
+ log debug "creating ssh public key file..."
+ ssh-keygen -y -f "${MHDATADIR}/ssh_host_rsa_key" > "$HOST_KEY_PUB"
+ log info "SSH host public key file: $HOST_KEY_PUB"
+}
+
+# export the host public key to the monkeysphere gpg pub key file
+create_gpg_pub_file() {
+ log debug "creating openpgp public key file..."
+ gpg_host_export > "$HOST_KEY_PUB_GPG"
+ log info "GPG host public key file: $HOST_KEY_PUB_GPG"
+}
+
+# load the host fingerprint into the fingerprint variable, using the
+# export gpg pub key file
+# FIXME: this seems much less than ideal, with all this temp keyring
+# stuff. is there a way we can do this without having to create temp
+# files?
+load_fingerprint() {
+ if [ -f "$HOST_KEY_PUB_GPG" ] ; then
+ HOST_FINGERPRINT=$( \
+ (FUBAR=$(mktemp -d) && export GNUPGHOME="$FUBAR" \
+ && gpg --quiet --import \
+ && gpg --quiet --list-keys --with-colons --with-fingerprint \
+ && rm -rf "$FUBAR") <"$HOST_KEY_PUB_GPG" \
+ | grep '^fpr:' | cut -d: -f10 )
else
- su "$MONKEYSPHERE_USER" -c "$@"
+ HOST_FINGERPRINT=
fi
}
-# function to interact with the gpg keyring
-gpg_host() {
- local returnCode
-
- GNUPGHOME="$GNUPGHOME_HOST"
- export GNUPGHOME
+# load the host fingerprint into the fingerprint variable, using the
+# gpg host secret key
+load_fingerprint_secret() {
+ HOST_FINGERPRINT=$( \
+ gpg_host --quiet --list-secret-key \
+ --with-colons --with-fingerprint \
+ | grep '^fpr:' | cut -d: -f10 )
+}
- # NOTE: we supress this warning because we need the monkeysphere
- # user to be able to read the host pubring. we realize this might
- # be problematic, but it's the simplest solution, without too much
- # loss of security.
- gpg "$@"
+# output host key ssh fingerprint
+load_ssh_fingerprint() {
+ [ -f "$HOST_KEY_PUB" ] || return 0
+ HOST_FINGERPRINT_SSH=$(ssh-keygen -l -f "$HOST_KEY_PUB" \
+ | awk '{ print $1, $2, $4 }')
}
-# output just key fingerprint
-fingerprint_host_key() {
- # set the pipefail option so functions fails if can't read sec key
- set -o pipefail
+# fail if host key present
+check_host_key() {
+ [ -z "$HOST_FINGERPRINT" ] \
+ || failure "An OpenPGP host key already exists."
+}
- gpg_host --list-secret-keys --fingerprint \
- --with-colons --fixed-list-mode 2> /dev/null | \
- grep '^fpr:' | head -1 | cut -d: -f10 2>/dev/null
+# fail if host key not present
+check_host_no_key() {
+ [ "$HOST_FINGERPRINT" ] \
+ || failure "You don't appear to have a Monkeysphere host key on this server. Please run 'monkeysphere-host expert import-key' first."
}
-# function to check for host secret key
-check_host_keyring() {
- fingerprint_host_key >/dev/null \
- || failure "You don't appear to have a Monkeysphere host key on this server. Please run 'monkeysphere-host import-key' first."
+# output the index of a user ID on the host key
+# return 1 if user ID not found
+find_host_userid() {
+ local userID="$1"
+ local tmpuidMatch
+ local line
+
+ # match to only ultimately trusted user IDs
+ tmpuidMatch="u:$(echo $userID | gpg_escape)"
+
+ # find the index of the requsted user ID
+ # NOTE: this is based on circumstantial evidence that the order of
+ # this output is the appropriate index
+ line=$(gpg_host_list | egrep '^(uid|uat):' | cut -f2,10 -d: | \
+ grep -n -x -F "$tmpuidMatch" 2>/dev/null)
+
+ if [ "$line" ] ; then
+ echo ${line%%:*}
+ return 0
+ else
+ return 1
+ fi
}
# show info about the host key
show_key() {
- local fingerprintPGP
- local fingerprintSSH
+ gpg_host --fingerprint --list-key --list-options show-unusable-uids \
+ "0x${HOST_FINGERPRINT}!" 2>/dev/null
+ # FIXME: make sure expiration date is shown
- # FIXME: you shouldn't have to be root to see the host key fingerprint
- check_host_keyring
- fingerprintPGP=$(fingerprint_host_key)
+ echo "OpenPGP fingerprint: $HOST_FINGERPRINT"
- gpg_host --fingerprint --list-key --list-options show-unusable-uids "0x${fingerprintPGP}!" 2>/dev/null
- echo "OpenPGP fingerprint: $fingerprintPGP"
+ load_ssh_fingerprint
- if [ -f "${MHDATADIR}/ssh_host_rsa_key.pub" ] ; then
- fingerprintSSH=$(ssh-keygen -l -f "${MHDATADIR}/ssh_host_rsa_key.pub" | \
- awk '{ print $1, $2, $4 }')
- echo "ssh fingerprint: $fingerprintSSH"
+ if [ "$HOST_FINGERPRINT_SSH" ] ; then
+ echo "ssh fingerprint: $HOST_FINGERPRINT_SSH"
else
- log info "SSH host key not found."
+ log error "SSH host key not found."
fi
- # FIXME: show expiration date
# FIXME: other relevant key parameters?
}
export KEYSERVER
export GNUPGHOME_HOST
export GNUPGHOME
+export HOST_FINGERPRINT=
+export HOST_FINGERPRINT_SSH=
# get subcommand
COMMAND="$1"
case $COMMAND in
'show-key'|'show'|'s')
- check_host_keyring
+ load_fingerprint
+ check_host_no_key
show_key
;;
- # FIXME: what should we call this command?
'set-expire'|'extend-key'|'e')
- check_host_keyring
- source "${MHSHAREDIR}/extend_key"
- extend_key "$@"
+ load_fingerprint
+ check_host_no_key
+ source "${MHSHAREDIR}/set_expire"
+ set_expire "$@"
;;
'add-hostname'|'add-name'|'n+')
- check_host_keyring
+ load_fingerprint
+ check_host_no_key
source "${MHSHAREDIR}/add_hostname"
add_hostname "$@"
;;
'revoke-hostname'|'revoke-name'|'n-')
- check_host_keyring
+ load_fingerprint
+ check_host_no_key
source "${MHSHAREDIR}/revoke_hostname"
revoke_hostname "$@"
;;
'add-revoker'|'o')
- check_host_keyring
+ load_fingerprint
+ check_host_no_key
source "${MHSHAREDIR}/add_revoker"
add_revoker "$@"
;;
'revoke-key'|'r')
- check_host_keyring
+ load_fingerprint
+ check_host_no_key
source "${MHSHAREDIR}/revoke_key"
revoke_key "$@"
;;
'publish-key'|'publish'|'p')
- check_host_keyring
+ load_fingerprint
+ check_host_no_key
source "${MHSHAREDIR}/publish_key"
publish_key
;;
- 'expert'|'e')
+ 'expert')
SUBCOMMAND="$1"
shift
case "$SUBCOMMAND" in
;;
'import-key'|'i')
+ load_fingerprint
+ check_host_key
source "${MHSHAREDIR}/import_key"
import_key "$@"
;;
'gen-key'|'g')
+ load_fingerprint
+ check_host_key
source "${MHSHAREDIR}/gen_key"
gen_key "$@"
;;
projects / monkeysphere.git / blobdiff