External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-29 06:45:09 -02:30
Code Issues Packages Projects Releases Wiki Activity

related #4274 - added option to verify server certificate with a specific CA (fixed errors)

Browse Source
This commit is contained in:
olia-dev
2019-07-09 14:14:29 +02:00
parent 7a5efa1adc
commit 2ee03b552d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ 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}
if cacert: if cacert:
request_kwargs['verify'] = create_temporary_fifo(cacert.encode()) request_kwargs['verify'] = create_temporary_fifo(cacert.encode())
@@ -115,7 +115,7 @@ def kv_backend(**kwargs):
if api_version == 'v2': if api_version == 'v2':
if kwargs.get('secret_version'): if kwargs.get('secret_version'):
request_kwargs['params'] = { 'version': kwargs['secret_version'] } request_kwargs['params'] = {'version': kwargs['secret_version']}
try: try:
mount_point, *path = pathlib.Path(secret_path.lstrip(os.sep)).parts mount_point, *path = pathlib.Path(secret_path.lstrip(os.sep)).parts
'/'.join(path) '/'.join(path)
@@ -151,11 +151,11 @@ 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}
if cacert: if cacert:
request_kwargs['verify'] = create_temporary_fifo(cacert.encode()) request_kwargs['verify'] = create_temporary_fifo(cacert.encode())
request_kwargs['json'] = { 'public_key': kwargs['public_key'] } request_kwargs['json'] = {'public_key': kwargs['public_key']}
if kwargs.get('valid_principals'): if kwargs.get('valid_principals'):
request_kwargs['json']['valid_principals'] = kwargs['valid_principals'] request_kwargs['json']['valid_principals'] = kwargs['valid_principals']