Merge lp:~kirkland/openssh/ssh-import-id into lp:ubuntu/maverick/openssh

[Dustin Kirkland ]

Move ssh-import-lp-id from ssh-import to openssh-server, where it belongs.

[Martin Pool (mbp)]

You probably want to requet review from ubuntu-reviewers

[Martin Pool (mbp)]

I don't know how this got to review by vcs-imports but we should change it.

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-13 09:39:30 +0000
+++ debian/changelog	2010-07-22 13:12:51 +0000
@@ -1,8 +1,26 @@
 openssh (1:5.5p1-4ubuntu3) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * Use 'dh $@ --options' rather than 'dh --options $@', for
     forward-compatibility with debhelper v8.
 
+  [ Dustin Kirkland ]
+  * debian/openssh-server.install, debian/ssh-import-id:
+    - move the ssh-import-lp-id utility from the ssh-import
+      package to openssh-server (which is the logical destination
+      for this tool)
+    - rename it from ssh-import-lp-id (clumsy) to ssh-import-id (nicer,
+      more like 'ssh-copy-id')
+  * debian/openssh-server.links:
+    - add a symlink from ssh-import-lp-id (old name) to ssh-import-id
+      (new name) to maintain compatibility with existing user scripts;
+      link the manpage too
+  * debian/control:
+    - ensure that openssh-server replaces and conflicts ssh-import (which
+      will be removed from the archive)
+  * debian/ssh-import-id.1, debian/openssh-server.manpages:
+    - add/install a manpage
+
  -- Colin Watson <[e-mail]>  Tue, 13 Jul 2010 10:38:57 +0100
 
 openssh (1:5.5p1-4ubuntu2) maverick; urgency=low

=== modified file 'debian/control'
--- debian/control	2010-05-26 18:58:27 +0000
+++ debian/control	2010-07-22 13:12:51 +0000
@@ -46,8 +46,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.2-13), libssl0.9.8 (>= 0.9.8g-9), procps
 Recommends: xauth
-Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7)
-Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
+Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7), ssh-import
+Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5, ssh-import
 Suggests: ssh-askpass, rssh, molly-guard, openssh-blacklist, openssh-blacklist-extra, ufw
 Provides: ssh-server
 Description: secure shell (SSH) server, for secure access from remote machines

=== modified file 'debian/openssh-server.install'
--- debian/openssh-server.install	2010-04-08 08:25:21 +0000
+++ debian/openssh-server.install	2010-07-22 13:12:51 +0000
@@ -4,3 +4,4 @@
 usr/share/man/man5/sshd_config.5
 usr/share/man/man8/sftp-server.8
 usr/share/man/man8/sshd.8
+debian/ssh-import-id usr/bin/

=== modified file 'debian/openssh-server.links'
--- debian/openssh-server.links	2010-04-07 12:56:13 +0000
+++ debian/openssh-server.links	2010-07-22 13:12:51 +0000
@@ -1,1 +1,3 @@
 usr/lib/openssh/sftp-server usr/lib/sftp-server
+usr/bin/ssh-import-id usr/bin/ssh-import-lp-id
+usr/share/man/man1/ssh-import-id.1.gz usr/share/man/man1/ssh-import-lp-id.1.gz

=== added file 'debian/openssh-server.manpages'
--- debian/openssh-server.manpages	1970-01-01 00:00:00 +0000
+++ debian/openssh-server.manpages	2010-07-22 13:12:51 +0000
@@ -0,0 +1,1 @@
+debian/ssh-import-id.1

=== added file 'debian/ssh-import-id'
--- debian/ssh-import-id	1970-01-01 00:00:00 +0000
+++ debian/ssh-import-id	2010-07-22 13:12:51 +0000
@@ -0,0 +1,122 @@
+#!/bin/sh
+#
+#    ssh-import-id - authorize a user by fetching their key
+#                    from a public SSH keyserver; Launchpad.net
+#                    by default
+#
+#    Copyright (C) 2010 Canonical Ltd.
+#
+#    Authors: Dustin Kirkland <[e-mail]>
+#             Scott Moser <[e-mail]>
+#
+#    All rights reserved.
+#
+#    Redistribution and use in source and binary forms, with or without
+#    modification, are permitted provided that the following conditions
+#    are met:
+#    1. Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#    2. Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#    3. Neither the name of the University nor the names of its contributors
+#       may be used to endorse or promote products derived from this software
+#       without specific prior written permission.
+#
+#    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+#    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+#    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+#    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+#    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+#    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+#    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+#    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#    SUCH DAMAGE.
+
+# Abort on any unhandled error
+set -e
+
+# The following URL *must* be an https address with a valid, signed certificate!!!
+URL="https://launchpad.net/~%s/+sshkeys"
+
+usage() {
+	echo
+	echo "Usage:"
+	echo "  $0 [USER_ID_1] [USER_ID_2] ... [USER_ID_n]"
+	echo
+	exit 1
+}
+
+[ -n "$1" ] || usage
+
+error() {
+	printf "ERROR: %s\n" "$@" 1>&2
+	exit 1
+}
+
+warn() {
+	printf "WARNING: %s\n" "$@" 1>&2
+}
+
+info() {
+	printf "INFO: %s\n" "$@"
+}
+
+url_encode() {
+	# from http://andy.wordpress.com/2008/09/17/urlencode-in-bash-with-perl/
+	printf "%s" "$1" | perl -pe's/([^-_.~A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg'
+}
+
+validate_keys() {
+	# Prune blank lines, join lines that don't have a '= ',
+	# remove invalid characters
+	sed -i -e '/^$/d' \
+	       -e ':join /=[ ]/!{ N; s/\n// ; b join }' \
+	       -e 's/[^a-zA-Z0-9@: .\/=+-]//g' "$1"
+	# Count lines
+	lines=$(wc -l < "${1}")
+	# Count valid keys
+	keys=$(grep -c "^ssh-[dr]s[sa] [a-zA-Z0-9: .\/=+-]\+ " "$1")
+	# Validate counts match, and >0
+	[ $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"
+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
+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]"
+	else
+		rc=$?
+		warn "Failed to retrieve key for [$i] from [$url]"
+	fi
+done
+exit $rc

=== added file 'debian/ssh-import-id.1'
--- debian/ssh-import-id.1	1970-01-01 00:00:00 +0000
+++ debian/ssh-import-id.1	2010-07-22 13:12:51 +0000
@@ -0,0 +1,17 @@
+.TH ssh\-import\--id 1 "23 Feb 2010" ssh\-import "ssh\-import"
+.SH NAME
+ssh\-import\-id \- retrieve one or more public keys from a public keyserver (Launchpad.net by default) and append them to the current user's authorized_keys file
+
+.SH SYNOPSIS
+.BI "ssh\-import\-id [launchpad_id_1] [launchpad_id_2] [launchpad_id_3] ...
+
+.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 SEE ALSO
+\fIssh\fP(1)
+
+.SH AUTHOR
+This manpage and the utility was written by Dustin Kirkland <[e-mail]> for Ubuntu systems (but may be used by others).  Permission is granted to copy, distribute and/or modify this document under the terms of the BSD License.
+
+On Debian systems, the complete text of the BSD License can be found in /usr/share/common-licenses/BSD.