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

store the public key for HashiVault signing in the plugin metadata

Browse Source
This commit is contained in:
Ryan Petrello
2019-03-01 00:27:03 -05:00
committed by Jake McDermott
parent 2824616ba6
commit 0768c6ac1d
6 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/credential_plugins/azure_kv.py
View File

@@ -39,7 +39,7 @@ azure_keyvault_inputs = {
}
def azure_keyvault_backend(raw, **kwargs):
def azure_keyvault_backend(**kwargs):
url = kwargs['url']
def auth_callback(server, resource, scope):

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

@@ -47,7 +47,7 @@ conjur_inputs = {
}
def conjur_backend(raw, **kwargs):
def conjur_backend(**kwargs):
url = kwargs['url']
api_key = kwargs['api_key']
account = quote_plus(kwargs['account'])

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

@@ -53,7 +53,12 @@ hashi_kv_inputs['metadata'].extend([{
hashi_kv_inputs['required'].extend(['api_version', 'secret_key'])
hashi_ssh_inputs = copy.deepcopy(base_inputs)
hashi_ssh_inputs['metadata'].extend([{
hashi_ssh_inputs['metadata'] = [{
'id': 'public_key',
'label': _('Unsigned Public Key'),
'type': 'string',
'multiline': True,
}] + hashi_ssh_inputs['metadata'] + [{
'id': 'role',
'label': _('Role Name'),
'type': 'string',
@@ -63,11 +68,11 @@ hashi_ssh_inputs['metadata'].extend([{
'label': _('Valid Principals'),
'type': 'string',
'help_text': _('Valid principals (either usernames or hostnames) that the certificate should be signed for.'),
}])
hashi_ssh_inputs['required'].extend(['role'])
}]
hashi_ssh_inputs['required'].extend(['public_key', 'role'])
def kv_backend(raw, **kwargs):
def kv_backend(**kwargs):
token = kwargs['token']
url = urljoin(kwargs['url'], 'v1')
secret_path = kwargs['secret_path']
@@ -109,7 +114,7 @@ def kv_backend(raw, **kwargs):
return json['data']
def ssh_backend(raw, **kwargs):
def ssh_backend(**kwargs):
token = kwargs['token']
url = urljoin(kwargs['url'], 'v1')
secret_path = kwargs['secret_path']
@@ -118,7 +123,7 @@ def ssh_backend(raw, **kwargs):
sess = requests.Session()
sess.headers['Authorization'] = 'Bearer {}'.format(token)
json = {
'public_key': raw
'public_key': kwargs['public_key']
}
if kwargs.get('valid_principals'):
json['valid_principals'] = kwargs['valid_principals']