added the ablity to pass ssl options to client classes. #446

Author: andymccurdy

redis/client.py

@@ -7,7 +7,8 @@
 import time as mod_time
 from redis._compat import (b, basestring, bytes, imap, iteritems, iterkeys,
                            itervalues, izip, long, nativestr, unicode)
-from redis.connection import ConnectionPool, UnixDomainSocketConnection, Token
+from redis.connection import (ConnectionPool, UnixDomainSocketConnection,
+                              SSLConnection, Token)
 from redis.exceptions import (
     ConnectionError,
     DataError,
@@ -389,7 +390,9 @@ def __init__(self, host='localhost', port=6379,
                  db=0, password=None, socket_timeout=None,
                  connection_pool=None, charset='utf-8',
                  errors='strict', decode_responses=False,
-                 unix_socket_path=None):
+                 unix_socket_path=None,
+                 ssl=False, ssl_keyfile=None, ssl_certfile=None,
+                 ssl_cert_reqs=None, ssl_ca_certs=None):
         if not connection_pool:
             kwargs = {
                 'db': db,
@@ -410,6 +413,15 @@ def __init__(self, host='localhost', port=6379,
                     'host': host,
                     'port': port
                 })
+
+                if ssl:
+                    kwargs.update({
+                        'connection_class': SSLConnection,
+                        'keyfile': ssl_keyfile,
+                        'certfile': ssl_certfile,
+                        'cert_reqs': ssl_cert_reqs,
+                        'ca_certs': ssl_ca_certs,
+                    })
             connection_pool = ConnectionPool(**kwargs)
         self.connection_pool = connection_pool
 

redis/connection.py

@@ -11,10 +11,8 @@
 try:
     import ssl
     ssl_available = True
-    ssl_cert_reqs = ssl.CERT_NONE
 except ImportError:
     ssl_available = False
-    ssl_cert_reqs = 0
 
 from redis._compat import (b, xrange, imap, byte_to_chr, unicode, bytes, long,
                            BytesIO, nativestr, basestring, iteritems,
@@ -561,13 +559,17 @@ def pack_command(self, *args):
 class SSLConnection(Connection):
     description_format = "SSLConnection<host=%(host)s,port=%(port)s,db=%(db)s>"
 
-    def __init__(self, keyfile=None, certfile=None, cert_reqs=ssl_cert_reqs,
+    def __init__(self, keyfile=None, certfile=None, cert_reqs=None,
                  ca_certs=None, **kwargs):
         if not ssl_available:
-            raise RedisError("")
+            raise RedisError("Python wasn't built with SSL support")
+
         super(SSLConnection, self).__init__(**kwargs)
+
         self.keyfile = keyfile
         self.certfile = certfile
+        if cert_reqs is None:
+            cert_reqs = ssl.CERT_NONE
         self.cert_reqs = cert_reqs
         self.ca_certs = ca_certs