projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved monkeysphere(5) to section 7 of the manual. Thanks, Stew!
[monkeysphere.git]
/
src
/
common
diff --git
a/src/common
b/src/common
index 16235a2881f7b7c2c9480abe5e93c6d17681f28b..2b05c3c992c5eb6a10e5c07a6c6a14324b4110d5 100644
(file)
--- a/
src/common
+++ b/
src/common
@@
-35,11
+35,15
@@
log() {
local priority
local level
local output
local priority
local level
local output
- # don't include SILENT in alllevels: it's handled separately
- # list in decreasing verbosity (all caps)
- local alllevels="DEBUG INFO ERROR"
+ local alllevels
local found=
local found=
+ # don't include SILENT in alllevels: it's handled separately
+ # list in decreasing verbosity (all caps).
+ # separate with $IFS explicitly, since we do some fancy footwork
+ # elsewhere.
+ alllevels="DEBUG${IFS}VERBOSE${IFS}INFO${IFS}ERROR"
+
# translate lowers to uppers in global log level
LOG_LEVEL=$(echo "$LOG_LEVEL" | tr "[:lower:]" "[:upper:]")
# translate lowers to uppers in global log level
LOG_LEVEL=$(echo "$LOG_LEVEL" | tr "[:lower:]" "[:upper:]")
@@
-48,7
+52,7
@@
log() {
return
fi
return
fi
- for level in $alllevels; do
+ for level in $alllevels
; do
if [ "$LOG_LEVEL" = "$level" ] ; then
found=true
fi
if [ "$LOG_LEVEL" = "$level" ] ; then
found=true
fi
@@
-218,6
+222,7
@@
vnQCFl3+QFSe4zinqykHnLwGPMXv428d/ZjkIc2ju8dRsn4=
remove_line() {
local file
local string
remove_line() {
local file
local string
+ local tempfile
file="$1"
string="$2"
file="$1"
string="$2"
@@
-232,8
+237,13
@@
remove_line() {
# if the string is in the file...
if grep -q -F "$string" "$file" 2> /dev/null ; then
# if the string is in the file...
if grep -q -F "$string" "$file" 2> /dev/null ; then
+ tempfile=$(mktemp "${file}.XXXXXXX") || \
+ failure "Unable to make temp file '${file}.XXXXXXX'"
+
# remove the line with the string, and return 0
# remove the line with the string, and return 0
- grep -v -F "$string" "$file" | sponge "$file"
+ grep -v -F "$string" "$file" >"$tempfile"
+ cat "$tempfile" > "$file"
+ rm "$tempfile"
return 0
# otherwise return 1
else
return 0
# otherwise return 1
else
@@
-244,6
+254,7
@@
remove_line() {
# remove all lines with MonkeySphere strings in file
remove_monkeysphere_lines() {
local file
# remove all lines with MonkeySphere strings in file
remove_monkeysphere_lines() {
local file
+ local tempfile
file="$1"
file="$1"
@@
-255,8
+266,13
@@
remove_monkeysphere_lines() {
return 1
fi
return 1
fi
+ tempfile=$(mktemp "${file}.XXXXXXX") || \
+ failure "Could not make temporary file '${file}.XXXXXXX'."
+
egrep -v '^MonkeySphere[[:digit:]]{4}(-[[:digit:]]{2}){2}T[[:digit:]]{2}(:[[:digit:]]{2}){2}$' \
egrep -v '^MonkeySphere[[:digit:]]{4}(-[[:digit:]]{2}){2}T[[:digit:]]{2}(:[[:digit:]]{2}){2}$' \
- "$file" | sponge "$file"
+ "$file" >"$tempfile"
+ cat "$tempfile" > "$file"
+ rm "$tempfile"
}
# translate ssh-style path variables %h and %u
}
# translate ssh-style path variables %h and %u
@@
-481,7
+497,7
@@
process_user_id() {
# if the gpg query return code is not 0, return 1
if [ "$?" -ne 0 ] ; then
# if the gpg query return code is not 0, return 1
if [ "$?" -ne 0 ] ; then
- log
error
" no primary keys found."
+ log
verbose
" no primary keys found."
return 1
fi
return 1
fi
@@
-498,7
+514,7
@@
process_user_id() {
lastKeyOK=
fingerprint=
lastKeyOK=
fingerprint=
- log
error
" primary key found: $keyid"
+ log
verbose
" primary key found: $keyid"
# if overall key is not valid, skip
if [ "$validity" != 'u' -a "$validity" != 'f' ] ; then
# if overall key is not valid, skip
if [ "$validity" != 'u' -a "$validity" != 'f' ] ; then
@@
-547,7
+563,7
@@
process_user_id() {
# output a line for the primary key
# 0 = ok, 1 = bad
if [ "$keyOK" -a "$uidOK" -a "$lastKeyOK" ] ; then
# output a line for the primary key
# 0 = ok, 1 = bad
if [ "$keyOK" -a "$uidOK" -a "$lastKeyOK" ] ; then
- log
error
" * acceptable primary key."
+ log
verbose
" * acceptable primary key."
if [ -z "$sshKey" ] ; then
log error " ! primary key could not be translated (not RSA or DSA?)."
else
if [ -z "$sshKey" ] ; then
log error " ! primary key could not be translated (not RSA or DSA?)."
else
@@
-603,7
+619,7
@@
process_user_id() {
# output a line for the sub key
# 0 = ok, 1 = bad
if [ "$keyOK" -a "$uidOK" -a "$lastKeyOK" ] ; then
# output a line for the sub key
# 0 = ok, 1 = bad
if [ "$keyOK" -a "$uidOK" -a "$lastKeyOK" ] ; then
- log
error
" * acceptable sub key."
+ log
verbose
" * acceptable sub key."
if [ -z "$sshKey" ] ; then
log error " ! sub key could not be translated (not RSA or DSA?)."
else
if [ -z "$sshKey" ] ; then
log error " ! sub key could not be translated (not RSA or DSA?)."
else
@@
-638,7
+654,7
@@
process_host_known_hosts() {
host="$1"
userID="ssh://${host}"
host="$1"
userID="ssh://${host}"
- log
info
"processing: $host"
+ log
verbose
"processing: $host"
nKeys=0
nKeysOK=0
nKeys=0
nKeysOK=0
@@
-739,7
+755,7
@@
update_known_hosts() {
# note if the known_hosts file was updated
if [ "$(file_hash "$KNOWN_HOSTS")" != "$fileCheck" ] ; then
# note if the known_hosts file was updated
if [ "$(file_hash "$KNOWN_HOSTS")" != "$fileCheck" ] ; then
- log
info
"known_hosts file updated."
+ log
verbose
"known_hosts file updated."
fi
# if an acceptable host was found, return 0
fi
# if an acceptable host was found, return 0
@@
-762,7
+778,7
@@
update_known_hosts() {
process_known_hosts() {
local hosts
process_known_hosts() {
local hosts
- log
info
"processing known_hosts file..."
+ log
verbose
"processing known_hosts file..."
hosts=$(meat "$KNOWN_HOSTS" | cut -d ' ' -f 1 | grep -v '^|.*$' | tr , ' ' | tr '\n' ' ')
hosts=$(meat "$KNOWN_HOSTS" | cut -d ' ' -f 1 | grep -v '^|.*$' | tr , ' ' | tr '\n' ' ')
@@
-787,7
+803,7
@@
process_uid_authorized_keys() {
userID="$1"
userID="$1"
- log
info
"processing: $userID"
+ log
verbose
"processing: $userID"
nKeys=0
nKeysOK=0
nKeys=0
nKeysOK=0
@@
-882,7
+898,7
@@
update_authorized_keys() {
# note if the authorized_keys file was updated
if [ "$(file_hash "$AUTHORIZED_KEYS")" != "$fileCheck" ] ; then
# note if the authorized_keys file was updated
if [ "$(file_hash "$AUTHORIZED_KEYS")" != "$fileCheck" ] ; then
- log
info
"authorized_keys file updated."
+ log
verbose
"authorized_keys file updated."
fi
# if an acceptable id was found, return 0
fi
# if an acceptable id was found, return 0
@@
-909,7
+925,7
@@
process_authorized_user_ids() {
authorizedUserIDs="$1"
authorizedUserIDs="$1"
- log
info
"processing authorized_user_ids file..."
+ log
verbose
"processing authorized_user_ids file..."
if ! meat "$authorizedUserIDs" > /dev/null ; then
log error "no user IDs to process."
if ! meat "$authorizedUserIDs" > /dev/null ; then
log error "no user IDs to process."