Merge pull request #92 from atlassian-labs/fix-validators

fix: account for validators API changes

Author: jwong101

Pipfile

@@ -5,16 +5,16 @@ verify_ssl = true
 
 [dev-packages]
 pytest-cov = "*"
-flake8 = "*"
 pytest = "*"
+flake8 = "*"
 
 [packages]
 requests = "2.31"
 fire = "0.5.0"
 jsonobject = "2.1"
 jinja2 = "3.1.6"
 markdown2 = "2.4.9"
-validators = "0.21.0"
+validators = "0.21.1"
 pyjwt = "2.7.0"
 sslyze = "5.1.3"
 python-json-logger = "2.0.7"

Pipfile.lock

@@ -17,7 +17,7 @@ def teardown_module(module):
 def test_session_timeout():
     session = create_csrt_session(timeout=5)
 
-    with pytest.raises(requests.exceptions.ReadTimeout) as wrapped_e:
+    with pytest.raises((requests.exceptions.ReadTimeout, requests.exceptions.ConnectionError)) as wrapped_e:
         session.get('https://httpstat.us/200?sleep=50000')
 
-    assert wrapped_e.type == requests.exceptions.ReadTimeout
+    assert wrapped_e.type in (requests.exceptions.ReadTimeout, requests.exceptions.ConnectionError)

tests/test_csrt_session.py

@@ -46,7 +46,7 @@ def test_hsts_timeout():
     base_url = 'https://httpstat.us/200?sleep=50000'
     scanner = HstsScan(base_url, 5)
 
-    with pytest.raises(requests.exceptions.ReadTimeout) as wrapped_e:
+    with pytest.raises((requests.exceptions.ReadTimeout, requests.exceptions.ConnectionError)) as wrapped_e:
         scanner.scan()
 
-    assert wrapped_e.type == requests.exceptions.ReadTimeout
+    assert wrapped_e.type in (requests.exceptions.ReadTimeout, requests.exceptions.ConnectionError)

tests/test_hsts_scan.py

@@ -28,7 +28,7 @@ def _get_and_request_descriptor(self) -> Optional[dict]:
         return descriptor
 
     def _validate_base_url(self) -> bool:
-        res = validators.url(self.descriptor['baseUrl'], public=True)
+        res = validators.url(self.descriptor['baseUrl'], rfc_1034=True)
         if not res:
             logging.error(f"{self.descriptor['baseUrl']} was not a valid URL.")
         return bool(res)

utils/app_validator.py

@@ -12,10 +12,9 @@
 # a timeout on all requests
 class TimeoutHTTPAdapter(HTTPAdapter):
     def __init__(self, *args, **kwargs):
-        if "timeout" in kwargs:
-            self.timeout = kwargs["timeout"]
-            del kwargs["timeout"]
+        timeout = kwargs.get("timeout", 30)
         super().__init__(*args, **kwargs)
+        self.timeout = timeout
 
     def send(self, request, **kwargs):
         timeout = kwargs.get("timeout")