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

Merge pull request #7200 from ryanpetrello/conjur-quote-plus

Browse Source 
properly quote conjur URLs that contain spaces

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-06-02 01:23:06 +00:00
committed by GitHub
parent 0abfa428c4 cfe8a1722c
commit 644ecdb1fb
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/conjur.py
View File

@@ -1,7 +1,7 @@
from .plugin import CredentialPlugin, CertFiles from .plugin import CredentialPlugin, CertFiles
import base64 import base64
from urllib.parse import urljoin, quote_plus from urllib.parse import urljoin, quote
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
import requests import requests
@@ -50,9 +50,9 @@ conjur_inputs = {
def conjur_backend(**kwargs): def conjur_backend(**kwargs):
url = kwargs['url'] url = kwargs['url']
api_key = kwargs['api_key'] api_key = kwargs['api_key']
account = quote_plus(kwargs['account']) account = quote(kwargs['account'])
username = quote_plus(kwargs['username']) username = quote(kwargs['username'])
secret_path = quote_plus(kwargs['secret_path']) secret_path = quote(kwargs['secret_path'])
version = kwargs.get('secret_version') version = kwargs.get('secret_version')
cacert = kwargs.get('cacert', None) cacert = kwargs.get('cacert', None)