From 66c7d5e9be137c0e9694fa33f5f5218c7f5a0995 Mon Sep 17 00:00:00 2001 From: Joe Garcia Date: Wed, 26 Oct 2022 10:25:19 -0400 Subject: [PATCH] Fixes #13119 #13120 Cloud support & update brand --- awx/main/credential_plugins/conjur.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/awx/main/credential_plugins/conjur.py b/awx/main/credential_plugins/conjur.py index 5ae6be27f3..029d6d249b 100644 --- a/awx/main/credential_plugins/conjur.py +++ b/awx/main/credential_plugins/conjur.py @@ -61,7 +61,7 @@ def conjur_backend(**kwargs): cacert = kwargs.get('cacert', None) auth_kwargs = { - 'headers': {'Content-Type': 'text/plain'}, + 'headers': {'Content-Type': 'text/plain', 'Accept-Encoding': 'base64'}, 'data': api_key, 'allow_redirects': False, } @@ -69,9 +69,9 @@ def conjur_backend(**kwargs): with CertFiles(cacert) as cert: # https://www.conjur.org/api.html#authentication-authenticate-post auth_kwargs['verify'] = cert - resp = requests.post(urljoin(url, '/'.join(['authn', account, username, 'authenticate'])), **auth_kwargs) + resp = requests.post(urljoin(url, '/'.join(['api', 'authn', account, username, 'authenticate'])), **auth_kwargs) raise_for_status(resp) - token = base64.b64encode(resp.content).decode('utf-8') + token = resp.content.decode('utf-8') lookup_kwargs = { 'headers': {'Authorization': 'Token token="{}"'.format(token)}, @@ -79,7 +79,7 @@ def conjur_backend(**kwargs): } # https://www.conjur.org/api.html#secrets-retrieve-a-secret-get - path = urljoin(url, '/'.join(['secrets', account, 'variable', secret_path])) + path = urljoin(url, '/'.join(['api', 'secrets', account, 'variable', secret_path])) if version: path = '?'.join([path, version]) @@ -90,4 +90,4 @@ def conjur_backend(**kwargs): return resp.text -conjur_plugin = CredentialPlugin('CyberArk Conjur Secret Lookup', inputs=conjur_inputs, backend=conjur_backend) +conjur_plugin = CredentialPlugin('CyberArk Conjur Secrets Manager Lookup', inputs=conjur_inputs, backend=conjur_backend)