Fix interception for Python's httplib2

Previously, this failed because a) our http.client interception
left the port as a string, which failed some internal validation,
and b) it didn't trust the certificate through any normal
mechanism.

Author: pimterry

overrides/pythonpath/http/client.py

@@ -17,7 +17,7 @@
 _http_connection_init = HTTPConnection.__init__
 @functools.wraps(_http_connection_init)
 def _new_http_connection_init(self, host, port=80, *k, **kw):
-    _http_connection_init(self, _proxyHost, _proxyPort, *k, **kw)
+    _http_connection_init(self, _proxyHost, int(_proxyPort), *k, **kw)
     self.set_tunnel(host, port)
 HTTPConnection.__init__ = _new_http_connection_init
 
@@ -43,6 +43,6 @@ def _new_https_connection_init(self, host, port=443, *k, **kw):
 
     context.load_verify_locations(_certPath)
 
-    _https_connection_init(self, _proxyHost, _proxyPort, *k, **kw)
+    _https_connection_init(self, _proxyHost, int(_proxyPort), *k, **kw)
     self.set_tunnel(host, port)
 HTTPSConnection.__init__ = _new_https_connection_init

overrides/pythonpath/httplib2.py

@@ -0,0 +1,24 @@
+from httptoolkit_intercept import preload_real_module
+
+preload_real_module('httplib2')
+
+import httplib2, os, functools
+
+# Re-export all public fields
+from httplib2 import *
+# Load a few extra notable private fields, for max compatibility
+from httplib2 import __file__, __doc__
+
+_certPath = os.environ['SSL_CERT_FILE']
+
+# Ensure all connections trust our cert:
+_http_init = httplib2.Http.__init__
+@functools.wraps(_http_init)
+def _new_http_init(self, *k, **kw):
+    kList = list(k)
+    if len(kList) > 3:
+        kList[3] = _certPath
+    else:
+        kw['ca_certs'] = _certPath
+    _http_init(self, *kList, **kw)
+httplib2.Http.__init__ = _new_http_init