projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More cleanup:
[monkeysphere.git]
/
src
/
monkeysphere
diff --git
a/src/monkeysphere
b/src/monkeysphere
index aaeda117a0efd54d6a8ae7dcf4089fa7fe37fed8..782ba5ed0e329ff4e346df18de8190ac7dcd7039 100755
(executable)
--- a/
src/monkeysphere
+++ b/
src/monkeysphere
@@
-15,7
+15,7
@@
SHAREDIR=${SHAREDIR:-"/usr/share/monkeysphere"}
export SHAREDIR
. "${SHAREDIR}/common"
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
[ -r "$GLOBAL_CONFIG" ] && . "$GLOBAL_CONFIG"
# date in UTF format if needed
@@
-35,8
+35,8
@@
Monkeysphere client tool.
subcommands:
update-known_hosts (k) [HOST]... update known_hosts file
subcommands:
update-known_hosts (k) [HOST]... update known_hosts file
- update-authorized_keys (a) update authorized_keys file
update-userids (u) [USERID]... add/update userid
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
gen-ae-subkey (g) KEYID generate an 'ae' capable subkey
help (h,?) this help
@@
-63,7
+63,7
@@
gen_ae_subkey(){
# return 1 if there only "tru" lines are output from gpg
if [ -z "$(echo "$gpgOut" | grep -v '^tru:')" ] ; then
# return 1 if there only "tru" lines are output from gpg
if [ -z "$(echo "$gpgOut" | grep -v '^tru:')" ] ; then
- log
e
" key not found."
+ log " key not found."
return 1
fi
return 1
fi
@@
-78,7
+78,7
@@
Name-Real: $userID
EOF
)
EOF
)
-
log
"The following key parameters will be used:"
+
echo
"The following key parameters will be used:"
echo "$keyParameters"
read -p "generate key? [Y|n]: " OK; OK=${OK:=Y}
echo "$keyParameters"
read -p "generate key? [Y|n]: " OK; OK=${OK:=Y}
@@
-107,36
+107,43
@@
COMMAND="$1"
shift
# set ms home directory
shift
# set ms home directory
-MS_HOME=${MS_HOME:-"$
HOME"/.config/monkeysphere
}
+MS_HOME=${MS_HOME:-"$
{HOME}/.config/monkeysphere"
}
# load configuration file
# 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
[ -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"}
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
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 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"
+touch "$AUTHORIZED_USER_IDS"
+
case $COMMAND in
'update-known_hosts'|'update-known-hosts'|'k')
MODE='known_hosts'
# touch the known_hosts file to make sure it exists
case $COMMAND in
'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
touch "$USER_KNOWN_HOSTS"
# if hosts are specified on the command line, process just
@@
-146,8
+153,8
@@
case $COMMAND in
process_host "$host" "$hostKeysCacheDir"
done
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."
else
if [ ! -s "$USER_KNOWN_HOSTS" ] ; then
failure "known_hosts file '$USER_KNOWN_HOSTS' is empty."
@@
-157,29
+164,28
@@
case $COMMAND in
fi
;;
fi
;;
+ 'update-userids'|'u')
+ if [ -z "$1" ] ; then
+ failure "you must specify at least one userid."
+ fi
+ for userID ; do
+ update_userid "$userID" "$userKeysCacheDir"
+ done
+ ;;
+
'update-authorized_keys'|'update-authorized-keys'|'a')
MODE='authorized_keys'
# make sure authorized_user_ids file exists
if [ ! -s "$AUTHORIZED_USER_IDS" ] ; then
'update-authorized_keys'|'update-authorized-keys'|'a')
MODE='authorized_keys'
# 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 is empty."
fi
# set user-controlled authorized_keys file path
userAuthorizedKeys=${USER_CONTROLLED_AUTHORIZED_KEYS/\%h/"$HOME"}
# update authorized_keys
fi
# set user-controlled authorized_keys file path
userAuthorizedKeys=${USER_CONTROLLED_AUTHORIZED_KEYS/\%h/"$HOME"}
# update authorized_keys
- update_authorized_keys "$userKeysCacheDir" "$msAuthorizedKeys" "$userAuthorizedKeys"
- ;;
-
- 'update-userids'|'u')
- if [ -z "$1" ] ; then
- failure "you must specify at least one userid."
- fi
- for userID ; do
- update_userid "$userID" "$userKeysCacheDir"
- done
+ update_authorized_keys "$msAuthorizedKeys" "$userAuthorizedKeys" "$userKeysCacheDir"
;;
'gen-ae-subkey'|'g')
;;
'gen-ae-subkey'|'g')
@@
-196,6
+202,6
@@
case $COMMAND in
*)
failure "Unknown command: '$COMMAND'
*)
failure "Unknown command: '$COMMAND'
-Type '
cereal-admin
help' for usage."
+Type '
$PGRM
help' for usage."
;;
esac
;;
esac