Changeset c3a573c

Timestamp:

Feb 13, 2015 10:08:10 AM (10 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

187a8f9

Parents:

36e701e

Message:

Defensive driving around new ssl libraries. Fix error handling in get_url

File:

• fedd/federation/util.py (modified) (3 diffs)

fedd/federation/util.py

@@ -8 +8 @@
 
 import httplib
+import ssl
 
 from optparse import OptionParser
@@ -216 +217 @@
     ok = False
     failed_exception = None
+    # Build a context on modern systems, on old ones fall back to the old
+    # HTTPSConnection definition.
+    context = None
+    try:
+        # This context does not check the self-signed server cert
+        context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
+        context.load_cert_chain(cf)
+    except AttributeError:
+        pass
     while not ok and retries < max_retries:
         try:
-            conn = httplib.HTTPSConnection(po.hostname, port=po.port, 
-                    cert_file=cf, key_file=cf, timeout=30)
+            if context is not None:
+                conn = httplib.HTTPSConnection(po.hostname, port=po.port, 
+                        timeout=30, context=context)
+            else:
+                conn = httplib.HTTPSConnection(po.hostname, port=po.port, 
+                        cert_file=cf, key_file=cf, timeout=30)
             conn.putrequest('GET', po.path)
             conn.endheaders()
@@ -244 +258 @@
             retries += 1
 
-    if retries > max_retries and failed_exception:
+    if retries >= max_retries and failed_exception:
         if log:
             log.debug('Raising %s', failed_exception)
-        raise failed_excpetion
+        raise failed_exception
 
 # Functions to manipulate composite testbed names