opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/release_20.05' into dev

Browse Source
This commit is contained in:
Dannon Baker
2020-05-06 16:34:41 -04:00
parent a5c187c390 887e00807b
commit 398860af86
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/authnz/custos_authnz.py
+3 -3
View File
@@ -197,7 +197,7 @@ class CustosAuthnz(IdentityProvider):
token_endpoint,
client_secret=client_secret,
authorization_response=trans.request.url,
headers={"Authorization": "Basic %s" % base64.b64encode(clientIdAndSec)}, # for custos
headers={"Authorization": "Basic %s" % util.unicodify(base64.b64encode(util.smart_str(clientIdAndSec)))}, # for custos
verify=self._get_verify_param())
def _get_userinfo(self, oauth2_session):
@@ -230,7 +230,7 @@ class CustosAuthnz(IdentityProvider):
# Set custos endpoints
clientIdAndSec = self.config['client_id'] + ":" + self.config['client_secret']
eps = requests.get(self.config['url'],
headers={"Authorization": "Basic %s" % base64.b64encode(clientIdAndSec)},
headers={"Authorization": "Basic %s" % util.unicodify(base64.b64encode(util.smart_str(clientIdAndSec)))},
verify=False, params={'client_id': self.config['client_id']})
endpoints = eps.json()
self.config['authorization_endpoint'] = endpoints['authorization_endpoint']
@@ -241,7 +241,7 @@ class CustosAuthnz(IdentityProvider):
def _get_custos_credentials(self):
clientIdAndSec = self.config['client_id'] + ":" + self.config['client_secret']
creds = requests.get(self.config['credential_url'],
headers={"Authorization": "Basic %s" % base64.b64encode(util.smart_str(clientIdAndSec))},
headers={"Authorization": "Basic %s" % util.unicodify(base64.b64encode(util.smart_str(clientIdAndSec)))},
verify=False, params={'client_id': self.config['client_id']})
credentials = creds.json()
self.config['iam_client_secret'] = credentials['iam_client_secret']