libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthonys...@apache.org
Subject [03/33] libcloud git commit: remove httplib wrapper and start on requests
Date Tue, 05 Apr 2016 11:16:54 GMT
remove httplib wrapper and start on requests


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/b2f5b226
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/b2f5b226
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/b2f5b226

Branch: refs/heads/requests
Commit: b2f5b22622c6fde7c3085afd2e339bdb2eb69f81
Parents: 649c70e
Author: anthony-shaw <anthony.p.shaw@gmail.com>
Authored: Sat Mar 26 21:00:50 2016 +1100
Committer: anthony-shaw <anthony.p.shaw@gmail.com>
Committed: Sat Mar 26 21:00:50 2016 +1100

----------------------------------------------------------------------
 libcloud/httplib_ssl.py | 78 ++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/b2f5b226/libcloud/httplib_ssl.py
----------------------------------------------------------------------
diff --git a/libcloud/httplib_ssl.py b/libcloud/httplib_ssl.py
index b3e3101..2cf00fb 100644
--- a/libcloud/httplib_ssl.py
+++ b/libcloud/httplib_ssl.py
@@ -17,19 +17,17 @@ Subclass for httplib.HTTPSConnection with optional certificate name
 verification, depending on libcloud.security settings.
 """
 import os
-import sys
 import socket
-import ssl
 import base64
 import warnings
 
+import requests
+
 import libcloud.security
 from libcloud.utils.py3 import b
 from libcloud.utils.py3 import httplib
 from libcloud.utils.py3 import urlparse
 from libcloud.utils.py3 import urlunquote
-from libcloud.utils.py3 import match_hostname
-from libcloud.utils.py3 import CertificateError
 
 
 __all__ = [
@@ -195,7 +193,7 @@ class LibcloudBaseConnection(object):
         self.port = port
 
 
-class LibcloudHTTPConnection(httplib.HTTPConnection, LibcloudBaseConnection):
+class LibcloudHTTPConnection(LibcloudBaseConnection):
     def __init__(self, *args, **kwargs):
         # Support for HTTP proxy
         proxy_url_env = os.environ.get(HTTP_PROXY_ENV_VARIABLE_NAME, None)
@@ -206,8 +204,21 @@ class LibcloudHTTPConnection(httplib.HTTPConnection, LibcloudBaseConnection):
         if proxy_url:
             self.set_http_proxy(proxy_url=proxy_url)
 
+        def connect():
+            pass
+
+        def request(method, url, body=None, headers=None):
+            method = method.lower()
+            if method == 'get':
+                response = requests.get(url, headers=headers)
+            elif method == 'post':
+                response = requests.post(url, data=body, headers=headers)
+            elif method == 'head':
+                response = requests.head(url, headers=headers)
+            return response
+
 
-class LibcloudHTTPSConnection(httplib.HTTPSConnection, LibcloudBaseConnection):
+class LibcloudHTTPSConnection(LibcloudBaseConnection):
     """
     LibcloudHTTPSConnection
 
@@ -268,50 +279,17 @@ class LibcloudHTTPSConnection(httplib.HTTPSConnection, LibcloudBaseConnection):
                 libcloud.security.CA_CERTS_UNAVAILABLE_ERROR_MSG)
 
     def connect(self):
-        """
-        Connect
-
-        Checks if verification is toggled; if not, just call
-        httplib.HTTPSConnection's connect
-        """
-        if not self.verify:
-            return httplib.HTTPSConnection.connect(self)
-
-        # otherwise, create a connection and verify the hostname
-        # use socket.create_connection (in 2.6+) if possible
-        if getattr(socket, 'create_connection', None):
-            sock = socket.create_connection((self.host, self.port),
-                                            self.timeout)
-        else:
-            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            sock.connect((self.host, self.port))
-
-        # Activate the HTTP proxy
-        if self.http_proxy_used:
-            self._activate_http_proxy(sock=sock)
-
-        ssl_version = libcloud.security.SSL_VERSION
-
-        try:
-            self.sock = ssl.wrap_socket(
-                sock,
-                self.key_file,
-                self.cert_file,
-                cert_reqs=ssl.CERT_REQUIRED,
-                ca_certs=self.ca_cert,
-                ssl_version=ssl_version)
-        except socket.error:
-            exc = sys.exc_info()[1]
-            # Re-throw an exception with a more friendly error message
-            exc = get_socket_error_exception(ssl_version=ssl_version, exc=exc)
-            raise exc
-
-        cert = self.sock.getpeercert()
-        try:
-            match_hostname(cert, self.host)
-        except CertificateError:
-            e = sys.exc_info()[1]
-            raise ssl.SSLError('Failed to verify hostname: %s' % (str(e)))
+        pass
+
+    def request(method, url, body=None, headers=None):
+            method = method.lower()
+            if method == 'get':
+                response = requests.get(url, headers=headers)
+            elif method == 'post':
+                response = requests.post(url, data=body, headers=headers)
+            elif method == 'head':
+                response = requests.head(url, headers=headers)
+            return response
 
 
 def get_socket_error_exception(ssl_version, exc):


Mime
View raw message