X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-server;h=023ce9bcfc546c72fa6d30e455e280f28c07479f;hb=1c1d84bc446cc6d55ba4cd5efc7f5a6c3573fa93;hp=db0fa9703c0bb8596b7c57d222228dfd22f6b576;hpb=91f299c44f20f913ac5309a67d6cf9162c101810;p=monkeysphere.git diff --git a/src/monkeysphere-server b/src/monkeysphere-server index db0fa97..023ce9b 100755 --- a/src/monkeysphere-server +++ b/src/monkeysphere-server @@ -32,31 +32,34 @@ RETURN=0 ######################################################################## usage() { -cat < [options] [args] MonkeySphere server admin tool. subcommands: update-users (u) [USER]... update user authorized_keys files - gen-key (g) [HOSTNAME] generate gpg key for the server + gen-key (g) [NAME[:PORT]] generate gpg key for the server -l|--length BITS key length in bits (2048) -e|--expire EXPIRE date to expire -r|--revoker FINGERPRINT add a revoker - show-fingerprint (f) show server's host key fingerprint - publish-key (p) publish server's host key to keyserver - diagnostics (d) report on the server's monkeysphere status - - add-identity-certifier (a) KEYID import and tsign a certification key - -n|--domain DOMAIN limit ID certifications to IDs in DOMAIN + add-hostname (n+) NAME[:PORT] add hostname user ID to server key + revoke-hostname (n-) NAME[:PORT] revoke hostname user ID + show-key (s) output all server host key information + fingerprint (f) output just the key fingerprint + publish-key (p) publish server host key to keyserver + diagnostics (d) report on server monkeysphere status + + add-id-certifier (c+) KEYID import and tsign a certification key + -n|--domain DOMAIN limit ID certifications to DOMAIN -t|--trust TRUST trust level of certifier (full) -d|--depth DEPTH trust depth for certifier (1) - remove-identity-certifier (r) KEYID remove a certification key - list-identity-certifiers (l) list certification keys + remove-id-certifier (c-) KEYID remove a certification key + list-id-certifiers (c) list certification keys gpg-authentication-cmd CMD gnupg-authentication command - help (h,?) this help + -h|--help|help (h,?) this help EOF } @@ -97,6 +100,17 @@ gpg_authentication() { su_monkeysphere_user "gpg $@" } +# output key information +show_server_key() { + gpg_host --list-secret-keys --fingerprint +} + +# output just key fingerprint +fingerprint_server_key() { + gpg_host --list-secret-keys --fingerprint --with-colons --fixed-list-mode | \ + grep '^fpr:' | head -1 | cut -d: -f10 +} + # update authorized_keys for users update_users() { if [ "$1" ] ; then @@ -236,7 +250,7 @@ gen_key() { revoker= # get options - TEMP=$(getopt -o l:e:r: -l length:,expire:,revoker: -n "$PGRM" -- "$@") + TEMP=$(getopt -o e:l:r -l expire:,length:,revoker: -n "$PGRM" -- "$@") if [ $? != 0 ] ; then exit 1 @@ -339,9 +353,8 @@ EOF # output the server fingerprint fingerprint_server_key "=${userID}" - # find the key fingerprint of the server primary key - fingerprint=$(gpg_host --list-key --with-colons --with-fingerprint "=${userID}" | \ - grep '^fpr:' | head -1 | cut -d: -f10) + # find the key fingerprint of the newly generated key + fingerprint=$(fingerprint_server_key) # export host ownertrust to authentication keyring log "setting ultimate owner trust for server key..." @@ -356,27 +369,61 @@ EOF log "Private SSH host key output to file: ${VARLIB}/ssh_host_rsa_key" } -# gpg output key fingerprint -fingerprint_server_key() { - gpg_host --fingerprint --list-secret-keys +# add hostname user ID to server key +add_hostname() { + if [ -z "$1" ] ; then + failure "You must specify a hostname to add." + fi + + userID="ssh://${1}" + + if [ "$(gpg_host --list-key "=${userID}")" ] ; then + failure "Host userID '$userID' already exists." + fi + + fingerprint=$(fingerprint_server_key) + + adduidCommand=$(cat < 1 )); then + echo "! More than one host key found?" + # FIXME: recommend a way to resolve this else - if (( "$keysfound" > 1 )); then - echo "more than one host key found?" - else - create=$(echo "$seckey" | grep ^sec: | cut -f6 -d:) - expire=$(echo "$seckey" | grep ^sec: | cut -f7 -d:) - fingerprint=$(echo "$seckey" | grep ^fpr: | head -n1 | cut -f10 -d:) + create=$(echo "$seckey" | grep ^sec: | cut -f6 -d:) + expire=$(echo "$seckey" | grep ^sec: | cut -f7 -d:) + fingerprint=$(echo "$seckey" | grep ^fpr: | head -n1 | cut -f10 -d:) # check for key expiration: - if [ "$expire" ]; then - if (( "$expire" < "$curdate" )); then - echo "Host key is expired!" + if [ "$expire" ]; then + if (( "$expire" < "$curdate" )); then + echo "! Host key is expired." # FIXME: recommend a way to resolve this other than re-keying? - elif (( "$expire" < "$warndate" )); then - echo "Host key expires in less than $warnwindow:" $(date -d "$(( $expire - $curdate )) seconds" +%F) + elif (( "$expire" < "$warndate" )); then + echo "! Host key expires in less than $warnwindow:" $(date -d "$(( $expire - $curdate )) seconds" +%F) # FIXME: recommend a way to resolve this? - fi fi - + fi + # and weirdnesses: - if [ "$create" ] && (( "$create" > "$curdate" )); then - echo "Host key was created in the future(?!). Is your clock correct?" - echo "Recommendation: Check clock ($(date +%F_%T)); use NTP?" - fi + if [ "$create" ] && (( "$create" > "$curdate" )); then + echo "! Host key was created in the future(?!). Is your clock correct?" + echo " - Recommendation: Check clock ($(date +%F_%T)); use NTP?" + fi # check for UserID expiration: - echo "$seckey" | grep ^uid: | cut -d: -f6,7,10 | \ - while IFS=: read create expire uid ; do - # FIXME: should we be doing any checking on the form - # of the User ID? Should we be unmangling it somehow? - - if [ "$create" ] && (( "$create" > "$curdate" )); then - echo "User ID '$uid' was created in the future(?!). Is your clock correct?" - echo "Recommendation: Check clock ($(date +%F_%T)); use NTP?" - fi - if [ "$expire" ] ; then - if (( "$expire" < "$curdate" )); then - echo "User ID '$uid' is expired!" - # FIXME: recommend a way to resolve this - elif (( "$expire" < "$warndate" )); then - echo "User ID '$uid' expires in less than $warnwindow:" $(date -d "$(( $expire - $curdate )) seconds" +%F) + echo "$seckey" | grep ^uid: | cut -d: -f6,7,10 | \ + while IFS=: read create expire uid ; do + # FIXME: should we be doing any checking on the form + # of the User ID? Should we be unmangling it somehow? + + if [ "$create" ] && (( "$create" > "$curdate" )); then + echo "! User ID '$uid' was created in the future(?!). Is your clock correct?" + echo " - Recommendation: Check clock ($(date +%F_%T)); use NTP?" + fi + if [ "$expire" ] ; then + if (( "$expire" < "$curdate" )); then + echo "! User ID '$uid' is expired." # FIXME: recommend a way to resolve this - fi + elif (( "$expire" < "$warndate" )); then + echo "! User ID '$uid' expires in less than $warnwindow:" $(date -d "$(( $expire - $curdate )) seconds" +%F) + # FIXME: recommend a way to resolve this fi - done + fi + done # FIXME: verify that the host key is properly published to the # keyservers (do this with the non-privileged user) @@ -456,19 +505,24 @@ diagnostics() { # FIXME: propose adding a revoker to the host key if none exist (do we # have a way to do that after key generation?) -# Ensure that the ssh_host_rsa_key file is present and non-empty: - if [ ! -s "${VARLIB}/ssh_host_rsa_key" ] ; then - echo "The host key as prepared for SSH (${VARLIB}/ssh_host_rsa_key) is missing or empty!" - else - if [ $(stat -c '%a' "${VARLIB}/ssh_host_rsa_key") != 600 ] ; then - echo "Permissions seem wrong for ${VARLIB}/ssh_host_rsa_key -- should be 0600 !" - fi + # Ensure that the ssh_host_rsa_key file is present and non-empty: + echo "Checking host SSH key..." + if [ ! -s "${VARLIB}/ssh_host_rsa_key" ] ; then + echo "! The host key as prepared for SSH (${VARLIB}/ssh_host_rsa_key) is missing or empty." + else + if [ $(stat -c '%a' "${VARLIB}/ssh_host_rsa_key") != 600 ] ; then + echo "! Permissions seem wrong for ${VARLIB}/ssh_host_rsa_key -- should be 0600." + fi - # propose changes needed for sshd_config (if any) - if ! grep -q "^HostKey ${VARLIB}/ssh_host_rsa_key$" /etc/ssh/sshd_config; then - echo "/etc/ssh/sshd_config does not point to the monkeysphere host key (${VARLIB}/ssh_host_rsa_key)." - echo "Recommendation: add a line to /etc/ssh/sshd_config: 'HostKey ${VARLIB}/ssh_host_rsa_key'" - fi + # propose changes needed for sshd_config (if any) + if ! grep -q "^HostKey[[:space:]]\+${VARLIB}/ssh_host_rsa_key$" /etc/ssh/sshd_config; then + echo "! /etc/ssh/sshd_config does not point to the monkeysphere host key (${VARLIB}/ssh_host_rsa_key)." + echo " - Recommendation: add a line to /etc/ssh/sshd_config: 'HostKey ${VARLIB}/ssh_host_rsa_key'" + fi + if badhostkeys=$(grep -i '^HostKey' | grep -q -v "^HostKey[[:space:]]\+${VARLIB}/ssh_host_rsa_key$") ; then + echo "! /etc/sshd_config refers to some non-monkeysphere host keys:" + echo "$badhostkeys" + echo " - Recommendation: remove the above HostKey lines from /etc/ssh/sshd_config" fi fi fi @@ -482,6 +536,17 @@ diagnostics() { # FIXME: make sure that at least one identity certifier exists + echo "Checking for MonkeySphere-enabled public-key authentication for users ..." + # Ensure that User ID authentication is enabled: + if ! grep -q "^AuthorizedKeysFile[[:space:]]\+${VARLIB}/authorized_keys/%u$" /etc/ssh/sshd_config; then + echo "! /etc/ssh/sshd_config does not point to monkeysphere authorized keys." + echo " - Recommendation: add a line to /etc/ssh/sshd_config: 'AuthorizedKeysFile ${VARLIB}/authorized_keys/%u'" + fi + if badauthorizedkeys=$(grep -i '^AuthorizedKeysFile' | grep -q -v "^AuthorizedKeysFile[[:space:]]\+${VARLIB}/authorized_keys/%u$") ; then + echo "! /etc/sshd_config refers to non-monkeysphere authorized_keys files:" + echo "$badauthorizedkeys" + echo " - Recommendation: remove the above AuthorizedKeysFile lines from /etc/ssh/sshd_config" + fi } # retrieve key from web of trust, import it into the host keyring, and @@ -664,11 +729,23 @@ case $COMMAND in gen_key "$@" ;; - 'show-fingerprint'|'f') + 'add-hostname'|'add-name'|'n+') + add_hostname "$@" + ;; + + 'revoke-hostname'|'revoke-name'|'n-') + revoke_hostname "$@" + ;; + + 'show-key'|'show'|'s') + show_server_key + ;; + + 'show-fingerprint'|'fingerprint'|'f') fingerprint_server_key ;; - 'publish-key'|'p') + 'publish-key'|'publish'|'p') publish_server_key ;; @@ -676,15 +753,15 @@ case $COMMAND in diagnostics ;; - 'add-identity-certifier'|'add-certifier'|'a') - add_certifier "$1" + 'add-identity-certifier'|'add-id-certifier'|'add-certifier'|'c+') + add_certifier "$@" ;; - 'remove-identity-certifier'|'remove-certifier'|'r') - remove_certifier "$1" + 'remove-identity-certifier'|'remove-id-certifier'|'remove-certifier'|'c-') + remove_certifier "$@" ;; - 'list-identity-certifiers'|'list-certifiers'|'list-certifier'|'l') + 'list-identity-certifiers'|'list-id-certifiers'|'list-certifiers'|'list-certifier'|'c') list_certifiers "$@" ;; @@ -692,7 +769,7 @@ case $COMMAND in gpg_authentication_cmd "$@" ;; - 'help'|'h'|'?') + '--help'|'help'|'-h'|'h'|'?') usage ;;