Merge lp:~dobey/ubuntuone-storage-protocol/update-3-0 into lp:ubuntuone-storage-protocol/stable-3-0

[dobey]

[Alejandro Cura]

    Add the ValiCert certificate to the custom certificates (LP: #882062).
    Be more strict when validating the SSL certificate

[Rodney Dawes]

    Patch get_certificates to use the uninstalled certificates when testing

[Roberto Alsina (ralsina)]

review: Approve

=== added file 'data/ValiCert_Class_2_VA.pem'
--- data/ValiCert_Class_2_VA.pem	1970-01-01 00:00:00 +0000
+++ data/ValiCert_Class_2_VA.pem	2012-06-12 20:02:24 +0000
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----

=== modified file 'setup.py'
--- setup.py	2012-05-18 20:26:48 +0000
+++ setup.py	2012-06-12 20:02:24 +0000
@@ -76,6 +76,7 @@
       extra_path='ubuntuone-storage-protocol',
       data_files=[(ssl_cert_location,
                    ['data/UbuntuOne-Go_Daddy_CA.pem',
+                    'data/ValiCert_Class_2_VA.pem',
                     'data/UbuntuOne-Go_Daddy_Class_2_CA.pem'])],
 
       cmdclass={

=== added file 'tests/test_context.py'
--- tests/test_context.py	1970-01-01 00:00:00 +0000
+++ tests/test_context.py	2012-06-12 20:02:24 +0000
@@ -0,0 +1,197 @@
+# tests.test_context - test ssl context creation
+#
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3,
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+
+import os
+
+from OpenSSL import crypto, SSL
+from twisted.internet import defer, error, reactor, ssl
+from twisted.trial import unittest
+from twisted.web import client, resource, server
+
+from ubuntuone.storageprotocol import context
+
+
+class FakeCerts(object):
+    """CA and Server certificate."""
+
+    def __init__(self, testcase, common_name="fake.domain"):
+        """Initialize this fake instance."""
+        self.cert_dir = os.path.join(testcase.mktemp(), 'certs')
+        if not os.path.exists(self.cert_dir):
+            os.makedirs(self.cert_dir)
+
+        ca_key = self._build_key()
+        ca_req = self._build_request(ca_key, "Fake Cert Authority")
+        self.ca_cert = self._build_cert(ca_req, ca_req, ca_key)
+
+        server_key = self._build_key()
+        server_req = self._build_request(server_key, common_name)
+        server_cert = self._build_cert(server_req, self.ca_cert, ca_key)
+
+        self.server_key_path = self._save_key(server_key, "server_key.pem")
+        self.server_cert_path = self._save_cert(server_cert, "server_cert.pem")
+
+    def _save_key(self, key, filename):
+        """Save a certificate."""
+        data = crypto.dump_privatekey(crypto.FILETYPE_PEM, key)
+        return self._save(filename, data)
+
+    def _save_cert(self, cert, filename):
+        """Save a certificate."""
+        data = crypto.dump_certificate(crypto.FILETYPE_PEM, cert)
+        return self._save(filename, data)
+
+    def _save(self, filename, data):
+        """Save a key or certificate, and return the full path."""
+        fullpath = os.path.join(self.cert_dir, filename)
+        if os.path.exists(fullpath):
+            os.unlink(fullpath)
+        with open(fullpath, 'wt') as fd:
+            fd.write(data)
+        return fullpath
+
+    def _build_key(self):
+        """Create a private/public key, save it in a temp dir."""
+        key = crypto.PKey()
+        key.generate_key(crypto.TYPE_RSA, 1024)
+        return key
+
+    def _build_request(self, key, common_name):
+        """Create a new certificate request."""
+        request = crypto.X509Req()
+        request.get_subject().CN = common_name
+        request.set_pubkey(key)
+        request.sign(key, "md5")
+        return request
+
+    def _build_cert(self, request, ca_cert, ca_key):
+        """Create a new certificate."""
+        certificate = crypto.X509()
+        certificate.set_serial_number(1)
+        certificate.set_issuer(ca_cert.get_subject())
+        certificate.set_subject(request.get_subject())
+        certificate.set_pubkey(request.get_pubkey())
+        certificate.gmtime_adj_notBefore(0)
+        certificate.gmtime_adj_notAfter(3600)  # valid for one hour
+        certificate.sign(ca_key, "md5")
+        return certificate
+
+
+class FakeResource(resource.Resource):
+    """A fake resource."""
+
+    isLeaf = True
+
+    def render(self, request):
+        """Render this resource."""
+        return "ok"
+
+
+class SSLContextTestCase(unittest.TestCase):
+    """Tests for the context.get_ssl_context function."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(SSLContextTestCase, self).setUp()
+        self.patch(context, "get_certificates", self.get_certificates)
+
+    def get_certificates(self):
+        """Get the uninstalled certificates, for testing."""
+        ca_1 = ssl.Certificate.loadPEM(file(os.path.abspath(os.path.join(
+                        os.pardir, os.pardir, 'data',
+                        'UbuntuOne-Go_Daddy_Class_2_CA.pem')), 'r').read())
+        ca_2 = ssl.Certificate.loadPEM(file(os.path.abspath(os.path.join(
+                        os.pardir, os.pardir, 'data',
+                        'UbuntuOne-Go_Daddy_CA.pem')), 'r').read())
+        return [ca_1.original, ca_2.original]
+
+    @defer.inlineCallbacks
+    def verify_context(self, server_context, client_context):
+        """Verify a client context with a given server context."""
+        site = server.Site(FakeResource())
+        port = reactor.listenSSL(0, site, server_context)
+        self.addCleanup(port.stopListening)
+        url = "https://localhost:%d" % port.getHost().port
+        result = yield client.getPage(url, contextFactory=client_context)
+        self.assertEqual(result, "ok")
+
+    @defer.inlineCallbacks
+    def test_no_verify(self):
+        """Test the no_verify option."""
+        certs = FakeCerts(self, "localhost")
+        server_context = ssl.DefaultOpenSSLContextFactory(
+                                 certs.server_key_path, certs.server_cert_path)
+        client_context = context.get_ssl_context(no_verify=True,
+                                                 hostname="localhost")
+
+        yield self.verify_context(server_context, client_context)
+
+    def test_no_hostname(self):
+        """Test that calling without hostname arg raises proper error."""
+        self.assertRaises(error.CertificateError,
+                          context.get_ssl_context, False)
+
+    @defer.inlineCallbacks
+    def test_fails_certificate(self):
+        """A wrong certificate is rejected."""
+        certs = FakeCerts(self, "localhost")
+        server_context = ssl.DefaultOpenSSLContextFactory(
+                                 certs.server_key_path, certs.server_cert_path)
+        client_context = context.get_ssl_context(no_verify=False,
+                                                 hostname="localhost")
+
+        d = self.verify_context(server_context, client_context)
+        e = yield self.assertFailure(d, SSL.Error)
+        self.assertEqual(e[0][0][1], "SSL3_GET_SERVER_CERTIFICATE")
+
+    @defer.inlineCallbacks
+    def test_fails_hostname(self):
+        """A wrong hostname is rejected."""
+        certs = FakeCerts(self, "thisiswronghost.net")
+        server_context = ssl.DefaultOpenSSLContextFactory(
+                                 certs.server_key_path, certs.server_cert_path)
+        self.patch(context, "get_certificates", lambda: [certs.ca_cert])
+        client_context = context.get_ssl_context(no_verify=False,
+                                                 hostname="localhost")
+
+        d = self.verify_context(server_context, client_context)
+        e = yield self.assertFailure(d, SSL.Error)
+        self.assertEqual(e[0][0][1], "SSL3_GET_SERVER_CERTIFICATE")
+
+    @defer.inlineCallbacks
+    def test_matches_all(self):
+        """A valid certificate passes checks."""
+        certs = FakeCerts(self, "localhost")
+        server_context = ssl.DefaultOpenSSLContextFactory(
+                                 certs.server_key_path, certs.server_cert_path)
+        self.patch(context, "get_certificates", lambda: [certs.ca_cert])
+        client_context = context.get_ssl_context(no_verify=False,
+                                                 hostname="localhost")
+
+        yield self.verify_context(server_context, client_context)

=== modified file 'ubuntuone/storageprotocol/context.py'
--- ubuntuone/storageprotocol/context.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/context.py	2012-06-12 20:02:24 +0000
@@ -33,7 +33,8 @@
 import sys
 
 from OpenSSL import SSL
-from twisted.internet import ssl
+from twisted.internet import error, ssl
+from twisted.python import log
 
 if sys.platform == "win32":
     # diable pylint warning, as it may be the wrong platform
@@ -58,18 +59,52 @@
     ssl_cert_location = '/etc/ssl/certs'
 
 
-def get_ssl_context(no_verify):
-    """ Get the ssl context """
+class HostnameVerifyContextFactory(ssl.CertificateOptions):
+    """Does hostname checks in addition to certificate checks."""
+
+    def __init__(self, hostname, *args, **kwargs):
+        """Initialize this instance."""
+        super(HostnameVerifyContextFactory, self).__init__(*args, **kwargs)
+        self.expected_hostname = hostname
+
+    def verify_server_hostname(self, conn, cert, errno, depth, preverifyOK):
+        """Verify the server hostname."""
+        if depth == 0:
+            # No extra checks because U1 certs have the right commonName
+            if self.expected_hostname != cert.get_subject().commonName:
+                log.err("Host name does not match certificate. "
+                        "Expected %s but got %s." % (self.expected_hostname,
+                            cert.get_subject().commonName))
+                return False
+        return preverifyOK
+
+    def getContext(self):
+        """The context returned will verify the hostname too."""
+        ctx = super(HostnameVerifyContextFactory, self).getContext()
+        flags = SSL.VERIFY_PEER | SSL.VERIFY_FAIL_IF_NO_PEER_CERT
+        ctx.set_verify(flags, self.verify_server_hostname)
+        return ctx
+
+
+def get_certificates():
+    """Get a list of certificate paths."""
+    ca_file = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
+                     'UbuntuOne-Go_Daddy_Class_2_CA.pem'), 'r').read())
+    ca_file_2 = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
+                    'UbuntuOne-Go_Daddy_CA.pem'), 'r').read())
+    ca_file_3 = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
+                    'ValiCert_Class_2_VA.pem'), 'r').read())
+    return [ca_file.original, ca_file_2.original, ca_file_3.original]
+
+
+def get_ssl_context(no_verify, hostname=None):
+    """Get the ssl context."""
     if no_verify:
         ctx = ssl.ClientContextFactory()
     else:
-        ca_file = ssl.Certificate.loadPEM(file(
-            os.path.join(ssl_cert_location,
-                         'UbuntuOne-Go_Daddy_Class_2_CA.pem'), 'r').read())
-        ca_file_2 = ssl.Certificate.loadPEM(file(
-            os.path.join(ssl_cert_location,
-                        'UbuntuOne-Go_Daddy_CA.pem'), 'r').read())
-        ctx = ssl.CertificateOptions(verify=True,
-            caCerts=[ca_file.original, ca_file_2.original],
-                     method=SSL.SSLv23_METHOD)
+        if hostname is None:
+            raise error.CertificateError(
+                'No hostname specified. Unable to verify SSL certificate.')
+        ctx = HostnameVerifyContextFactory(hostname, verify=True,
+                          caCerts=get_certificates(), method=SSL.SSLv23_METHOD)
     return ctx