From 6d557fa3a80d5e79b4324c1302090d4bec819971 Mon Sep 17 00:00:00 2001 From: Ryan Kagin Date: Tue, 3 Dec 2024 12:16:07 -0500 Subject: [PATCH 1/3] Adding cert-based proxy authentication to proxy configuration options --- censys/common/base.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/censys/common/base.py b/censys/common/base.py index e3866c23..608cb759 100644 --- a/censys/common/base.py +++ b/censys/common/base.py @@ -100,6 +100,10 @@ def __init__( if cookies: self._session.cookies.update(cookies) self.request_id = kwargs.get("request_id") + if kwargs.get('verify'): + self._session.verify = kwargs.get('verify') + if kwargs.get('cert'): + self._session.cert = kwargs.get('cert') self._session.headers.update( { "accept": "application/json, */8", From bc116dbf5b84966acc5ad67fef264bc7f6a8ec9a Mon Sep 17 00:00:00 2001 From: Ryan Kagin Date: Tue, 3 Dec 2024 20:41:11 -0500 Subject: [PATCH 2/3] Black format base.py, add test case for proxy parameters --- censys/common/base.py | 8 ++++---- tests/test_base.py | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/censys/common/base.py b/censys/common/base.py index 608cb759..5abfa64c 100644 --- a/censys/common/base.py +++ b/censys/common/base.py @@ -100,10 +100,10 @@ def __init__( if cookies: self._session.cookies.update(cookies) self.request_id = kwargs.get("request_id") - if kwargs.get('verify'): - self._session.verify = kwargs.get('verify') - if kwargs.get('cert'): - self._session.cert = kwargs.get('cert') + if kwargs.get("verify"): + self._session.verify = kwargs.get("verify") + if kwargs.get("cert"): + self._session.cert = kwargs.get("cert") self._session.headers.update( { "accept": "application/json, */8", diff --git a/tests/test_base.py b/tests/test_base.py index 8df60f40..b2738299 100644 --- a/tests/test_base.py +++ b/tests/test_base.py @@ -121,3 +121,13 @@ def test_cookies(self): base = CensysAPIBase(TEST_URL, cookies={"_ga": "GA"}) # Assertions assert list(base._session.cookies.keys()) == ["_ga"] + + def test_verify_and_cert(self): + # Mock/actual call + base = CensysAPIBase( + TEST_URL, + cert=("/path/to/clientcert", "/path/to/clientkey"), + verify="/path/to/cacert" + ) + assert base._session.cert == ("/path/to/clientcert", "/path/to/clientkey") + assert base._session.verify == "/path/to/cacert" From 0c390c36fd4ee4881c90c3b1c0750114e7dfafda Mon Sep 17 00:00:00 2001 From: Ryan Kagin Date: Tue, 3 Dec 2024 21:06:13 -0500 Subject: [PATCH 3/3] Black format test_base.py (oops, forgot) --- tests/test_base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_base.py b/tests/test_base.py index b2738299..4fbce94e 100644 --- a/tests/test_base.py +++ b/tests/test_base.py @@ -125,9 +125,9 @@ def test_cookies(self): def test_verify_and_cert(self): # Mock/actual call base = CensysAPIBase( - TEST_URL, - cert=("/path/to/clientcert", "/path/to/clientkey"), - verify="/path/to/cacert" + TEST_URL, + cert=("/path/to/clientcert", "/path/to/clientkey"), + verify="/path/to/cacert", ) assert base._session.cert == ("/path/to/clientcert", "/path/to/clientkey") assert base._session.verify == "/path/to/cacert"