sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set verify=False if verify_fingerprint is given

Browse source
This commit is contained in:
Markus Unterwaditzer 2015-01-10 23:30:35 +01:00
parent 11bd19febf
commit cda763fcc5
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/utils/test_main.py
View file

@ -220,10 +220,10 @@ def test_request_ssl(httpsserver):
utils.request('GET', httpsserver.url) utils.request('GET', httpsserver.url)
assert 'certificate verify failed' in str(excinfo.value) 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=False, utils.request('GET', httpsserver.url,
verify_fingerprint=sha1) 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: 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))) verify_fingerprint=''.join(reversed(sha1)))
assert 'Fingerprints did not match' in str(excinfo.value) assert 'Fingerprints did not match' in str(excinfo.value)

1
vdirsyncer/utils/__init__.py
View file

@ -205,6 +205,7 @@ def request(method, url, session=None, latin1_fallback=True,
session = requests.Session() session = requests.Session()
if verify_fingerprint is not None: if verify_fingerprint is not None:
kwargs['verify'] = False
https_prefix = 'https://' https_prefix = 'https://'
if not isinstance(session.adapters[https_prefix], _FingerprintAdapter): if not isinstance(session.adapters[https_prefix], _FingerprintAdapter):