opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-21 13:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re-work upload clarification from #5206.

Browse Source 
See post-merge discussion on that issue.
This commit is contained in:
John Chilton
2018-01-04 09:30:16 -05:00
parent a8fe2e19f6
commit 3f75a2d3a6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/actions/upload_common.py
+1 -1
View File
@@ -448,7 +448,7 @@ def create_paramfile(trans, uploaded_datasets):
auto_decompress=getattr(uploaded_dataset, "auto_decompress", True),
purge_source=purge_source,
space_to_tab=uploaded_dataset.space_to_tab,
run_as_real_user=trans.app.config.external_chown_script is None,
run_as_real_user=trans.app.config.external_chown_script is not None,
check_content=trans.app.config.check_upload_content,
path=uploaded_dataset.path)
# TODO: This will have to change when we start bundling inputs.
tools/data_source/upload.py
+5 -3
View File
@@ -96,10 +96,12 @@ def add_file(dataset, registry, json_file, output_path):
# if running as the real user so the file can be cleaned up by Galaxy.
purge_source = dataset.get('purge_source', True) and not run_as_real_user
# in_place is True only if we are running as a real user and not importing external paths (i.e.
# in_place is True unless we are running as a real user or importing external paths (i.e.
# this is a real upload and not a path paste or ftp import).
# In this case we try to reuse the uploaded file that has been chowned to this user already.
in_place = run_as_real_user and dataset.type not in ('server_dir', 'path_paste', 'ftp_import')
# in_place should always be False if running as real user because the uploaded file will
# be owned by Galaxy and not the user and it should be False for external paths so Galaxy doesn't
# modify files not controlled by Galaxy.
in_place = not run_as_real_user and dataset.type not in ('server_dir', 'path_paste', 'ftp_import')
# Base on the check_upload_content Galaxy config option and on by default, this enables some
# security related checks on the uploaded content, but can prevent uploads from working in some cases.