Merge pull request #9994 from dannon/release_20.05

[20.05] Merge 20.01 forward (minor conflict resolved)

lib/galaxy/authnz/custos_authnz.py

@@ -17,8 +17,8 @@ from galaxy.model import CustosAuthnzToken, User
 from ..authnz import IdentityProvider
 
 log = logging.getLogger(__name__)
-STATE_COOKIE_NAME = 'custos-state'
-NONCE_COOKIE_NAME = 'custos-nonce'
+STATE_COOKIE_NAME = 'galaxy-oidc-state'
+NONCE_COOKIE_NAME = 'galaxy-oidc-nonce'
 KEYCLOAK_BACKENDS = {'custos', 'cilogon', 'keycloak'}
 
 

lib/galaxy/authnz/managers.py

@@ -292,7 +292,7 @@ class AuthnzManager(object):
             raise exceptions.AuthenticationFailed(e.message)
         except Exception as e:
             msg = 'The following error occurred when handling callback from `{}` identity provider: ' \
-                  '{}'.format(provider, e.message)
+                  '{}'.format(provider, str(e))
             log.exception(msg)
             return False, msg, (None, None)
 
@@ -321,7 +321,7 @@ class AuthnzManager(object):
             return True, message, backend.logout(trans, post_logout_redirect_url)
         except Exception as e:
             msg = 'The following error occurred when logging out from `{}` identity provider: ' \
-                  '{}'.format(provider, e.message)
+                  '{}'.format(provider, str(e))
             log.exception(msg)
             return False, msg, None