[Python-modules-commits] r18516 - in packages/python-httplib2/trunk/debian (3 files)

[dktrkranz at users.alioth.debian.org]

    Date: Tuesday, September 13, 2011 @ 18:36:08
  Author: dktrkranz
Revision: 18516

* debian/patches/ssl-validation.patch:
  - Cherry-pick patch from upstream hg to fix incorrect checks for
    SSL certificate domain names.

Added:
  packages/python-httplib2/trunk/debian/patches/ssl-validation.patch
Modified:
  packages/python-httplib2/trunk/debian/changelog
  packages/python-httplib2/trunk/debian/patches/series

Modified: packages/python-httplib2/trunk/debian/changelog
===================================================================
--- packages/python-httplib2/trunk/debian/changelog	2011-09-13 02:04:32 UTC (rev 18515)
+++ packages/python-httplib2/trunk/debian/changelog	2011-09-13 18:36:08 UTC (rev 18516)
@@ -1,3 +1,11 @@
+python-httplib2 (0.7.1-2) unstable; urgency=low
+
+  * debian/patches/ssl-validation.patch:
+    - Cherry-pick patch from upstream hg to fix incorrect checks for
+      SSL certificate domain names.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Tue, 13 Sep 2011 20:32:44 +0200
+
 python-httplib2 (0.7.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/python-httplib2/trunk/debian/patches/series
===================================================================
--- packages/python-httplib2/trunk/debian/patches/series	2011-09-13 02:04:32 UTC (rev 18515)
+++ packages/python-httplib2/trunk/debian/patches/series	2011-09-13 18:36:08 UTC (rev 18516)
@@ -1 +1,2 @@
 godaddy-certificate.patch
+ssl-validation.patch

Added: packages/python-httplib2/trunk/debian/patches/ssl-validation.patch
===================================================================
--- packages/python-httplib2/trunk/debian/patches/ssl-validation.patch	                        (rev 0)
+++ packages/python-httplib2/trunk/debian/patches/ssl-validation.patch	2011-09-13 18:36:08 UTC (rev 18516)
@@ -0,0 +1,37 @@
+Description: Cherry-pick SSL certificate fix from upstream hg
+ Fix issue with not matching on first host in cert list.
+ Add unit tests.
+Author: Joe Gregorio <jcgrego... at google.com>
+
+Index: python-httplib2-0.7.1/python2/httplib2/__init__.py
+===================================================================
+--- python-httplib2-0.7.1.orig/python2/httplib2/__init__.py	2011-09-02 21:46:27.571230001 +0300
++++ python-httplib2-0.7.1/python2/httplib2/__init__.py	2011-09-02 21:49:09.701230001 +0300
+@@ -866,7 +866,7 @@
+             host_re = host.replace('.', '\.').replace('*', '[^.]*')
+             if re.search('^%s$' % (host_re,), hostname, re.I):
+                 return True
+-            return False
++        return False
+ 
+     def connect(self):
+         "Connect to a host on a given (SSL) port."
+Index: python-httplib2-0.7.1/python2/httplib2test.py
+===================================================================
+--- python-httplib2-0.7.1.orig/python2/httplib2test.py	2011-09-02 21:46:44.011230001 +0300
++++ python-httplib2-0.7.1/python2/httplib2test.py	2011-09-02 21:49:09.701230001 +0300
+@@ -482,6 +482,14 @@
+             self.assertRaises(httplib2.SSLHandshakeError,
+                     http.request, "https://www.google.com/", "GET")
+ 
++    def testSslCertValidationDoubleDots(self):
++        if sys.version_info >= (2, 6):
++            # Test that we get match a double dot cert
++            try:
++              self.http.request("https://1.www.appspot.com/", "GET")
++            except httplib2.CertificateHostnameMismatch:
++              self.fail('cert with *.*.appspot.com should not raise an exception.')
++
+     def testSslHostnameValidation(self):
+         if sys.version_info >= (2, 6):
+             # The SSL server at google.com:443 returns a certificate for