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

Restore new style headers

Browse Source 
This leads to having both the new style header and the old compatability
header. Best of both worlds!
This commit is contained in:
Jesse Keating
2019-09-18 13:27:55 -07:00
parent b3c264bf21
commit e1bdbeaa5c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,6 +102,8 @@ def kv_backend(**kwargs):
request_kwargs['verify'] = create_temporary_fifo(cacert.encode()) request_kwargs['verify'] = create_temporary_fifo(cacert.encode())
sess = requests.Session() sess = requests.Session()
sess.headers['Authorization'] = 'Bearer {}'.format(token)
# Compatability header for older installs of Hashicorp Vault
sess.headers['X-Vault-Token'] = token sess.headers['X-Vault-Token'] = token
if api_version == 'v2': if api_version == 'v2':
@@ -157,6 +159,8 @@ def ssh_backend(**kwargs):
request_kwargs['json']['valid_principals'] = kwargs['valid_principals'] request_kwargs['json']['valid_principals'] = kwargs['valid_principals']
sess = requests.Session() sess = requests.Session()
sess.headers['Authorization'] = 'Bearer {}'.format(token)
# Compatability header for older installs of Hashicorp Vault
sess.headers['X-Vault-Token'] = token sess.headers['X-Vault-Token'] = token
# https://www.vaultproject.io/api/secret/ssh/index.html#sign-ssh-key # https://www.vaultproject.io/api/secret/ssh/index.html#sign-ssh-key
request_url = '/'.join([url, secret_path, 'sign', role]).rstrip('/') request_url = '/'.join([url, secret_path, 'sign', role]).rstrip('/')