1
=== modified file 'tests/test_context.py'
2
--- tests/test_context.py	2013-05-28 14:41:29 +0000
3
+++ tests/test_context.py	2014-04-14 22:21:21 +0000
4
@@ -199,3 +199,44 @@
5
199
                                                 hostname="localhost")
199
                                                 hostname="localhost")
6
200
200
7
201
        yield self.verify_context(server_context, client_context)
201
        yield self.verify_context(server_context, client_context)
8
202
9
203
10
204
class CertLoadingTestCase(unittest.TestCase):
11
205
    """Tests for the get_certificates function."""
12
206
13
207
    def test_load_all_certificates(self):
14
208
        """Load all available certificates."""
15
209
        certs = FakeCerts(self, "localhost")
16
210
        self.patch(context, 'get_cert_dir', lambda: certs.cert_dir)
17
211
        # remove the key
18
212
        os.unlink(certs.server_key_path)
19
213
        loaded = context.get_certificates()
20
214
        expected = []
21
215
        for cert_file in os.listdir(certs.cert_dir):
22
216
            if not cert_file.endswith('.pem'):
23
217
                continue
24
218
            with open(os.path.join(certs.cert_dir, cert_file), 'r') as fd:
25
219
                ca_file = ssl.Certificate.loadPEM(fd.read())
26
220
                expected.append(ca_file.original.digest("sha1"))
27
221
28
222
        certs = set(cert.digest("sha1") for cert in loaded)
29
223
        self.assertFalse(certs.difference(set(expected)))
30
224
31
225
    @defer.inlineCallbacks
32
226
    def test_use_all_certificates_and_fail(self):
33
227
        """Use system installed certificates and fail checking self-signed."""
34
228
        certs = FakeCerts(self, "localhost")
35
229
        server_context = ssl.DefaultOpenSSLContextFactory(
36
230
            certs.server_key_path, certs.server_cert_path)
37
231
        client_context = context.get_ssl_context(no_verify=False,
38
232
                                                 hostname="localhost")
39
233
        site = server.Site(FakeResource())
40
234
        port = reactor.listenSSL(0, site, server_context)
41
235
        self.addCleanup(port.stopListening)
42
236
        url = "https://localhost:%d" % port.getHost().port
43
237
        try:
44
238
            yield client.getPage(url, contextFactory=client_context)
45
239
        except SSL.Error:
46
240
            return
47
241
        else:
48
242
            self.fail("Should fail with SSL Error.")
49
202
243
50
=== modified file 'ubuntuone/storageprotocol/context.py'
51
--- ubuntuone/storageprotocol/context.py	2013-05-22 21:27:33 +0000
52
+++ ubuntuone/storageprotocol/context.py	2014-04-14 22:21:21 +0000
53
@@ -68,13 +68,22 @@
54
68
def get_certificates():
68
def get_certificates():
55
69
    """Get a list of certificate paths."""
69
    """Get a list of certificate paths."""
56
70
    ssl_cert_location = get_cert_dir()
70
    ssl_cert_location = get_cert_dir()
64
71
    ca_file = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
71
    ca_files = []
65
72
                     'UbuntuOne-Go_Daddy_Class_2_CA.pem'), 'r').read())
72
    digests = set()
66
73
    ca_file_2 = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
73
    for fname in os.listdir(ssl_cert_location):
67
74
                    'UbuntuOne-Go_Daddy_CA.pem'), 'r').read())
74
        full_path = os.path.join(ssl_cert_location, fname)
68
75
    ca_file_3 = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
75
        if os.path.isdir(full_path) or not fname.endswith(".pem"):
69
76
                    'UbuntuOne-ValiCert_Class_2_VA.pem'), 'r').read())
76
            continue
70
77
    return [ca_file.original, ca_file_2.original, ca_file_3.original]
77
        with open(full_path, 'r') as fd:
71
78
            ca_file = ssl.Certificate.loadPEM(fd.read())
72
79
            # we need to avoid adding the same cert twice as openssl
73
80
            # doesn't like it
74
81
            digest = ca_file.original.digest("sha1")
75
82
            if digest in digests:
76
83
                continue
77
84
            digests.add(digest)
78
85
            ca_files.append(ca_file.original)
79
86
    return ca_files
80
78
87
81
79
88
82
80
def get_ssl_context(no_verify, hostname=None):
89
def get_ssl_context(no_verify, hostname=None):
Reviewer	Review Type	Date Requested	Status
dobey (community)		2014-04-14	Approve on 2014-04-15
Review via email: mp+215721@code.launchpad.net