Commit 97752a38 authored by Duggan, John's avatar Duggan, John
Browse files

Merge branch 'dev' into 'main' 

Merge 'dev' into 'main'

See merge request !132
parents c4af349d e9033bd8

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ variables: 
  CONTAINER_GALAXY_URL: "${NDIP_DOCKER_REPOSITORY}/${CI_PROJECT_PATH}"

  CONTAINER_GALAXY_BASE_URL: "${CONTAINER_GALAXY_URL}/base"

  CONTAINER_GALAXY_COMMIT_URL: "${CONTAINER_GALAXY_URL}/commit"

  GALAXY_VERSION_PYTHON: 24.2.dev7+ornl

  GALAXY_VERSION_DOCKER: 24.2.dev7.ornl

  GALAXY_VERSION_PYTHON: 24.2.dev8+ornl

  GALAXY_VERSION_DOCKER: 24.2.dev8.ornl



# This import is for the func_rse_docker_* functions

before_script:

lib/galaxy/authnz/managers.py

+2 −0
Original line number Diff line number Diff line
@@ -333,6 +333,8 @@ class AuthnzManager: 
            success, message, backend = self._get_authnz_backend(provider, idphint=idphint)

            if success is False:

                return False, message, None

            if trans.user:

                trans.handle_user_logout(logout_all=True)

            elif provider in KEYCLOAK_BACKENDS:

                if self.allowed_idps and (idphint not in self.allowed_idps):

                    msg = f"An error occurred when authenticating a user. Invalid EntityID: `{idphint}`"