Merge lp:~cr3/checkbox/transport into lp:checkbox

[Marc Tardif]

[lp:~cr3/checkbox/transport]

1078. By Marc Tardif on 2011-09-28

Added checking for exception when exchanging in case the certificate is invalid.

[Daniel Manrique (roadmr)]

Looks OK, merging. Thanks!

review: Approve

=== modified file 'checkbox/lib/transport.py'
--- checkbox/lib/transport.py	2011-09-14 19:18:06 +0000
+++ checkbox/lib/transport.py	2011-09-28 18:22:26 +0000
@@ -19,6 +19,7 @@
 import logging
 
 import os
+import re
 import stat
 import sys
 import posixpath
@@ -133,19 +134,28 @@
     timeout = None
     _tunnel_host = None
 
+    def match_name(self, name):
+        parts = []
+        for fragment in name.split(r"."):
+            if fragment == "*":
+                parts.append(".+")
+            else:
+                fragment = re.escape(fragment)
+                parts.append(fragment.replace(r"\*", ".*"))
+        return re.match(r"\A" + r"\.".join(parts) + r"\Z", self.host, re.IGNORECASE)
+
     def verify_cert(self, cert):
-        # verify that the hostname exactly matches that of the certificate,
-        #    wildcards in the certificate hostname are not supported
+        # verify that the hostname matches that of the certificate
         if cert:
             san = cert.get("subjectAltName", ())
             for key, value in san:
-                if key == "DNS" and value == self.host:
+                if key == "DNS" and self.match_name(value):
                     return True
 
             if not san:
                 for subject in cert.get("subject", ()):
                     for key, value in subject:
-                        if key == "commonName" and value == self.host:
+                        if key == "commonName" and self.match_name(value):
                             return True
 
         return False

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-28 18:20:25 +0000
+++ debian/changelog	2011-09-28 18:22:26 +0000
@@ -31,6 +31,9 @@
     each time (LP: #855845)
     (LP: #852201)
 
+  [Marc Tardif]
+  * Added support for wildcards when verifying the transport certificate.
+
   [Tim Chen]
   * Fix cpu_scaling_test (LP: #811177)
  

=== modified file 'plugins/launchpad_exchange.py'
--- plugins/launchpad_exchange.py	2011-08-31 16:47:02 +0000
+++ plugins/launchpad_exchange.py	2011-09-28 18:22:26 +0000
@@ -139,8 +139,12 @@
 
         transport = HTTPTransport(self.transport_url)
         start_time = time.time()
-        response = transport.exchange(form, self._headers,
-            timeout=string_to_type(self.timeout))
+        try:
+            response = transport.exchange(form, self._headers,
+                timeout=string_to_type(self.timeout))
+        except Exception, error:
+            self._manager.reactor.fire("exchange-error", error)
+            return
         end_time = time.time()
 
         if not response: