projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merging changes from micah
[monkeysphere.git]
/
src
/
monkeysphere-host
diff --git
a/src/monkeysphere-host
b/src/monkeysphere-host
index 9eed3acb61382f6177e0afae7e496f0e71ebb7eb..bf586169bf5a259199e5b3ddd657e9db6c664e66 100755
(executable)
--- a/
src/monkeysphere-host
+++ b/
src/monkeysphere-host
@@
-105,16
+105,6
@@
gpg_host() {
return "$returnCode"
}
return "$returnCode"
}
-# check if user is root
-is_root() {
- [ $(id -u 2>/dev/null) = '0' ]
-}
-
-# check that user is root, for functions that require root access
-check_user() {
- is_root || failure "You must be root to run this command."
-}
-
# output just key fingerprint
fingerprint_server_key() {
# set the pipefail option so functions fails if can't read sec key
# output just key fingerprint
fingerprint_server_key() {
# set the pipefail option so functions fails if can't read sec key
@@
-138,14
+128,14
@@
show_server_key() {
local ret=0
# FIXME: you shouldn't have to be root to see the host key fingerprint
local ret=0
# FIXME: you shouldn't have to be root to see the host key fingerprint
- if is_root ; then
- check_host_keyring
- fingerprintPGP=$(fingerprint_server_key)
- gpg_authentication "--fingerprint --list-key --list-options show-unusable-uids $fingerprintPGP" 2>/dev/null
- echo "OpenPGP fingerprint: $fingerprintPGP"
- else
+ check_host_keyring
+ fingerprintPGP=$(fingerprint_server_key)
+ gpg_authentication "--fingerprint --list-key --list-options show-unusable-uids $fingerprintPGP" 2>/dev/null
+ if [ $? -ne 0 ] ; then
log info "You must be root to see host OpenPGP fingerprint."
ret='1'
log info "You must be root to see host OpenPGP fingerprint."
ret='1'
+ else
+ echo "OpenPGP fingerprint: $fingerprintPGP"
fi
if [ -f "${SYSDATADIR}/ssh_host_rsa_key.pub" ] ; then
fi
if [ -f "${SYSDATADIR}/ssh_host_rsa_key.pub" ] ; then
@@
-257,10
+247,6
@@
gen_key() {
# get options
while true ; do
case "$1" in
# get options
while true ; do
case "$1" in
- -h|--hostname)
- hostName="$2"
- shift 2
- ;;
-l|--length)
keyLength="$2"
shift 2
-l|--length)
keyLength="$2"
shift 2
@@
-278,6
+264,7
@@
gen_key() {
failure "Unknown option '$1'.
Type '$PGRM help' for usage."
fi
failure "Unknown option '$1'.
Type '$PGRM help' for usage."
fi
+ hostName="$1"
break
;;
esac
break
;;
esac
@@
-752,37
+739,31
@@
case $COMMAND in
;;
'extend-key'|'e')
;;
'extend-key'|'e')
- check_user
check_host_keyring
extend_key "$@"
;;
'add-hostname'|'add-name'|'n+')
check_host_keyring
extend_key "$@"
;;
'add-hostname'|'add-name'|'n+')
- check_user
check_host_keyring
add_hostname "$@"
;;
'revoke-hostname'|'revoke-name'|'n-')
check_host_keyring
add_hostname "$@"
;;
'revoke-hostname'|'revoke-name'|'n-')
- check_user
check_host_keyring
revoke_hostname "$@"
;;
'add-revoker'|'o')
check_host_keyring
revoke_hostname "$@"
;;
'add-revoker'|'o')
- check_user
check_host_keyring
add_revoker "$@"
;;
'revoke-key'|'r')
check_host_keyring
add_revoker "$@"
;;
'revoke-key'|'r')
- check_user
check_host_keyring
revoke_key "$@"
;;
'publish-key'|'publish'|'p')
check_host_keyring
revoke_key "$@"
;;
'publish-key'|'publish'|'p')
- check_user
check_host_keyring
publish_server_key
;;
check_host_keyring
publish_server_key
;;