Properly pass the CA to requests
We store the CA in request.cert, but it's not compatible with a cert. To pass the CA to requests, we need to set the verify argument. Change-Id: Id0f39e3253b1486db8ae2da3d7dc6c0fdb41062a
This commit is contained in:
parent
9bedf4d26f
commit
13e90a0ab5
|
@ -63,8 +63,7 @@ class TestHttpTransport(base.TestBase):
|
||||||
params=final_params,
|
params=final_params,
|
||||||
headers=final_headers,
|
headers=final_headers,
|
||||||
data=None,
|
data=None,
|
||||||
verify=True,
|
verify=True)
|
||||||
cert=None)
|
|
||||||
|
|
||||||
@mock.patch.object(prequest.packages.urllib3.response.HTTPResponse,
|
@mock.patch.object(prequest.packages.urllib3.response.HTTPResponse,
|
||||||
'stream')
|
'stream')
|
||||||
|
@ -91,8 +90,7 @@ class TestHttpTransport(base.TestBase):
|
||||||
params=params,
|
params=params,
|
||||||
headers=final_headers,
|
headers=final_headers,
|
||||||
data=None,
|
data=None,
|
||||||
verify=True,
|
verify=True)
|
||||||
cert=None)
|
|
||||||
|
|
||||||
@mock.patch.object(prequest.packages.urllib3.response.HTTPResponse,
|
@mock.patch.object(prequest.packages.urllib3.response.HTTPResponse,
|
||||||
'stream')
|
'stream')
|
||||||
|
|
|
@ -89,13 +89,19 @@ class HttpTransport(base.Transport):
|
||||||
if osprofiler_web:
|
if osprofiler_web:
|
||||||
headers.update(osprofiler_web.get_trace_id_headers())
|
headers.update(osprofiler_web.get_trace_id_headers())
|
||||||
|
|
||||||
|
if request.verify:
|
||||||
|
if request.cert:
|
||||||
|
verify = request.cert
|
||||||
|
else:
|
||||||
|
verify = True
|
||||||
|
else:
|
||||||
|
verify = False
|
||||||
resp = self.client.request(method,
|
resp = self.client.request(method,
|
||||||
url=url,
|
url=url,
|
||||||
params=request.params,
|
params=request.params,
|
||||||
headers=headers,
|
headers=headers,
|
||||||
data=request.content,
|
data=request.content,
|
||||||
verify=request.verify,
|
verify=verify)
|
||||||
cert=request.cert)
|
|
||||||
|
|
||||||
if resp.status_code in self.http_to_zaqar:
|
if resp.status_code in self.http_to_zaqar:
|
||||||
kwargs = {}
|
kwargs = {}
|
||||||
|
|
Loading…
Reference in New Issue