External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 08:18:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Don't follow redirects in credential plugins

Browse Source
This commit is contained in:
Graham Mainwaring
2020-07-06 15:26:39 -04:00
parent 8aa11f4848
commit d14aee70a1
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/credential_plugins/aim.py
View File

@@ -95,6 +95,7 @@ def aim_backend(**kwargs):
timeout=30, timeout=30,
cert=cert, cert=cert,
verify=verify, verify=verify,
allow_redirects=False,
) )
res.raise_for_status() res.raise_for_status()
return res.json()['Content'] return res.json()['Content']

4
awx/main/credential_plugins/conjur.py
View File

@@ -63,7 +63,8 @@ def conjur_backend(**kwargs):
auth_kwargs = { auth_kwargs = {
'headers': {'Content-Type': 'text/plain'}, 'headers': {'Content-Type': 'text/plain'},
'data': api_key 'data': api_key,
'allow_redirects': False,
} }
if cacert: if cacert:
auth_kwargs['verify'] = create_temporary_fifo(cacert.encode()) auth_kwargs['verify'] = create_temporary_fifo(cacert.encode())
@@ -78,6 +79,7 @@ def conjur_backend(**kwargs):
lookup_kwargs = { lookup_kwargs = {
'headers': {'Authorization': 'Token token="{}"'.format(token)}, 'headers': {'Authorization': 'Token token="{}"'.format(token)},
'allow_redirects': False,
} }
if cacert: if cacert:
lookup_kwargs['verify'] = create_temporary_fifo(cacert.encode()) lookup_kwargs['verify'] = create_temporary_fifo(cacert.encode())

10
awx/main/credential_plugins/hashivault.py
View File

@@ -97,7 +97,10 @@ def kv_backend(**kwargs):
cacert = kwargs.get('cacert', None) cacert = kwargs.get('cacert', None)
api_version = kwargs['api_version'] api_version = kwargs['api_version']
request_kwargs = {'timeout': 30} request_kwargs = {
'timeout': 30,
'allow_redirects': False,
}
if cacert: if cacert:
request_kwargs['verify'] = create_temporary_fifo(cacert.encode()) request_kwargs['verify'] = create_temporary_fifo(cacert.encode())
@@ -150,7 +153,10 @@ def ssh_backend(**kwargs):
role = kwargs['role'] role = kwargs['role']
cacert = kwargs.get('cacert', None) cacert = kwargs.get('cacert', None)
request_kwargs = {'timeout': 30} request_kwargs = {
'timeout': 30,
'allow_redirects': False,
}
if cacert: if cacert:
request_kwargs['verify'] = create_temporary_fifo(cacert.encode()) request_kwargs['verify'] = create_temporary_fifo(cacert.encode())