launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/refresh-test-ssh-key into lp:launchpad.

Commit message:
Replace test 512-bit DSA key with 1024-bit RSA key.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/refresh-test-ssh-key/+merge/335257

Twisted >= 16.0.0 uses cryptography, which forbids such short keys.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/refresh-test-ssh-key into lp:launchpad.

=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql	2017-11-18 13:29:18 +0000
+++ database/sampledata/current-dev.sql	2017-12-15 14:21:39 +0000
@@ -10033,7 +10033,7 @@
 ALTER TABLE sshkey DISABLE TRIGGER ALL;
 
 INSERT INTO sshkey (id, person, keytype, keytext, comment, date_created) VALUES (1, 12, 2, 'AAAAB3NzaC1kc3MAAAEBAPfhCA15ZaT08brwVXwpJjcZT6QFIipzF1sGy57HY7QPi/W+uljr1VcCHzWdlSmda7YpTCTx0NFYYQIccQRGX6zYL8v1w9FSRCAnxxUJmqEhsUDFYFdVTa9uLCrs3MSbmh7wwFPdRrGrO6X5x7T4dMZQwykSZrOVdpLcCHRgrMZslLomIAjERn6OAQNiGFz7B2tEi/3Soqd52bGJwOtGymRiAXkPSLbH7KfzSCe34ytdh6BD+4SrgSoa+TL3VDV70QAdlOFXD42ZHl3Sc0Tde4LbZeYq2Uf84DOATLZBbOYpRSqTLkM9XngpnvCRVb6dxEQfgODDw783tEuPpySLj2EAAAAVANpUVgivDjt9gFibN/AXfYy1meeBAAABAB6FtnMywmWZg2lr2I3nDfE5U5QbGUQB/ZEP98ZkSkhOcF29VlnGOxyb2/VZbVTLa/btlPF82L4An/c8VKtKZnel7LnAlMoArdgzQNXGVQQVtnaWwM26ydgDzkSSIes3elNZgsfnPRBvaF0ol9Tqju0rNGKjnr3ZOX/NX+42bxpjRnxYj1h56yP2jKKeGfjorI6JK1YfqBAiTxzaDMzSpknnrbztaKJoh7IFqMMOp9ANSFh7H106pEaCv3ebCTJZprtWqNKjb2zum7OQPRz3upA0qx22ocTokjv4itXJ6yj/BvGu9qdOIQFXuB2rsFtLZtS8ATueOly0GzyeiZBx/AEAAAEBAO8jRYjL7tAYnVlO1p6UzPOicAuGCFWfNbBEDRAXoSgLNdj451jStw+eUc9ZVz7tG/XRVZsiavtFHb2cbrcfX1YOd69xi0m+IY6mo3yKt3irQRokDtt376sHoUdHgj2ozySZJgG8IJndtoS+VQQy6NdClA3fNFb96bF865eNaRYoHJO9ZI84lkWQL++MLzIuyFfCs1hSlapyyuHC8kFmF7AQdrVZvbohSbnWs+w53nIW8nAA7z21wAukvE1Pl6AQyG0e7U1sYS8Pc8dtmzJvdtVZWBl02/gqQJ7f06mFvnsN45rR1Uyxnrwl6rbFwqabZDlyD5Ac6Icbvz9SG1gBOiI=', 'andrew@trogdor', '2006-10-16 18:31:53.030784');
-INSERT INTO sshkey (id, person, keytype, keytext, comment, date_created) VALUES (2, 1, 2, 'AAAAB3NzaC1kc3MAAABBAL5VoWG5sy3CnLYeOw47L8m9A15hA/PzdX2u0B7c2Z1ktFPcEaEuKbLqKVSkXpYm7YwKj9y88A9Qm61CdvI0c50AAAAVAKGY0YON9dEFH3DzeVYHVEBGFGfVAAAAQCoe0RhBcefm4YiyQVwMAxwTlgySTk7FSk6GZ95EZ5Q8/OTdViTaalvGXaRIsBdaQamHEBB+Vek/VpnF1UGGm8YAAABAaCXDl0r1k93JhnMdF0ap4UJQ2/NnqCyoE8Xd5KdUWWwqwGdMzqB1NOeKN6ladIAXRggLc2E00UsnUXh3GE3Rgw==', 'Private key in lib/lp/codehosting/tests/id_dsa', '2007-03-30 03:39:27.689516');
+INSERT INTO sshkey (id, person, keytype, keytext, comment, date_created) VALUES (2, 1, 1, 'AAAAB3NzaC1yc2EAAAADAQABAAAAgQCeP6iOLFdRSJ/CwuUjj0dE3+bJiZUn2AsappUcjCZN75CBKvqPkpGDIU/ZlOddAdj1rif6dl9rqEBuoliduIZ1bmPaGs1jmpME7HPctLhCmzy1oC8wkdVNkZnmoTW34j5Y8mKWuy32hVWvp3OdfIo+dxW576ny52VkTbST+t4KlQ==', 'Private key in lib/lp/codehosting/tests/id_rsa', '2017-12-15 00:38:47.058185');
 
 
 ALTER TABLE sshkey ENABLE TRIGGER ALL;

=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql	2017-11-18 13:29:18 +0000
+++ database/sampledata/current.sql	2017-12-15 14:21:39 +0000
@@ -9945,7 +9945,7 @@
 ALTER TABLE sshkey DISABLE TRIGGER ALL;
 
 INSERT INTO sshkey (id, person, keytype, keytext, comment, date_created) VALUES (1, 12, 2, 'AAAAB3NzaC1kc3MAAAEBAPfhCA15ZaT08brwVXwpJjcZT6QFIipzF1sGy57HY7QPi/W+uljr1VcCHzWdlSmda7YpTCTx0NFYYQIccQRGX6zYL8v1w9FSRCAnxxUJmqEhsUDFYFdVTa9uLCrs3MSbmh7wwFPdRrGrO6X5x7T4dMZQwykSZrOVdpLcCHRgrMZslLomIAjERn6OAQNiGFz7B2tEi/3Soqd52bGJwOtGymRiAXkPSLbH7KfzSCe34ytdh6BD+4SrgSoa+TL3VDV70QAdlOFXD42ZHl3Sc0Tde4LbZeYq2Uf84DOATLZBbOYpRSqTLkM9XngpnvCRVb6dxEQfgODDw783tEuPpySLj2EAAAAVANpUVgivDjt9gFibN/AXfYy1meeBAAABAB6FtnMywmWZg2lr2I3nDfE5U5QbGUQB/ZEP98ZkSkhOcF29VlnGOxyb2/VZbVTLa/btlPF82L4An/c8VKtKZnel7LnAlMoArdgzQNXGVQQVtnaWwM26ydgDzkSSIes3elNZgsfnPRBvaF0ol9Tqju0rNGKjnr3ZOX/NX+42bxpjRnxYj1h56yP2jKKeGfjorI6JK1YfqBAiTxzaDMzSpknnrbztaKJoh7IFqMMOp9ANSFh7H106pEaCv3ebCTJZprtWqNKjb2zum7OQPRz3upA0qx22ocTokjv4itXJ6yj/BvGu9qdOIQFXuB2rsFtLZtS8ATueOly0GzyeiZBx/AEAAAEBAO8jRYjL7tAYnVlO1p6UzPOicAuGCFWfNbBEDRAXoSgLNdj451jStw+eUc9ZVz7tG/XRVZsiavtFHb2cbrcfX1YOd69xi0m+IY6mo3yKt3irQRokDtt376sHoUdHgj2ozySZJgG8IJndtoS+VQQy6NdClA3fNFb96bF865eNaRYoHJO9ZI84lkWQL++MLzIuyFfCs1hSlapyyuHC8kFmF7AQdrVZvbohSbnWs+w53nIW8nAA7z21wAukvE1Pl6AQyG0e7U1sYS8Pc8dtmzJvdtVZWBl02/gqQJ7f06mFvnsN45rR1Uyxnrwl6rbFwqabZDlyD5Ac6Icbvz9SG1gBOiI=', 'andrew@trogdor', '2006-10-16 18:31:53.030784');
-INSERT INTO sshkey (id, person, keytype, keytext, comment, date_created) VALUES (2, 1, 2, 'AAAAB3NzaC1kc3MAAABBAL5VoWG5sy3CnLYeOw47L8m9A15hA/PzdX2u0B7c2Z1ktFPcEaEuKbLqKVSkXpYm7YwKj9y88A9Qm61CdvI0c50AAAAVAKGY0YON9dEFH3DzeVYHVEBGFGfVAAAAQCoe0RhBcefm4YiyQVwMAxwTlgySTk7FSk6GZ95EZ5Q8/OTdViTaalvGXaRIsBdaQamHEBB+Vek/VpnF1UGGm8YAAABAaCXDl0r1k93JhnMdF0ap4UJQ2/NnqCyoE8Xd5KdUWWwqwGdMzqB1NOeKN6ladIAXRggLc2E00UsnUXh3GE3Rgw==', 'Private key in lib/lp/codehosting/tests/id_dsa', '2007-03-30 03:39:27.689516');
+INSERT INTO sshkey (id, person, keytype, keytext, comment, date_created) VALUES (2, 1, 1, 'AAAAB3NzaC1yc2EAAAADAQABAAAAgQCeP6iOLFdRSJ/CwuUjj0dE3+bJiZUn2AsappUcjCZN75CBKvqPkpGDIU/ZlOddAdj1rif6dl9rqEBuoliduIZ1bmPaGs1jmpME7HPctLhCmzy1oC8wkdVNkZnmoTW34j5Y8mKWuy32hVWvp3OdfIo+dxW576ny52VkTbST+t4KlQ==', 'Private key in lib/lp/codehosting/tests/id_rsa', '2017-12-15 00:38:47.058185');
 
 
 ALTER TABLE sshkey ENABLE TRIGGER ALL;

=== removed file 'lib/lp/codehosting/tests/id_dsa'
--- lib/lp/codehosting/tests/id_dsa	2005-12-14 12:59:57 +0000
+++ lib/lp/codehosting/tests/id_dsa	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
------BEGIN DSA PRIVATE KEY-----
-MIH4AgEAAkEAvlWhYbmzLcKcth47Djsvyb0DXmED8/N1fa7QHtzZnWS0U9wRoS4p
-suopVKRelibtjAqP3LzwD1CbrUJ28jRznQIVAKGY0YON9dEFH3DzeVYHVEBGFGfV
-AkAqHtEYQXHn5uGIskFcDAMcE5YMkk5OxUpOhmfeRGeUPPzk3VYk2mpbxl2kSLAX
-WkGphxAQflXpP1aZxdVBhpvGAkBoJcOXSvWT3cmGcx0XRqnhQlDb82eoLKgTxd3k
-p1RZbCrAZ0zOoHU054o3qVp0gBdGCAtzYTTRSydReHcYTdGDAhUAgrQiu7gTH57v
-eQ+cMgX9hZwSQpI=
------END DSA PRIVATE KEY-----

=== removed file 'lib/lp/codehosting/tests/id_dsa.pub'
--- lib/lp/codehosting/tests/id_dsa.pub	2005-12-14 12:59:57 +0000
+++ lib/lp/codehosting/tests/id_dsa.pub	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-ssh-dss AAAAB3NzaC1kc3MAAABBAL5VoWG5sy3CnLYeOw47L8m9A15hA/PzdX2u0B7c2Z1ktFPcEaEuKbLqKVSkXpYm7YwKj9y88A9Qm61CdvI0c50AAAAVAKGY0YON9dEFH3DzeVYHVEBGFGfVAAAAQCoe0RhBcefm4YiyQVwMAxwTlgySTk7FSk6GZ95EZ5Q8/OTdViTaalvGXaRIsBdaQamHEBB+Vek/VpnF1UGGm8YAAABAaCXDl0r1k93JhnMdF0ap4UJQ2/NnqCyoE8Xd5KdUWWwqwGdMzqB1NOeKN6ladIAXRggLc2E00UsnUXh3GE3Rgw== andrew@frobozz

=== added file 'lib/lp/codehosting/tests/id_rsa'
--- lib/lp/codehosting/tests/id_rsa	1970-01-01 00:00:00 +0000
+++ lib/lp/codehosting/tests/id_rsa	2017-12-15 14:21:39 +0000
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQCeP6iOLFdRSJ/CwuUjj0dE3+bJiZUn2AsappUcjCZN75CBKvqP
+kpGDIU/ZlOddAdj1rif6dl9rqEBuoliduIZ1bmPaGs1jmpME7HPctLhCmzy1oC8w
+kdVNkZnmoTW34j5Y8mKWuy32hVWvp3OdfIo+dxW576ny52VkTbST+t4KlQIDAQAB
+AoGAbizr8XA1qsXhVPvUBJnwiKdKSu6bBg6ITJnGHwYEdSZheUyu/d6RqLY8ncPq
+APsUTpheBSb88DtIAL7O66BZG7imASdW0fSXYzWeNxjPtgebyu7o/+xIgUfUdAWd
+FbT7atE7e3zxT0XnOiN0DSBBtyBTwSly/+JqehK1X3gloFECQQDSDCKbFJrRtIk9
+iVZ/TwQvoUYF1VTYtzfluenRqdcxMxWPR5FzEBpTyz66lPA6TheUp36aql/GnLuz
+QEcXoEpfAkEAwN5+2MuyKoIci2HBqfYCQZW4qPvakkRzyvKpERJmqS7QJFgD0hC6
+6nloOZxEP8uVoEbcCPZ0pLWOsr1zQWz3iwJAHomVHmbIe2R7725gHPIn8aTIwWBa
+jYdVoRh+XfULTCPZJpOJGellanlKDWZJ5rAjzYDsbyAF/KIcx9q4ez7akQJAMfGr
+8WIWOhHFaIahCu0sumUWE5RcjmHxhk1+YHBea1M3DSJJov04Gf3kcn634blLfty6
+oAuKOxjU4g5TKU8ZbwJAScYXwBYWR/FNkg6JvWtklF4i3LlDSHYHNMnUowYkCU6/
+5zZqh5G45QWoj7kfASHHCcuxPrlR5sGALHqktLBvaA==
+-----END RSA PRIVATE KEY-----

=== added file 'lib/lp/codehosting/tests/id_rsa.pub'
--- lib/lp/codehosting/tests/id_rsa.pub	1970-01-01 00:00:00 +0000
+++ lib/lp/codehosting/tests/id_rsa.pub	2017-12-15 14:21:39 +0000
@@ -0,0 +1,1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCeP6iOLFdRSJ/CwuUjj0dE3+bJiZUn2AsappUcjCZN75CBKvqPkpGDIU/ZlOddAdj1rif6dl9rqEBuoliduIZ1bmPaGs1jmpME7HPctLhCmzy1oC8wkdVNkZnmoTW34j5Y8mKWuy32hVWvp3OdfIo+dxW576ny52VkTbST+t4KlQ== cjwatson@niejwein

=== modified file 'lib/lp/codehosting/tests/servers.py'
--- lib/lp/codehosting/tests/servers.py	2016-02-05 16:51:12 +0000
+++ lib/lp/codehosting/tests/servers.py	2017-12-15 14:21:39 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Server used in codehosting acceptance tests."""
@@ -43,14 +43,9 @@
         membership_policy=TeamMembershipPolicy.OPEN)
     testUser.join(testTeam)
     ssh_key_set = getUtility(ISSHKeySet)
-    ssh_key_set.new(
-        testUser,
-        'ssh-dss AAAAB3NzaC1kc3MAAABBAL5VoWG5sy3CnLYeOw47L8m9A15hA/PzdX2u'
-        '0B7c2Z1ktFPcEaEuKbLqKVSkXpYm7YwKj9y88A9Qm61CdvI0c50AAAAVAKGY0YON'
-        '9dEFH3DzeVYHVEBGFGfVAAAAQCoe0RhBcefm4YiyQVwMAxwTlgySTk7FSk6GZ95E'
-        'Z5Q8/OTdViTaalvGXaRIsBdaQamHEBB+Vek/VpnF1UGGm8YAAABAaCXDl0r1k93J'
-        'hnMdF0ap4UJQ2/NnqCyoE8Xd5KdUWWwqwGdMzqB1NOeKN6ladIAXRggLc2E00Usn'
-        'UXh3GE3Rgw== testuser')
+    with open(sibpath(__file__, 'id_rsa.pub')) as f:
+        pubkey_data = f.read().rstrip('\n')
+    ssh_key_set.new(testUser, pubkey_data)
     transaction.commit()
 
 
@@ -107,12 +102,12 @@
         user_home = os.path.abspath(tempfile.mkdtemp())
         os.makedirs(os.path.join(user_home, '.ssh'))
         shutil.copyfile(
-            sibpath(__file__, 'id_dsa'),
-            os.path.join(user_home, '.ssh', 'id_dsa'))
+            sibpath(__file__, 'id_rsa'),
+            os.path.join(user_home, '.ssh', 'id_rsa'))
         shutil.copyfile(
-            sibpath(__file__, 'id_dsa.pub'),
-            os.path.join(user_home, '.ssh', 'id_dsa.pub'))
-        os.chmod(os.path.join(user_home, '.ssh', 'id_dsa'), 0o600)
+            sibpath(__file__, 'id_rsa.pub'),
+            os.path.join(user_home, '.ssh', 'id_rsa.pub'))
+        os.chmod(os.path.join(user_home, '.ssh', 'id_rsa'), 0o600)
         real_home, os.environ['HOME'] = os.environ['HOME'], user_home
         return real_home, user_home
 

=== modified file 'lib/lp/registry/tests/test_listteammembers.py'
--- lib/lp/registry/tests/test_listteammembers.py	2012-01-01 02:58:52 +0000
+++ lib/lp/registry/tests/test_listteammembers.py	2017-12-15 14:21:39 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 from lp.registry.scripts import listteammembers
@@ -49,12 +49,10 @@
     ])
 
 ubuntuteam_sshkeys = [
-    u'mark: ssh-dss AAAAB3NzaC1kc3MAAABBAL5VoWG5sy3CnLYeOw47L8m9A15hA/PzdX2u0'
-    u'B7c2Z1ktFPcEaEuKbLqKVSkXpYm7YwKj9y88A9Qm61CdvI0c50AAAAVAKGY0YON9dEFH3Dz'
-    u'eVYHVEBGFGfVAAAAQCoe0RhBcefm4YiyQVwMAxwTlgySTk7FSk6GZ95EZ5Q8/OTdViTaalv'
-    u'GXaRIsBdaQamHEBB+Vek/VpnF1UGGm8YAAABAaCXDl0r1k93JhnMdF0ap4UJQ2/NnqCyoE8'
-    u'Xd5KdUWWwqwGdMzqB1NOeKN6ladIAXRggLc2E00UsnUXh3GE3Rgw== Private key in '
-    u'lib/lp/codehosting/tests/id_dsa',
+    u'mark: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCeP6iOLFdRSJ/CwuUjj0dE3+bJi'
+    u'ZUn2AsappUcjCZN75CBKvqPkpGDIU/ZlOddAdj1rif6dl9rqEBuoliduIZ1bmPaGs1jmpME'
+    u'7HPctLhCmzy1oC8wkdVNkZnmoTW34j5Y8mKWuy32hVWvp3OdfIo+dxW576ny52VkTbST+t4'
+    u'KlQ== Private key in lib/lp/codehosting/tests/id_rsa',
     ]