#!/bin/sh
+# monkeysphere: MonkeySphere client tool
+#
+# The monkeysphere scripts are written by:
+# Jameson Rollins <jrollins@fifthhorseman.net>
+#
+# They are Copyright 2008, and are all released under the GPL, version 3
+# or later.
+
########################################################################
PGRM=$(basename $0)
export SHAREDIR
. "${SHAREDIR}/common"
-GLOBAL_CONFIG=${GLOBAL_CONFIG:-"${ETC}"/monkeysphere.conf}
+GLOBAL_CONFIG=${GLOBAL_CONFIG:-"${ETC}/monkeysphere.conf"}
[ -r "$GLOBAL_CONFIG" ] && . "$GLOBAL_CONFIG"
# date in UTF format if needed
Monkeysphere client tool.
subcommands:
- update-known-hosts (k) [HOST]... update known_hosts file
- update-authorized-keys (a) update authorized_keys file
- update-userid (u) [USERID]... add/update userid to
- authorized_user_ids
- help (h,?) this help
+ update-known_hosts (k) [HOST]... update known_hosts file
+ update-userids (u) [USERID]... add/update userid
+ update-authorized_keys (a) update authorized_keys file
+ gen-ae-subkey (g) KEYID generate an 'ae' capable subkey
+ help (h,?) this help
EOF
}
+# generate a subkey with the 'a' and 'e' usage flags set
+gen_ae_subkey(){
+ local keyID
+ local gpgOut
+ local userID
+
+ log "warning: this function is still not working."
+
+ keyID="$1"
+
+ # set subkey defaults
+ SUBKEY_TYPE=${KEY_TYPE:-"RSA"}
+ SUBKEY_LENGTH=${KEY_LENGTH:-"1024"}
+ SUBKEY_USAGE=${KEY_USAGE:-"encrypt,auth"}
+
+ gpgOut=$(gpg --fixed-list-mode --list-keys --with-colons \
+ "$keyID" 2> /dev/null)
+
+ # return 1 if there only "tru" lines are output from gpg
+ if [ -z "$(echo "$gpgOut" | grep -v '^tru:')" ] ; then
+ log " key not found."
+ return 1
+ fi
+
+ userID=$(echo "$gpgOut" | grep "^uid:" | cut -d: -f10)
+
+ # set key parameters
+ keyParameters=$(cat <<EOF
+Subkey-Type: $SUBKEY_TYPE
+Subkey-Length: $SUBKEY_LENGTH
+Subkey-Usage: $SUBKEY_USAGE
+Name-Real: $userID
+EOF
+)
+
+ echo "The following key parameters will be used:"
+ echo "$keyParameters"
+
+ read -p "generate key? [Y|n]: " OK; OK=${OK:=Y}
+ if [ ${OK/y/Y} != 'Y' ] ; then
+ failure "aborting."
+ fi
+
+ # add commit command
+ keyParameters="${keyParameters}"$(cat <<EOF
+
+%commit
+%echo done
+EOF
+)
+
+ echo "generating subkey..."
+ echo "$keyParameters" | gpg --batch --gen-key
+}
+
########################################################################
# MAIN
########################################################################
shift
# set ms home directory
-MS_HOME=${MS_HOME:-"$HOME"/.config/monkeysphere}
+MS_HOME=${MS_HOME:-"${HOME}/.config/monkeysphere"}
# load configuration file
-MS_CONF=${MS_CONF:-"$MS_HOME"/monkeysphere.conf}
+MS_CONF=${MS_CONF:-"${MS_HOME}/monkeysphere.conf"}
[ -e "$MS_CONF" ] && . "$MS_CONF"
# set empty config variable with defaults
-AUTHORIZED_USER_IDS=${AUTHORIZED_USER_IDS:-"$MS_HOME"/authorized_user_ids}
-GNUPGHOME=${GNUPGHOME:-"$HOME"/.gnupg}
-KEYSERVER=${KEYSERVER:-subkeys.pgp.net}
+AUTHORIZED_USER_IDS=${AUTHORIZED_USER_IDS:-"${MS_HOME}/authorized_user_ids"}
+GNUPGHOME=${GNUPGHOME:-"${HOME}/.gnupg"}
+KEYSERVER=${KEYSERVER:-"subkeys.pgp.net"}
REQUIRED_KEY_CAPABILITY=${REQUIRED_KEY_CAPABILITY:-"e a"}
-USER_CONTROLLED_AUTHORIZED_KEYS=${USER_CONTROLLED_AUTHORIZED_KEYS:-%h/.ssh/authorized_keys}
-USER_KNOWN_HOSTS=${USER_KNOWN_HOSTS:-"$HOME"/.ssh/known_hosts}
-HASH_KNOWN_HOSTS=${HASH_KNOWN_HOSTS:-}
+USER_CONTROLLED_AUTHORIZED_KEYS=${USER_CONTROLLED_AUTHORIZED_KEYS:-"%h/.ssh/authorized_keys"}
+USER_KNOWN_HOSTS=${USER_KNOWN_HOSTS:-"${HOME}/.ssh/known_hosts"}
+HASH_KNOWN_HOSTS=${HASH_KNOWN_HOSTS:-"true"}
export GNUPGHOME
# stagging locations
-hostKeysCacheDir="$MS_HOME"/host_keys
-userKeysCacheDir="$MS_HOME"/user_keys
-msAuthorizedKeys="$MS_HOME"/authorized_keys
+hostKeysCacheDir="${MS_HOME}/host_keys"
+userKeysCacheDir="${MS_HOME}/user_keys"
+msAuthorizedKeys="${MS_HOME}/authorized_keys"
# make sure gpg home exists with proper permissions
mkdir -p -m 0700 "$GNUPGHOME"
+# make sure the user monkeysphere home directory exists
+mkdir -p -m 0700 "$MS_HOME"
+mkdir -p "$hostKeysCacheDir"
+mkdir -p "$userKeysCacheDir"
+
case $COMMAND in
- 'update-known-hosts'|'k')
+ 'update-known_hosts'|'update-known-hosts'|'k')
MODE='known_hosts'
# touch the known_hosts file to make sure it exists
+ # ssh-keygen complains if it doesn't exist
touch "$USER_KNOWN_HOSTS"
# if hosts are specified on the command line, process just
process_host "$host" "$hostKeysCacheDir"
done
- # otherwise, if no hosts are specified, process the user
- # known_hosts file
+ # otherwise, if no hosts are specified, process every user
+ # in the user's known_hosts file
else
if [ ! -s "$USER_KNOWN_HOSTS" ] ; then
failure "known_hosts file '$USER_KNOWN_HOSTS' is empty."
fi
;;
- 'update-authorized-keys'|'a')
+ 'update-authorized_keys'|'update-authorized-keys'|'a')
MODE='authorized_keys'
- log "processing authorized_user_ids file..."
-
# make sure authorized_user_ids file exists
if [ ! -s "$AUTHORIZED_USER_IDS" ] ; then
- log "authorized_user_ids file is empty or does not exist."
- exit
+ failure "authorized_user_ids file is empty or does not exist."
fi
- process_authorized_ids "$AUTHORIZED_USER_IDS" "$userKeysCacheDir"
+ # set user-controlled authorized_keys file path
+ userAuthorizedKeys=${USER_CONTROLLED_AUTHORIZED_KEYS/\%h/"$HOME"}
- # write output key file
- log "writing monkeysphere authorized_keys file... "
- touch "$msAuthorizedKeys"
- if [ "$(ls "$userKeysCacheDir")" ] ; then
- log -n "adding gpg keys... "
- cat "$userKeysCacheDir"/* > "$msAuthorizedKeys"
- echo "done."
- else
- log "no gpg keys to add."
- fi
- if [ "$USER_CONTROLLED_AUTHORIZED_KEYS" ] ; then
- userAuthorizedKeys=${USER_CONTROLLED_AUTHORIZED_KEYS/\%h/"$HOME"}
- if [ -s "$userAuthorizedKeys" ] ; then
- log -n "adding user authorized_keys file... "
- cat "$userAuthorizedKeys" >> "$msAuthorizedKeys"
- echo "done."
- fi
- fi
- log "monkeysphere authorized_keys file generated:"
- log "$msAuthorizedKeys"
+ # update authorized_keys
+ update_authorized_keys "$msAuthorizedKeys" "$userAuthorizedKeys" "$userKeysCacheDir"
;;
- 'update-userid'|'u')
+ 'update-userids'|'u')
if [ -z "$1" ] ; then
failure "you must specify at least one userid."
fi
for userID ; do
- if ! grep -q "^${userID}\$" "$AUTHORIZED_USER_IDS" ; then
- log "userid '$userID' not in authorized_user_ids file."
- continue
- fi
- log "processing user id: '$userID'"
- process_user_id "$userID" "$userKeysCacheDir" > /dev/null
+ update_userid "$userID" "$userKeysCacheDir"
done
;;
+ 'gen-ae-subkey'|'g')
+ keyID="$1"
+ if [ -z "$keyID" ] ; then
+ failure "you must specify keyid of primary key."
+ fi
+ gen_ae_subkey "$keyID"
+ ;;
+
'help'|'h'|'?')
usage
;;
projects / monkeysphere.git / blobdiff