Commit 14fb067c authored by John Chilton's avatar John Chilton
Browse files

Fix bug and typing in library_datasets.py

parent 32cf97d7

lib/galaxy/webapps/galaxy/api/library_datasets.py

+3 −2
Original line number Diff line number Diff line
@@ -456,8 +456,9 @@ class LibraryDatasetsController(BaseGalaxyAPIController, UsesVisualizationMixin, 
            path = os.path.join(full_dir, path)

            if unsafe_walk(path, allowlist=[full_dir] + trans.app.config.user_library_import_symlink_allowlist, username=username):

                # the path is a dir and contains files that symlink outside the user dir

                error = 'User attempted to import a path that resolves to a path outside of their import dir: %s -> %s', \

                error = 'User attempted to import a path that resolves to a path outside of their import dir: %s -> %s' % (

                    path, os.path.realpath(path)

                )

                if trans.app.config.user_library_import_check_permissions:

                    error += ' or is not readable for them.'

                log.error(error)

setup.cfg

+0 −2
Original line number Diff line number Diff line
@@ -741,8 +741,6 @@ check_untyped_defs = False 
check_untyped_defs = False

[mypy-galaxy.webapps.galaxy.api.plugins]

check_untyped_defs = False

[mypy-galaxy.webapps.galaxy.api.library_datasets]

check_untyped_defs = False

[mypy-galaxy.webapps.galaxy.api.library_contents]

check_untyped_defs = False

[mypy-galaxy.webapps.galaxy.api.jobs]