Unverified Commit a96cec9c authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #14291 from mvdbeek/fix_display_app_500 

[22.05] Check for app_name and link_name before unquoting
parents fd2dbf51 ac3625eb

lib/galaxy/webapps/galaxy/controllers/dataset.py

+4 −4
Original line number Diff line number Diff line
@@ -702,6 +702,10 @@ class DatasetInterface(BaseUIController, UsesAnnotations, UsesItemRatings, UsesE 
        **kwds,

    ):

        """Access to external display applications"""

        if None in [app_name, link_name]:

            return trans.show_error_message("A display application name and link name must be provided.")

        app_name = unquote_plus(app_name)

        link_name = unquote_plus(link_name)

        # Build list of parameters to pass in to display application logic (app_kwds)

        app_kwds = {}

        for name, value in dict(kwds).items():  # clone kwds because we remove stuff as we go.
@@ -723,10 +727,6 @@ class DatasetInterface(BaseUIController, UsesAnnotations, UsesItemRatings, UsesE 
        else:

            user_roles = []

        # Decode application name and link name

        app_name = unquote_plus(app_name)

        link_name = unquote_plus(link_name)

        if None in [app_name, link_name]:

            return trans.show_error_message("A display application name and link name must be provided.")

        if self._can_access_dataset(trans, data, additional_roles=user_roles):

            msg = []

            preparable_steps = []