saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #23329 from cro/cloud_verify_cert

Browse source 
Require requests to verify cert when talking to aliyun and proxmox cloud providers
This commit is contained in:
Nicole Thomas 2015-05-04 10:18:17 -06:00
commit 5487367baa
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/cloud/clouds/aliyun.py
View file

@ -718,7 +718,7 @@ def query(params=None):
signature = _compute_signature(parameters, access_key_secret)
parameters['Signature'] = signature
request = requests.get(path, params=parameters, verify=False)
request = requests.get(path, params=parameters, verify=True)
if request.status_code != 200:
raise SaltCloudSystemExit(
'An error occurred while querying aliyun ECS. HTTP Code: {0} '

10
salt/cloud/clouds/proxmox.py
View file

@ -108,7 +108,7 @@ def _authenticate():
full_url = 'https://{0}:8006/api2/json/access/ticket'.format(url)
returned_data = requests.post(
full_url, verify=False, data=connect_data).json()
full_url, verify=True, data=connect_data).json()
ticket = {'PVEAuthCookie': returned_data['data']['ticket']}
csrf = str(returned_data['data']['CSRFPreventionToken'])
@ -132,24 +132,24 @@ def query(conn_type, option, post_data=None):
if conn_type == 'post':
httpheaders['CSRFPreventionToken'] = csrf
response = requests.post(full_url, verify=False,
response = requests.post(full_url, verify=True,
data=post_data,
cookies=ticket,
headers=httpheaders)
elif conn_type == 'put':
httpheaders['CSRFPreventionToken'] = csrf
response = requests.put(full_url, verify=False,
response = requests.put(full_url, verify=True,
data=post_data,
cookies=ticket,
headers=httpheaders)
elif conn_type == 'delete':
httpheaders['CSRFPreventionToken'] = csrf
response = requests.delete(full_url, verify=False,
response = requests.delete(full_url, verify=True,
data=post_data,
cookies=ticket,
headers=httpheaders)
elif conn_type == 'get':
response = requests.get(full_url, verify=False,
response = requests.get(full_url, verify=True,
cookies=ticket)
response.raise_for_status()