Merge lp:~smoser/ubuntu/natty/openssh/lp688574 into lp:ubuntu/natty/openssh

[Scott Moser]

[Clint Byrum (clint-fewbar)]

Hi Scott.. I tested this out in a natty chroot, and after manually installing wget and ca-certificates (see bug #690436 for more info) it worked quite well.

review: Approve

[Sebastien Bacher (seb128)]

Dustin talked with Colin and agreed to split ssh-import-id in a new source rather, so setting as needs fixing

review: Needs Fixing

[Sebastien Bacher (seb128)]

settings to work in progress so it's not listed in the sponsoring queue

Unmerged revisions

3221. By Scott Moser on 2010-12-10

add options to ssh-import-id for writing to specified file,
being silent, and not attempting key validation (LP: #688574)

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-10 13:47:02 +0000
+++ debian/changelog	2010-12-10 15:56:15 +0000
@@ -1,3 +1,10 @@
+openssh (1:5.6p1-2ubuntu3) UNRELEASED; urgency=low
+
+  * add options to ssh-import-id for writing to specified file,
+    being silent, and not attempting key validation (LP: #688574)
+
+ -- Scott Moser <[e-mail]>  Fri, 10 Dec 2010 09:24:52 -0500
+
 openssh (1:5.6p1-2ubuntu2) natty; urgency=low
 
   * add mention of ssh-keygen in ssh connect warning (LP: #686607)

=== modified file 'debian/ssh-import-id'
--- debian/ssh-import-id	2010-07-22 14:48:57 +0000
+++ debian/ssh-import-id	2010-12-10 15:56:15 +0000
@@ -38,26 +38,35 @@
 URL="https://launchpad.net/~%s/+sshkeys"
 
 usage() {
-	echo
-	echo "Usage:"
-	echo "  $0 [USER_ID_1] [USER_ID_2] ... [USER_ID_n]"
-	echo
-	exit 1
+	cat <<EOF
+Usage: ${0##*/} [options] USER_ID [USER_ID_2] ... [USER_ID_n]
+
+   import ssh keys for listed users, writing output to a file.
+
+   options:
+      -h | --help        this help
+      -o | --output F    write output to file 'F' 
+                         (default ~/.ssh/authorized_keys)
+         | --raw         do not attempt to fix keys or validate before adding
+      -q | --quiet       be silent
+EOF
 }
-
-[ -n "$1" ] || usage
+bad_usage() { usage 1>&2; echo "$@" 1>&2; exit 1; }
 
 error() {
+	[ "${QUIET}" = "0" ] || return 0
 	printf "ERROR: %s\n" "$@" 1>&2
 	exit 1
 }
 
 warn() {
+	[ "${QUIET}" = "0" ] || return 0
 	printf "WARNING: %s\n" "$@" 1>&2
 }
 
 info() {
-	printf "INFO: %s\n" "$@"
+	[ "${QUIET}" = "0" ] || return 0
+	printf "INFO: %s\n" "$@" 1>&2
 }
 
 url_encode() {
@@ -79,40 +88,78 @@
 	[ $lines -gt 0 ] && [ $keys -eq $lines ]
 }
 
-# Only support writing to this user's authorized_keys file
-if [ -z "$HOME" ]; then
-	uid=$(id -u) || error "Cannot determine user id"
-	[ -n "$uid" ] || error "User id cannot be empty"
-	pwline=$(getent passwd "$uid") || error "Cannot get passwd entry"
-	HOME=$(echo "$pwline" | awk -F: '{print $6}') || error "Cannot determine home directory"
-	[ -n "$HOME" ] || error "Home directory cannot be empty"
+get_authkeypath() {
+	# Only support writing to this user's authorized_keys file
+	local home="${HOME}"
+	if [ -z "$home" ]; then
+		uid=$(id -u) || error "Cannot determine user id"
+		[ -n "$uid" ] || error "User id cannot be empty"
+		pwline=$(getent passwd "$uid") || error "Cannot get passwd entry"
+		home=$(echo "$pwline" | awk -F: '{print $6}') || error "Cannot determine home directory"
+		[ -n "$home" ] || error "Home directory cannot be empty"
+	fi
+
+	_RET="${home}/.ssh/authorized_keys"
+}
+
+short_opts="ho:qr"
+long_opts="help,output:,quiet,raw"
+getopt_out=$(getopt --shell sh --name "${0##*/}" \
+	--options "${short_opts}" --long "${long_opts}" -- "$@") &&
+	eval set -- "${getopt_out}" ||
+	bad_usage
+
+output=""
+raw=0
+QUIET=0
+while [ $# -ne 0 ]; do
+	cur=${1}; next=${2};
+	case "$cur" in
+		-h|--help) usage; exit 0;;
+		-o|--output) output="${2}"; shift;;
+		-q|--quiet) QUIET=1;;
+		-r|--raw) raw=1;;
+		--) shift; break;;
+	esac
+	shift;
+done
+
+[ -n "$1" ] || bad_usage "must give user"
+
+if [ -z "${output}" ]; then
+	get_authkeypath
+	output=${_RET}
+	dir=${output%/*}
+	mkdir -m 0700 "${dir%/*}" 2>/dev/null || true
+	[ -d "$dir" ] || error "Cannot create directory [$dir]"
+	[ -e "$output" ] || (umask 0177 && touch "$output") ||
+		error "Cannot create [$output]"
 fi
 
-DIR="$HOME/.ssh"
-FILE="$DIR"/authorized_keys
-
-mkdir -m 0700 "$DIR" 2>/dev/null || true
-[ -d "$DIR" ] || error "Cannot create directory [$DIR]"
-[ -w "$DIR" ] || error "Cannot write to directory [$DIR]"
-[ -e "$FILE" ] || (umask 0177 && touch "$FILE") || error "Cannot create [$FILE]"
-
-rc=0
 tmp=$(mktemp)
 trap "rm -f $tmp" EXIT HUP INT QUIT TERM
+rc=0
 for i in "$@"; do
 	i=$(url_encode "$i") || error "Failed encoding [$i]"
 	url=$(printf "$URL" "$i")
-	if env -i wget --quiet -O- "$url" > "$tmp"; then
-		echo >> "$tmp" # needed for wc
-		if ! validate_keys "$tmp"; then
-			warn "Invalid keys at [$url]"
-			continue
-		fi
-		cat "$tmp" >> "$FILE" || error "Could not write to [$tmp]"
-		info "Successfully authorized [$i]"
+	if ! env -i wget --quiet -O- "$url" > "$tmp"; then
+ 		rc=$(($rc+1));
+		warn "Failed to retrieve key for [$i] from [$url]"
+		continue
+	fi
+	echo >> "$tmp" # needed for wc
+	if [ ${raw} -eq 0 ] && ! validate_keys "$tmp"; then
+		warn "Invalid keys at [$url]"
+ 		rc=$(($rc+1));
+		continue
+	fi
+	if [ "${output}" = "-" ]; then
+		cat "$tmp" || error "Could not write to stdout";
 	else
-		rc=$?
-		warn "Failed to retrieve key for [$i] from [$url]"
+		cat "$tmp" >> "$output" || error "Could not write to [$output]";
 	fi
+	info "Successfully authorized [$i]"
 done
 exit $rc
+
+# vi: ts=4 noexpandtab

=== modified file 'debian/ssh-import-id.1'
--- debian/ssh-import-id.1	2010-08-02 14:56:36 +0000
+++ debian/ssh-import-id.1	2010-12-10 15:56:15 +0000
@@ -8,6 +8,17 @@
 .SH DESCRIPTION
 This utility will securely contact a public keyserver (Launchpad.net by default) and retrieve one or more user's public keys, and append these to the current user's \fI~/.ssh/authorized_keys\fP file.
 
+.SH OPTIONS
+.TP
+.B -o|--output <file>
+write to file, default is ~/.ssh/authorized_keys. Use '-' for stdout.
+.TP
+.B -q|--quiet
+do not status messages.
+.TP
+.B    --raw
+do not attempt to fix keys or validate before writing
+
 .SH SEE ALSO
 \fIssh\fP(1)