X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fcommon;h=5d92b26f0a283d6cc1ea4d113eb54f9a3fd5696b;hb=a58d337b9f24e46114912fd0e21a6ecfc22759e7;hp=2b05c3c992c5eb6a10e5c07a6c6a14324b4110d5;hpb=b66fd50fb2a2611ca4ba58003535748f453369d8;p=monkeysphere.git

diff --git a/src/common b/src/common
index 2b05c3c..5d92b26 100644
--- a/src/common
+++ b/src/common
@@ -16,8 +16,8 @@
 ### COMMON VARIABLES
 
 # managed directories
-ETC="/etc/monkeysphere"
-export ETC
+SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
+export SYSCONFIGDIR
 
 ########################################################################
 ### UTILITY FUNCTIONS
@@ -91,6 +91,97 @@ cutline() {
     head --line="$1" "$2" | tail -1
 }
 
+# this is a wrapper for doing lock functions.
+#
+# it lets us depend on either lockfile-progs (preferred) or procmail's
+# lockfile, and should
+lock() {
+    local use_lockfileprogs=true
+    local action="$1"
+    local file="$2"
+
+    if ! ( which lockfile-create >/dev/null 2>/dev/null ) ; then
+	if ! ( which lockfile >/dev/null ); then
+	    failure "Neither lockfile-create nor lockfile are in the path!"
+	fi
+	use_lockfileprogs=
+    fi
+    
+    case "$action" in
+	create)
+	    if [ -n "$use_lockfileprogs" ] ; then
+		lockfile-create "$file" || failure "unable to lock '$file'"
+	    else
+		lockfile -r 20 "${file}.lock" || failure "unable to lock '$file'"
+	    fi
+	    ;;
+	touch)	
+	    if [ -n "$use_lockfileprogs" ] ; then
+		lockfile-touch --oneshot "$file"
+	    else
+		: Nothing to do here
+	    fi
+	    ;;
+	remove)
+	    if [ -n "$use_lockfileprogs" ] ; then
+		lockfile-remove "$file"
+	    else
+		rm -f "${file}.lock"
+	    fi
+	    ;;
+	*)
+	    failure "bad argument for lock subfunction '$action'"
+    esac
+}
+
+
+# for portability, between gnu date and BSD date.
+# arguments should be:  number longunits format
+
+# e.g. advance_date 20 seconds +%F
+advance_date() {
+    local gnutry
+    local number="$1"
+    local longunits="$2"
+    local format="$3"
+    local shortunits
+
+    # try things the GNU way first 
+    if date -d "$number $longunits" "$format" >&/dev/null ; then
+	date -d "$number $longunits" "$format"
+    else
+	# otherwise, convert to (a limited version of) BSD date syntax:
+	case "$longunits" in
+	    years)
+		shortunits=y
+		;;
+	    months)
+		shortunits=m
+		;;
+	    weeks)
+		shortunits=w
+		;;
+	    days)
+		shortunits=d
+		;;
+	    hours)
+		shortunits=H
+		;;
+	    minutes)
+		shortunits=M
+		;;
+	    seconds)
+		shortunits=S
+		;;
+	    *)
+		# this is a longshot, and will likely fail; oh well.
+		shortunits="$longunits"
+	esac
+	date "-v+${number}${shortunits}" "$format"
+    fi
+}
+
+
 # check that characters are in a string (in an AND fashion).
 # used for checking key capability
 # check_capability capability a [b...]
@@ -308,9 +399,9 @@ check_key_file_permissions() {
     local gAccess
     local oAccess
 
-    # function to check that an octal corresponds to writability
+    # function to check that the given permission corresponds to writability
     is_write() {
-	[ "$1" -eq 2 -o "$1" -eq 3 -o "$1" -eq 6 -o "$1" -eq 7 ]
+	[ "$1" = "w" ]
     }
 
     user="$1"
@@ -319,10 +410,9 @@ check_key_file_permissions() {
     # return 0 is path does not exist
     [ -e "$path" ] || return 0
 
-    owner=$(stat --format '%U' "$path")
-    access=$(stat --format '%a' "$path")
-    gAccess=$(echo "$access" | cut -c2)
-    oAccess=$(echo "$access" | cut -c3)
+    owner=$(ls -l "$path" | awk '{ print $3 }')
+    gAccess=$(ls -l "$path" | cut -c6)
+    oAccess=$(ls -l "$path" | cut -c9)
 
     # check owner
     if [ "$owner" != "$user" -a "$owner" != 'root' ] ; then
@@ -425,7 +515,7 @@ gpg_fetch_userid() {
 
     userID="$1"
 
-    log info " checking keyserver $KEYSERVER... "
+    log verbose " checking keyserver $KEYSERVER... "
     echo 1,2,3,4,5 | \
 	gpg --quiet --batch --with-colons \
 	--command-fd 0 --keyserver "$KEYSERVER" \
@@ -518,17 +608,17 @@ process_user_id() {
 
 		# if overall key is not valid, skip
 		if [ "$validity" != 'u' -a "$validity" != 'f' ] ; then
-		    log error "  - unacceptable primary key validity ($validity)."
+		    log debug "  - unacceptable primary key validity ($validity)."
 		    continue
 		fi
 		# if overall key is disabled, skip
 		if check_capability "$usage" 'D' ; then
-		    log error "  - key disabled."
+		    log debug "  - key disabled."
 		    continue
 		fi
 		# if overall key capability is not ok, skip
 		if ! check_capability "$usage" $requiredPubCapability ; then
-		    log error "  - unacceptable primary key capability ($usage)."
+		    log debug "  - unacceptable primary key capability ($usage)."
 		    continue
 		fi
 
@@ -542,7 +632,7 @@ process_user_id() {
 		;;
 	    'uid') # user ids
 		if [ "$lastKey" != pub ] ; then
-		    log error " - got a user ID after a sub key?!  user IDs should only follow primary keys!"
+		    log verbose " - got a user ID after a sub key?!  user IDs should only follow primary keys!"
 		    continue
 		fi
 		# if an acceptable user ID was already found, skip
@@ -570,7 +660,7 @@ process_user_id() {
 			echo "0:${sshKey}"
 		    fi
 		else
-		    log error "  - unacceptable primary key."
+		    log debug "  - unacceptable primary key."
 		    if [ -z "$sshKey" ] ; then
 			log error "   ! primary key could not be translated (not RSA or DSA?)."
 		    else
@@ -626,7 +716,7 @@ process_user_id() {
 			echo "0:${sshKey}"
 		    fi
 		else
-		    log error "  - unacceptable sub key."
+		    log debug "  - unacceptable sub key."
 		    if [ -z "$sshKey" ] ; then
 			log error "    ! sub key could not be translated (not RSA or DSA?)."
 		    else
@@ -683,7 +773,7 @@ process_host_known_hosts() {
 	    if [ "$HASH_KNOWN_HOSTS" = 'true' ] ; then
 		# FIXME: this is really hackish cause ssh-keygen won't
 		# hash from stdin to stdout
-		tmpfile=$(mktemp)
+		tmpfile=$(mktemp ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
 		ssh2known_hosts "$host" "$sshKey" > "$tmpfile"
 		ssh-keygen -H -f "$tmpfile" 2> /dev/null
 		cat "$tmpfile" >> "$KNOWN_HOSTS"
@@ -724,11 +814,10 @@ update_known_hosts() {
     nHostsOK=0
     nHostsBAD=0
 
-    # set the trap to remove any lockfiles on exit
-    trap "lockfile-remove $KNOWN_HOSTS" EXIT
-
-    # create a lockfile on known_hosts
-    lockfile-create "$KNOWN_HOSTS"
+    # create a lockfile on known_hosts:
+    lock create "$KNOWN_HOSTS"
+    # FIXME: we're discarding any pre-existing EXIT trap; is this bad?
+    trap "lock remove $KNOWN_HOSTS" EXIT
 
     # note pre update file checksum
     fileCheck="$(file_hash "$KNOWN_HOSTS")"
@@ -747,15 +836,16 @@ update_known_hosts() {
 	esac
 
 	# touch the lockfile, for good measure.
-	lockfile-touch --oneshot "$KNOWN_HOSTS"
+	lock touch "$KNOWN_HOSTS"
     done
 
-    # remove the lockfile
-    lockfile-remove "$KNOWN_HOSTS"
+    # remove the lockfile and the trap
+    lock remove "$KNOWN_HOSTS"
+    trap - EXIT
 
     # note if the known_hosts file was updated
     if [ "$(file_hash "$KNOWN_HOSTS")" != "$fileCheck" ] ; then
-	log verbose "known_hosts file updated."
+	log debug "known_hosts file updated."
     fi
 
     # if an acceptable host was found, return 0
@@ -778,12 +868,12 @@ update_known_hosts() {
 process_known_hosts() {
     local hosts
 
-    log verbose "processing known_hosts file..."
+    log debug "processing known_hosts file..."
 
     hosts=$(meat "$KNOWN_HOSTS" | cut -d ' ' -f 1 | grep -v '^|.*$' | tr , ' ' | tr '\n' ' ')
 
     if [ -z "$hosts" ] ; then
-	log error "no hosts to process."
+	log debug "no hosts to process."
 	return
     fi
 
@@ -862,11 +952,10 @@ update_authorized_keys() {
     nIDsOK=0
     nIDsBAD=0
 
-    # set the trap to remove any lockfiles on exit
-    trap "lockfile-remove $AUTHORIZED_KEYS" EXIT
-
     # create a lockfile on authorized_keys
-    lockfile-create "$AUTHORIZED_KEYS"
+    lock create "$AUTHORIZED_KEYS"
+    # FIXME: we're discarding any pre-existing EXIT trap; is this bad?
+    trap "lock remove $AUTHORIZED_KEYS" EXIT
 
     # note pre update file checksum
     fileCheck="$(file_hash "$AUTHORIZED_KEYS")"
@@ -890,15 +979,16 @@ update_authorized_keys() {
 	esac
 
 	# touch the lockfile, for good measure.
-	lockfile-touch --oneshot "$AUTHORIZED_KEYS"
+	lock touch "$AUTHORIZED_KEYS"
     done
 
-    # remove the lockfile
-    lockfile-remove "$AUTHORIZED_KEYS"
+    # remove the lockfile and the trap
+    lock remove "$AUTHORIZED_KEYS"
+    trap - EXIT
 
     # note if the authorized_keys file was updated
     if [ "$(file_hash "$AUTHORIZED_KEYS")" != "$fileCheck" ] ; then
-	log verbose "authorized_keys file updated."
+	log debug "authorized_keys file updated."
     fi
 
     # if an acceptable id was found, return 0
@@ -925,10 +1015,10 @@ process_authorized_user_ids() {
 
     authorizedUserIDs="$1"
 
-    log verbose "processing authorized_user_ids file..."
+    log debug "processing authorized_user_ids file..."
 
     if ! meat "$authorizedUserIDs" > /dev/null ; then
-	log error "no user IDs to process."
+	log debug "no user IDs to process."
 	return
     fi