From cda763fcc5bc4abed6061878a90f7c496fe8c28e Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sat, 10 Jan 2015 23:30:35 +0100 Subject: [PATCH] Set verify=False if verify_fingerprint is given --- tests/utils/test_main.py | 6 +++--- vdirsyncer/utils/__init__.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/utils/test_main.py b/tests/utils/test_main.py index 34f650e..ad3d984 100644 --- a/tests/utils/test_main.py +++ b/tests/utils/test_main.py @@ -220,10 +220,10 @@ def test_request_ssl(httpsserver): utils.request('GET', httpsserver.url) assert 'certificate verify failed' in str(excinfo.value) utils.request('GET', httpsserver.url, verify=False) - utils.request('GET', httpsserver.url, verify=False, + utils.request('GET', httpsserver.url, verify_fingerprint=sha1) - utils.request('GET', httpsserver.url, verify=False, verify_fingerprint=md5) + utils.request('GET', httpsserver.url, verify_fingerprint=md5) with pytest.raises(requests.exceptions.SSLError) as excinfo: - utils.request('GET', httpsserver.url, verify=False, + utils.request('GET', httpsserver.url, verify_fingerprint=''.join(reversed(sha1))) assert 'Fingerprints did not match' in str(excinfo.value) diff --git a/vdirsyncer/utils/__init__.py b/vdirsyncer/utils/__init__.py index 90f5f8d..18c1410 100644 --- a/vdirsyncer/utils/__init__.py +++ b/vdirsyncer/utils/__init__.py @@ -205,6 +205,7 @@ def request(method, url, session=None, latin1_fallback=True, session = requests.Session() if verify_fingerprint is not None: + kwargs['verify'] = False https_prefix = 'https://' if not isinstance(session.adapters[https_prefix], _FingerprintAdapter):