sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-06-27 00:10:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix file path management and download bugs

Browse Source
This commit is contained in:
Patrick Jentsch
2020-12-02 14:26:17 +01:00
parent 9dde839148
commit 4c92fdfb6c
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
web/app/jobs/views.py
View File

@ -5,6 +5,7 @@ from . import jobs
from . import tasks
from ..decorators import admin_required
from ..models import Job, JobInput, JobResult
import os
@jobs.route('/<int:job_id>')
@ -32,14 +33,12 @@ def delete_job(job_id):
@jobs.route('/<int:job_id>/inputs/<int:job_input_id>/download')
@login_required
def download_job_input(job_id, job_input_id):
job_input = JobInput.query.get_or_404(job_input_id)
if not job_input.job_id == job_id:
abort(404)
job_input = JobInput.query.filter(JobInput.job_id == job_id, JobInput.id == job_input_id).first_or_404() # noqa
if not (job_input.job.creator == current_user
or current_user.is_administrator()):
abort(403)
return send_from_directory(as_attachment=True,
directory=job_input.job.path,
directory=os.path.dirname(job_input.path),
filename=job_input.filename)
@ -59,12 +58,10 @@ def restart(job_id):
@jobs.route('/<int:job_id>/results/<int:job_result_id>/download')
@login_required
def download_job_result(job_id, job_result_id):
job_result = JobResult.query.get_or_404(job_result_id)
if not job_result.job_id == job_id:
abort(404)
job_result = JobResult.query.filter(JobResult.job_id == job_id, JobResult.id == job_result_id).first_or_404() # noqa
if not (job_result.job.creator == current_user
or current_user.is_administrator()):
abort(403)
return send_from_directory(as_attachment=True,
directory=job_result.job.path,
directory=os.path.dirname(job_result.path),
filename=job_result.filename)