handle older versions of urllib3

jlwalke2 · jlwalke2 · commit c1ede5944c8f · 2019-12-05T10:33:28.000-05:00
diff --git a/src/sasctl/core.py b/src/sasctl/core.py
@@ -240,8 +240,14 @@ def __init__(self, hostname,
         if 'REQUESTS_CA_BUNDLE' not in os.environ:
             if verify_ssl:
                 # Skip hostname verification if IP address specified instead
-                # of DNS name.  Prevents error from urllib3
-                from urllib3.util.ssl_ import is_ipaddress
+                # of DNS name.  Prevents error from urllib3.
+                try:
+                    from urllib3.util.ssl_ import is_ipaddress
+                except ImportError:
+                    # is_ipaddres not present in older versions of urllib3
+                    def is_ipaddress(hst):
+                        return re.match(r"^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$", hst)
+
                 verify_hostname = not is_ipaddress(hostname)
                 adapter = SSLContextAdapter(assert_hostname=verify_hostname)
 
diff --git a/tests/unit/test_session.py b/tests/unit/test_session.py
@@ -279,7 +279,7 @@ def test_ssl_context():
     del os.environ['REQUESTS_CA_BUNDLE']
 
 
-def test_verify_ssl():
+def test_verify_ssl(missing_packages):
     with mock.patch('sasctl.core.Session.get_token', return_value='token'):
         # Should verify SSL by default
         s = Session('hostname', 'username', 'password')
@@ -310,6 +310,12 @@ def test_verify_ssl():
         s = Session('hostname', 'username', 'password', verify_ssl=True)
         assert s.verify == True
 
+        with missing_packages('urllib3.util.ssl_'):
+            # IP Address validation should work even if urllib3 import fails
+            s = Session('127.0.0.1', 'username', 'password', verify_ssl=True)
+            assert s.verify == True
+
+
 
 def test_kerberos():
     with mock.patch('sasctl.core.Session._get_token_with_kerberos',
@@ -323,6 +329,7 @@ def test_kerberos():
         s = Session('hostname', 'username@REALM')
         assert s.auth.token == 'token'
 
+
 def test_authentication_failure():
     from sasctl.exceptions import AuthenticationError
 
