Commit b4ed0fc8 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

changeuser filter, add debug info

parent dc033a9f

lib/galaxy/authnz/custos_authnz.py

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ class OIDCAuthnzBase(IdentityProvider): 
            "refresh_token": custos_authnz_token.refresh_token,

        }



        log.debug(f"Refreshing user token for {custos_authnz_token.external_user_id} via `{custos_authnz_token.provider}` identity provider")

        token = oauth2_session.refresh_token(token_endpoint, **params)

        processed_token = self._process_token_after_refresh(token)

lib/galaxy/authnz/managers.py

+7 −3
Original line number Diff line number Diff line
@@ -368,9 +368,13 @@ class AuthnzManager: 
            return False



    def refresh_expiring_oidc_tokens(self, sa_session):

        user_filter = datetime.now() - timedelta(days=7)

        all_users = sa_session.scalars(select(model.User).filter(model.User.update_time < user_filter)).all()

            user_filter = datetime.now() - timedelta(days=30)

            all_users = sa_session.scalars(select(model.User)).all()

            for user in all_users:

                if not user.galaxy_sessions or user.current_galaxy_session.update_time < user_filter:

                    log.debug(f"skipping token refresh for user {user.username}")

                    continue



            for auth in user.custos_auth or []:

                self.refresh_expiring_oidc_tokens_for_provider(sa_session, auth)

            for auth in user.social_auth or []:

lib/galaxy/authnz/psa_authnz.py

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ class PSAAuthnz(IdentityProvider): 
            return False

        if int(user_authnz_token.extra_data["auth_time"]) + int(expires) / 2 <= int(time.time()):

            on_the_fly_config(sa_session)

            log.debug(f"Refreshing user token for {user_authnz_token.uid} via `{user_authnz_token.provider}` identity provider")

            if self.config["provider"] == "azure":

                self.refresh_azure(user_authnz_token)

            else: