Launchpad itself

Merge lp:~cjwatson/launchpad/refresh-test-ssh-key into lp:launchpad

  1. refresh-test-ssh-key
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18512
Proposed branch: lp:~cjwatson/launchpad/refresh-test-ssh-key
Merge into: lp:launchpad
Diff against target: 141 lines (+32/-32)
8 files modified
database/sampledata/current-dev.sql (+1/-1)
database/sampledata/current.sql (+1/-1)
lib/lp/codehosting/tests/id_dsa (+0/-8)
lib/lp/codehosting/tests/id_dsa.pub (+0/-1)
lib/lp/codehosting/tests/id_rsa (+15/-0)
lib/lp/codehosting/tests/id_rsa.pub (+1/-0)
lib/lp/codehosting/tests/servers.py (+9/-14)
lib/lp/registry/tests/test_listteammembers.py (+5/-7)
To merge this branch: bzr merge lp:~cjwatson/launchpad/refresh-test-ssh-key
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+335257@code.launchpad.net

Commit message

Replace test 512-bit DSA key with 1024-bit RSA key.

Description of the change

Twisted >= 16.0.0 uses cryptography, which forbids such short keys.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) wrote :

"Twisted >= 16.0.0 uses cryptography, which forbids such short keys." is a little ambiguous, but neither meaning is particularly wrong...

review: Approve (code)
Revision history for this message
Colin Watson (cjwatson) wrote :

I indeed considered the ambiguity and felt that it was best left in place.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'database/sampledata/current-dev.sql'
2--- database/sampledata/current-dev.sql 2017-11-18 13:29:18 +0000
3+++ database/sampledata/current-dev.sql 2017-12-15 14:21:39 +0000
4@@ -10033,7 +10033,7 @@
5 ALTER TABLE sshkey DISABLE TRIGGER ALL;
6
7 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');
8-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');
9+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');
10
11
12 ALTER TABLE sshkey ENABLE TRIGGER ALL;
13
14=== modified file 'database/sampledata/current.sql'
15--- database/sampledata/current.sql 2017-11-18 13:29:18 +0000
16+++ database/sampledata/current.sql 2017-12-15 14:21:39 +0000
17@@ -9945,7 +9945,7 @@
18 ALTER TABLE sshkey DISABLE TRIGGER ALL;
19
20 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');
21-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');
22+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');
23
24
25 ALTER TABLE sshkey ENABLE TRIGGER ALL;
26
27=== removed file 'lib/lp/codehosting/tests/id_dsa'
28--- lib/lp/codehosting/tests/id_dsa 2005-12-14 12:59:57 +0000
29+++ lib/lp/codehosting/tests/id_dsa 1970-01-01 00:00:00 +0000
30@@ -1,8 +0,0 @@
31------BEGIN DSA PRIVATE KEY-----
32-MIH4AgEAAkEAvlWhYbmzLcKcth47Djsvyb0DXmED8/N1fa7QHtzZnWS0U9wRoS4p
33-suopVKRelibtjAqP3LzwD1CbrUJ28jRznQIVAKGY0YON9dEFH3DzeVYHVEBGFGfV
34-AkAqHtEYQXHn5uGIskFcDAMcE5YMkk5OxUpOhmfeRGeUPPzk3VYk2mpbxl2kSLAX
35-WkGphxAQflXpP1aZxdVBhpvGAkBoJcOXSvWT3cmGcx0XRqnhQlDb82eoLKgTxd3k
36-p1RZbCrAZ0zOoHU054o3qVp0gBdGCAtzYTTRSydReHcYTdGDAhUAgrQiu7gTH57v
37-eQ+cMgX9hZwSQpI=
38------END DSA PRIVATE KEY-----
39
40=== removed file 'lib/lp/codehosting/tests/id_dsa.pub'
41--- lib/lp/codehosting/tests/id_dsa.pub 2005-12-14 12:59:57 +0000
42+++ lib/lp/codehosting/tests/id_dsa.pub 1970-01-01 00:00:00 +0000
43@@ -1,1 +0,0 @@
44-ssh-dss AAAAB3NzaC1kc3MAAABBAL5VoWG5sy3CnLYeOw47L8m9A15hA/PzdX2u0B7c2Z1ktFPcEaEuKbLqKVSkXpYm7YwKj9y88A9Qm61CdvI0c50AAAAVAKGY0YON9dEFH3DzeVYHVEBGFGfVAAAAQCoe0RhBcefm4YiyQVwMAxwTlgySTk7FSk6GZ95EZ5Q8/OTdViTaalvGXaRIsBdaQamHEBB+Vek/VpnF1UGGm8YAAABAaCXDl0r1k93JhnMdF0ap4UJQ2/NnqCyoE8Xd5KdUWWwqwGdMzqB1NOeKN6ladIAXRggLc2E00UsnUXh3GE3Rgw== andrew@frobozz
45
46=== added file 'lib/lp/codehosting/tests/id_rsa'
47--- lib/lp/codehosting/tests/id_rsa 1970-01-01 00:00:00 +0000
48+++ lib/lp/codehosting/tests/id_rsa 2017-12-15 14:21:39 +0000
49@@ -0,0 +1,15 @@
50+-----BEGIN RSA PRIVATE KEY-----
51+MIICWwIBAAKBgQCeP6iOLFdRSJ/CwuUjj0dE3+bJiZUn2AsappUcjCZN75CBKvqP
52+kpGDIU/ZlOddAdj1rif6dl9rqEBuoliduIZ1bmPaGs1jmpME7HPctLhCmzy1oC8w
53+kdVNkZnmoTW34j5Y8mKWuy32hVWvp3OdfIo+dxW576ny52VkTbST+t4KlQIDAQAB
54+AoGAbizr8XA1qsXhVPvUBJnwiKdKSu6bBg6ITJnGHwYEdSZheUyu/d6RqLY8ncPq
55+APsUTpheBSb88DtIAL7O66BZG7imASdW0fSXYzWeNxjPtgebyu7o/+xIgUfUdAWd
56+FbT7atE7e3zxT0XnOiN0DSBBtyBTwSly/+JqehK1X3gloFECQQDSDCKbFJrRtIk9
57+iVZ/TwQvoUYF1VTYtzfluenRqdcxMxWPR5FzEBpTyz66lPA6TheUp36aql/GnLuz
58+QEcXoEpfAkEAwN5+2MuyKoIci2HBqfYCQZW4qPvakkRzyvKpERJmqS7QJFgD0hC6
59+6nloOZxEP8uVoEbcCPZ0pLWOsr1zQWz3iwJAHomVHmbIe2R7725gHPIn8aTIwWBa
60+jYdVoRh+XfULTCPZJpOJGellanlKDWZJ5rAjzYDsbyAF/KIcx9q4ez7akQJAMfGr
61+8WIWOhHFaIahCu0sumUWE5RcjmHxhk1+YHBea1M3DSJJov04Gf3kcn634blLfty6
62+oAuKOxjU4g5TKU8ZbwJAScYXwBYWR/FNkg6JvWtklF4i3LlDSHYHNMnUowYkCU6/
63+5zZqh5G45QWoj7kfASHHCcuxPrlR5sGALHqktLBvaA==
64+-----END RSA PRIVATE KEY-----
65
66=== added file 'lib/lp/codehosting/tests/id_rsa.pub'
67--- lib/lp/codehosting/tests/id_rsa.pub 1970-01-01 00:00:00 +0000
68+++ lib/lp/codehosting/tests/id_rsa.pub 2017-12-15 14:21:39 +0000
69@@ -0,0 +1,1 @@
70+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCeP6iOLFdRSJ/CwuUjj0dE3+bJiZUn2AsappUcjCZN75CBKvqPkpGDIU/ZlOddAdj1rif6dl9rqEBuoliduIZ1bmPaGs1jmpME7HPctLhCmzy1oC8wkdVNkZnmoTW34j5Y8mKWuy32hVWvp3OdfIo+dxW576ny52VkTbST+t4KlQ== cjwatson@niejwein
71
72=== modified file 'lib/lp/codehosting/tests/servers.py'
73--- lib/lp/codehosting/tests/servers.py 2016-02-05 16:51:12 +0000
74+++ lib/lp/codehosting/tests/servers.py 2017-12-15 14:21:39 +0000
75@@ -1,4 +1,4 @@
76-# Copyright 2009-2016 Canonical Ltd. This software is licensed under the
77+# Copyright 2009-2017 Canonical Ltd. This software is licensed under the
78 # GNU Affero General Public License version 3 (see the file LICENSE).
79
80 """Server used in codehosting acceptance tests."""
81@@ -43,14 +43,9 @@
82 membership_policy=TeamMembershipPolicy.OPEN)
83 testUser.join(testTeam)
84 ssh_key_set = getUtility(ISSHKeySet)
85- ssh_key_set.new(
86- testUser,
87- 'ssh-dss AAAAB3NzaC1kc3MAAABBAL5VoWG5sy3CnLYeOw47L8m9A15hA/PzdX2u'
88- '0B7c2Z1ktFPcEaEuKbLqKVSkXpYm7YwKj9y88A9Qm61CdvI0c50AAAAVAKGY0YON'
89- '9dEFH3DzeVYHVEBGFGfVAAAAQCoe0RhBcefm4YiyQVwMAxwTlgySTk7FSk6GZ95E'
90- 'Z5Q8/OTdViTaalvGXaRIsBdaQamHEBB+Vek/VpnF1UGGm8YAAABAaCXDl0r1k93J'
91- 'hnMdF0ap4UJQ2/NnqCyoE8Xd5KdUWWwqwGdMzqB1NOeKN6ladIAXRggLc2E00Usn'
92- 'UXh3GE3Rgw== testuser')
93+ with open(sibpath(__file__, 'id_rsa.pub')) as f:
94+ pubkey_data = f.read().rstrip('\n')
95+ ssh_key_set.new(testUser, pubkey_data)
96 transaction.commit()
97
98
99@@ -107,12 +102,12 @@
100 user_home = os.path.abspath(tempfile.mkdtemp())
101 os.makedirs(os.path.join(user_home, '.ssh'))
102 shutil.copyfile(
103- sibpath(__file__, 'id_dsa'),
104- os.path.join(user_home, '.ssh', 'id_dsa'))
105+ sibpath(__file__, 'id_rsa'),
106+ os.path.join(user_home, '.ssh', 'id_rsa'))
107 shutil.copyfile(
108- sibpath(__file__, 'id_dsa.pub'),
109- os.path.join(user_home, '.ssh', 'id_dsa.pub'))
110- os.chmod(os.path.join(user_home, '.ssh', 'id_dsa'), 0o600)
111+ sibpath(__file__, 'id_rsa.pub'),
112+ os.path.join(user_home, '.ssh', 'id_rsa.pub'))
113+ os.chmod(os.path.join(user_home, '.ssh', 'id_rsa'), 0o600)
114 real_home, os.environ['HOME'] = os.environ['HOME'], user_home
115 return real_home, user_home
116
117
118=== modified file 'lib/lp/registry/tests/test_listteammembers.py'
119--- lib/lp/registry/tests/test_listteammembers.py 2012-01-01 02:58:52 +0000
120+++ lib/lp/registry/tests/test_listteammembers.py 2017-12-15 14:21:39 +0000
121@@ -1,4 +1,4 @@
122-# Copyright 2009 Canonical Ltd. This software is licensed under the
123+# Copyright 2009-2017 Canonical Ltd. This software is licensed under the
124 # GNU Affero General Public License version 3 (see the file LICENSE).
125
126 from lp.registry.scripts import listteammembers
127@@ -49,12 +49,10 @@
128 ])
129
130 ubuntuteam_sshkeys = [
131- u'mark: ssh-dss AAAAB3NzaC1kc3MAAABBAL5VoWG5sy3CnLYeOw47L8m9A15hA/PzdX2u0'
132- u'B7c2Z1ktFPcEaEuKbLqKVSkXpYm7YwKj9y88A9Qm61CdvI0c50AAAAVAKGY0YON9dEFH3Dz'
133- u'eVYHVEBGFGfVAAAAQCoe0RhBcefm4YiyQVwMAxwTlgySTk7FSk6GZ95EZ5Q8/OTdViTaalv'
134- u'GXaRIsBdaQamHEBB+Vek/VpnF1UGGm8YAAABAaCXDl0r1k93JhnMdF0ap4UJQ2/NnqCyoE8'
135- u'Xd5KdUWWwqwGdMzqB1NOeKN6ladIAXRggLc2E00UsnUXh3GE3Rgw== Private key in '
136- u'lib/lp/codehosting/tests/id_dsa',
137+ u'mark: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCeP6iOLFdRSJ/CwuUjj0dE3+bJi'
138+ u'ZUn2AsappUcjCZN75CBKvqPkpGDIU/ZlOddAdj1rif6dl9rqEBuoliduIZ1bmPaGs1jmpME'
139+ u'7HPctLhCmzy1oC8wkdVNkZnmoTW34j5Y8mKWuy32hVWvp3OdfIo+dxW576ny52VkTbST+t4'
140+ u'KlQ== Private key in lib/lp/codehosting/tests/id_rsa',
141 ]
142
143