Merge lp:~stevenk/launchpad/fix-ssh-keys-make-lp-user into lp:launchpad

[Steve Kowalik]

Fix the addition of SSH keys in utilities/make-lp-user.

This branch fixes the addition of DSA SSH keys in utilities/make-lp-user. The current way is wrong, since the code itself was splitting the key up, and it was using the wrong key-type for DSA keys, it's actually ssh-dss.

Why haven't we seen this before, since utilities/make-lp-user is running (indirectly) via the test suite? I suspect the reason for this is because the ec2 and buildbot machines don't actually get to the line that adds the keys, since they don't have any keys, most developers don't run the entire test suite on their machines, and the test that triggers this bug is a soyuz sampledata test.

[Tim Penhey (thumper)]

utilities/make-lp-user should not be used by the test suite.

What soyuz test uses it?

review: Needs Information

[Tim Penhey (thumper)]

https://dev.launchpad.net/PolicyandProcess/XXXPolicy specifies a particular format for XXX comments.

Can you please update it to match the policy. Thanks.

review: Approve

=== modified file 'lib/lp/soyuz/doc/sampledata-setup.txt'
--- lib/lp/soyuz/doc/sampledata-setup.txt	2010-03-18 21:30:51 +0000
+++ lib/lp/soyuz/doc/sampledata-setup.txt	2010-08-13 03:02:42 +0000
@@ -1,5 +1,7 @@
 = Sample data setup =
 
+# XXX: StevenK 2010-07-13 bug=617164: Calling utility scripts is bad
+
 In order to run Soyuz locally on a development system, the sample data
 must be cleaned up and customized a bit.  This is done by a the script
 utilities/soyuz-sampledata-setup.py.

=== modified file 'utilities/make-lp-user'
--- utilities/make-lp-user	2010-07-22 17:32:26 +0000
+++ utilities/make-lp-user	2010-08-13 03:02:42 +0000
@@ -109,24 +109,17 @@
     """
     ssh_dir = os.path.expanduser('~/.ssh')
     key_set = getUtility(ISSHKeySet)
-    key_guesses = [
-        ("ssh-rsa", 'id_rsa.pub'),
-        ("ssh-dsa", 'id_dsa.pub'),
-        ]
-    for key_type, guessed_filename in key_guesses:
-        guessed_filename = os.path.join(ssh_dir, guessed_filename)
+    for filename in ('id_rsa.pub', 'id_dsa.pub'):
         try:
-            public_key_file = open(guessed_filename, 'r')
+            public_key_file = open(filename, 'r')
             try:
                 public_key = public_key_file.read()
             finally:
                 public_key_file.close()
         except (OSError, IOError):
             continue
-        public_key = public_key.split()[1]
-        key_set.new(person,
-            "%s %s %s" % (key_type, public_key, 'Added by utility script.'))
-        print 'Registered SSH key: %s' % (guessed_filename,)
+        key_set.new(person, public_key)
+        print 'Registered SSH key: %s' % (filename,)
 
 
 def parse_fingerprints(gpg_output):