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

add timeouts to plugin backends

Browse Source
This commit is contained in:
Jake McDermott
2019-03-27 11:03:22 -04:00
parent b90f9ac401
commit 8b35ac89fc
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,13 +94,14 @@ def kv_backend(**kwargs):
# https://www.vaultproject.io/api/secret/kv/kv-v2.html#read-secret-version
response = sess.get(
'/'.join([url, mount_point, 'data'] + path).rstrip('/'),
params=params
params=params,
timeout=30
)
response.raise_for_status()
json = response.json()['data']
else:
# https://www.vaultproject.io/api/secret/kv/kv-v1.html#read-secret
response = sess.get('/'.join([url, secret_path]).rstrip('/'))
response = sess.get('/'.join([url, secret_path]).rstrip('/'), timeout=30)
response.raise_for_status()
json = response.json()
@@ -130,7 +131,8 @@ def ssh_backend(**kwargs):
# https://www.vaultproject.io/api/secret/ssh/index.html#sign-ssh-key
resp = sess.post(
'/'.join([url, secret_path, 'sign', role]).rstrip('/'),
json=json
json=json,
timeout=30
)
resp.raise_for_status()
return resp.json()['data']['signed_key']