mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Move object_wrapper to security package
For context see discussion in #12064
This commit is contained in:
@@ -18,6 +18,7 @@ from sqlalchemy.orm import object_session
|
||||
from sqlalchemy.orm.attributes import flag_modified
|
||||
|
||||
import galaxy.model
|
||||
from galaxy.security.object_wrapper import sanitize_lists_to_string
|
||||
from galaxy.util import (
|
||||
form_builder,
|
||||
listify,
|
||||
@@ -26,7 +27,6 @@ from galaxy.util import (
|
||||
unicodify,
|
||||
)
|
||||
from galaxy.util.json import safe_dumps
|
||||
from galaxy.util.object_wrapper import sanitize_lists_to_string
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ from galaxy import model
|
||||
from galaxy.files import ProvidesUserFileSourcesUserContext
|
||||
from galaxy.job_execution.setup import ensure_configs_directory
|
||||
from galaxy.model.none_like import NoneDataset
|
||||
from galaxy.security.object_wrapper import wrap_with_safe_string
|
||||
from galaxy.tools import global_tool_errors
|
||||
from galaxy.tools.parameters import (
|
||||
visit_input_values,
|
||||
@@ -41,7 +42,6 @@ from galaxy.util import (
|
||||
unicodify,
|
||||
)
|
||||
from galaxy.util.bunch import Bunch
|
||||
from galaxy.util.object_wrapper import wrap_with_safe_string
|
||||
from galaxy.util.template import fill_template
|
||||
from galaxy.work.context import WorkRequestContext
|
||||
|
||||
|
||||
@@ -6,12 +6,12 @@ from functools import total_ordering
|
||||
|
||||
from galaxy import exceptions
|
||||
from galaxy.model.none_like import NoneDataset
|
||||
from galaxy.security.object_wrapper import wrap_with_safe_string
|
||||
from galaxy.tools.parameters.wrapped_json import (
|
||||
data_collection_input_to_staging_path_and_source_path,
|
||||
data_input_to_staging_path_and_source_path,
|
||||
)
|
||||
from galaxy.util import filesystem_safe_string
|
||||
from galaxy.util.object_wrapper import wrap_with_safe_string
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -6,11 +6,11 @@ import os.path
|
||||
import re
|
||||
from json import loads
|
||||
|
||||
from galaxy.security.object_wrapper import sanitize_lists_to_string
|
||||
from galaxy.util import (
|
||||
galaxy_directory,
|
||||
unicodify,
|
||||
)
|
||||
from galaxy.util.object_wrapper import sanitize_lists_to_string
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
Symlink
+1
@@ -0,0 +1 @@
|
||||
../../../lib/galaxy/security/
|
||||
@@ -3,8 +3,10 @@ boltons
|
||||
docutils
|
||||
markupsafe
|
||||
packaging
|
||||
pycryptodome
|
||||
pyyaml
|
||||
requests
|
||||
routes
|
||||
six>=1.9.0
|
||||
SQLAlchemy>=1.4.20,<2
|
||||
zipstream-new
|
||||
|
||||
Reference in New Issue
Block a user