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

fix merges, disable user registration

parent 58964c39

client/src/components/Login/LoginForm.vue

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ function returnToLogin() { 
                                <span v-if="!connectExternalProvider">

                                    Don't have an account?

                                    <GLink

                                        v-if="allowUserCreation || disableLocalAccounts"

                                        v-if="allowUserCreation"

                                        id="register-toggle"

                                        to="/register/start">

                                        Register here.

client/src/components/Upload/DefaultBoxORNL.vue

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ import { createDatasetCollection } from "components/History/model/queries"; 


import { UploadQueue } from "@/utils/upload-queue.js";



import { defaultModel } from "./model.js";

import { defaultModel } from "./model.ts";

import { COLLECTION_TYPES, DEFAULT_FILE_NAME, hasBrowserSupport } from "./utils";



import DefaultRow from "./DefaultRow.vue";

lib/galaxy/authnz/psa_authnz.py

+4 −4
Original line number Diff line number Diff line
@@ -201,19 +201,19 @@ class PSAAuthnz(IdentityProvider): 
        if not user_authnz_token or not user_authnz_token.extra_data:

            return False

        # refresh tokens if they reached their half lifetime

        skip_old_tokens_threshold_seconds = skip_old_tokens_threshold_days * 86400  # 86400 seconds in a day

        expires = self._try_to_locate_refresh_token_expiration(user_authnz_token.extra_data)

        if not expires:

        if not expires and skip_old_tokens_threshold_seconds==0:

            log.debug("No `expires` or `expires_in` key found in token extra data, cannot refresh")

            return False



        # do not refresh tokens if last token is too old

        skip_old_tokens_threshold_seconds = skip_old_tokens_threshold_days * 86400  # 86400 seconds in a day

        if int(user_authnz_token.extra_data["auth_time"]) + skip_old_tokens_threshold_seconds < int(time.time()):

            raise Exception("Expired Tokens. User needs to sign in.")



        if (

            int(user_authnz_token.extra_data["auth_time"]) + int(expires) / 2

            <= int(time.time())

            < int(user_authnz_token.extra_data["auth_time"]) + int(expires)

        ):

            on_the_fly_config(sa_session)

            if self.config["provider"] == "azure":
@@ -634,7 +634,7 @@ def decode_access_token(social: UserAuthnzToken, backend: OpenIdConnectAuth, **k 
        return {"access_token": None}

    try:

        access_token_data = _decode_access_token_helper(token_str=access_token_encoded, backend=backend)

    except InvalidTokenError as e:

    except (InvalidTokenError, AttributeError) as e:

        log.warning(f"Access token couldn't be decoded: {e}")

        return {"access_token": None}

    return {"access_token": access_token_data}

lib/galaxy/jobs/runners/pulsar.py

+1 −3
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ from galaxy.jobs.runners import ( 
    JobState,

)

from galaxy.model.base import check_database_connection

from galaxy.model.base import transaction

from galaxy.tool_util.deps import dependencies

from galaxy.util import (

    galaxy_directory,
@@ -347,7 +346,6 @@ class PulsarJobRunner(AsynchronousJobRunner): 
                job.job_messages.append(status_details)

        flag_modified(job, "job_messages")

        job_wrapper.sa_session.add(job)

        with transaction(self.sa_session):

        self.sa_session.commit()



    def _update_job_state_for_status(

lib/galaxy/objectstore/rucio.py

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ class RucioBroker: 
        self.register_with_checksum = rucio_config.get("register_with_checksum", True)

        self.download_schemes = rucio_config["download_schemes"]

        self.rucio_config_path: Optional[str] = None

        self.extra_dirs = rucio_config.extra_dirs

        self.extra_dirs = {e["type"]: e["path"] for e in rucio_config["extra_dirs"]}



        if Client is None:

            raise Exception(NO_RUCIO_ERROR_MESSAGE)
@@ -283,7 +283,7 @@ username = {self.config['username']} 
        try:

            repl = next(self.get_rucio_client().list_replicas(dids))

            return "AVAILABLE" in repl["states"].values()

        except Exception:

        except Exception as e:

            return False



    def get_size(self, key) -> int: