Unverified Commit 2e912729 authored by davelopez's avatar davelopez
Browse files

Fix error for anonymous user listing jobs

parent b208eacf

lib/galaxy/managers/jobs.py

+11 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ from galaxy.job_metrics import ( 
    Safety,

)

from galaxy.managers.collections import DatasetCollectionManager

from galaxy.managers.context import ProvidesUserContext

from galaxy.managers.datasets import DatasetManager

from galaxy.managers.hdas import HDAManager

from galaxy.managers.lddas import LDDAManager
@@ -105,7 +106,9 @@ class JobManager: 
        self.app = app

        self.dataset_manager = DatasetManager(app)



    def index_query(self, trans, payload: JobIndexQueryPayload) -> sqlalchemy.engine.Result:

    def index_query(

        self, trans: ProvidesUserContext, payload: JobIndexQueryPayload

    ) -> typing.Optional[sqlalchemy.engine.Result]:

        """The caller is responsible for security checks on the resulting job if

        history_id, invocation_id, or implicit_collection_jobs_id is set.

        Otherwise this will only return the user's jobs or all jobs if the requesting
@@ -121,6 +124,13 @@ class JobManager: 
        search = payload.search

        order_by = payload.order_by



        if trans.user is None:

            # If the user is anonymous we can only return jobs for the current session history

            if trans.galaxy_session and trans.galaxy_session.current_history_id:

                history_id = trans.galaxy_session.current_history_id

            else:

                return None



        def build_and_apply_filters(stmt, objects, filter_func):

            if objects is not None:

                if isinstance(objects, (str, date, datetime)):

lib/galaxy/webapps/galaxy/services/jobs.py

+3 −1
Original line number Diff line number Diff line
@@ -81,7 +81,9 @@ class JobsService(ServiceBase): 
            or payload.history_id is not None

        )

        jobs = self.job_manager.index_query(trans, payload)

        out = []

        out: List[Dict[str, Any]] = []

        if jobs is None:

            return out

        for job in jobs.yield_per(model.YIELD_PER_ROWS):

            # TODO: optimize if this crucial

            if check_security_of_jobs and not security_check(trans, job.history, check_accessible=True):