projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to new agreed default host key usage flag (only "a" required
[monkeysphere.git]
/
src
/
common
diff --git
a/src/common
b/src/common
index 7a904534d4f9b3fb1302dd7b30b1612923d69916..9b06b1d19c37615a5dc5b555c3acaac6cfea60ca 100644
(file)
--- a/
src/common
+++ b/
src/common
@@
-73,7
+73,7
@@
unescape() {
}
# remove all lines with specified string from specified file
}
# remove all lines with specified string from specified file
-remove_
file_
line() {
+remove_line() {
local file
local string
local file
local string
@@
-120,7
+120,7
@@
ssh2authorized_keys() {
key="$2"
echo -n "$key" | tr -d '\n'
key="$2"
echo -n "$key" | tr -d '\n'
- echo " MonkeySphere${DATE}
:
${userID}"
+ echo " MonkeySphere${DATE} ${userID}"
}
# convert key from gpg to ssh known_hosts format
}
# convert key from gpg to ssh known_hosts format
@@
-153,7
+153,7
@@
gpg2authorized_keys() {
# following regexp:
# '^MonkeySphere[[:digit:]]{4}(-[[:digit:]]{2}){2}T[[:digit:]]{2}(:[[:digit:]]{2}){2}$'
gpg2ssh "$keyID" | tr -d '\n'
# following regexp:
# '^MonkeySphere[[:digit:]]{4}(-[[:digit:]]{2}){2}T[[:digit:]]{2}(:[[:digit:]]{2}){2}$'
gpg2ssh "$keyID" | tr -d '\n'
- echo " MonkeySphere${DATE}
:
${userID}"
+ echo " MonkeySphere${DATE} ${userID}"
}
### GPG UTILITIES
}
### GPG UTILITIES
@@
-395,7
+395,7
@@
remove_userid() {
# remove user ID from file
log -n " removing user ID '$userID'... "
# remove user ID from file
log -n " removing user ID '$userID'... "
- remove_
file_
line "$AUTHORIZED_USER_IDS" "^${userID}$"
+ remove_line "$AUTHORIZED_USER_IDS" "^${userID}$"
loge "done."
}
loge "done."
}
@@
-416,7
+416,7
@@
process_host_known_hosts() {
while read -r ok keyid ; do
sshKey=$(gpg2ssh "$keyid")
# remove the old host key line
while read -r ok keyid ; do
sshKey=$(gpg2ssh "$keyid")
# remove the old host key line
- remove_
file_
line "$KNOWN_HOSTS" "$sshKey"
+ remove_line "$KNOWN_HOSTS" "$sshKey"
# if key OK, add new host line
if [ "$ok" -eq '0' ] ; then
# hash if specified
# if key OK, add new host line
if [ "$ok" -eq '0' ] ; then
# hash if specified
@@
-449,7
+449,7
@@
process_uid_authorized_keys() {
while read -r ok keyid ; do
sshKey=$(gpg2ssh "$keyid")
# remove the old host key line
while read -r ok keyid ; do
sshKey=$(gpg2ssh "$keyid")
# remove the old host key line
- remove_
file_
line "$AUTHORIZED_KEYS" "$sshKey"
+ remove_line "$AUTHORIZED_KEYS" "$sshKey"
# if key OK, add new host line
if [ "$ok" -eq '0' ] ; then
ssh2authorized_keys "$userID" "$sshKey" >> "$AUTHORIZED_KEYS"
# if key OK, add new host line
if [ "$ok" -eq '0' ] ; then
ssh2authorized_keys "$userID" "$sshKey" >> "$AUTHORIZED_KEYS"
@@
-507,7
+507,7
@@
process_authorized_keys() {
comment="$key"
fi
comment="$key"
fi
- if echo "$comment" | egrep -v -q '^MonkeySphere[[:digit:]]{4}(-[[:digit:]]{2}){2}T[[:digit:]]{2}(:[[:digit:]]{2}){2}
:
' ; then
+ if echo "$comment" | egrep -v -q '^MonkeySphere[[:digit:]]{4}(-[[:digit:]]{2}){2}T[[:digit:]]{2}(:[[:digit:]]{2}){2}' ; then
continue
fi
userID=$(echo "$comment" | awk "{ print $2 }")
continue
fi
userID=$(echo "$comment" | awk "{ print $2 }")