Skip to content

Commit

Permalink
fix reporter file-download
Browse files Browse the repository at this point in the history
  • Loading branch information
BenediktMKuehne committed Jun 18, 2024
1 parent 73d0b44 commit 79c3d67
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions embark/reporter/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,16 @@ def html_report_download(request, analysis_id, html_path, download_file):
analysis = FirmwareAnalysis.objects.get(id=analysis_id)
if analysis.hidden is False or analysis.user == request.user or request.user.is_superuser:
resource_path = Path(f'{settings.EMBA_LOG_ROOT}/{analysis_id}/emba_logs/html-report/{html_path}/{download_file}')
if Path(f'{settings.EMBA_LOG_ROOT}/{analysis_id}/emba_logs/html-report/') in resource_path.parents:
try:
with open(resource_path, 'rb') as requested_file:
response = HttpResponse(requested_file.read(), content_type="text/plain")
response['Content-Disposition'] = 'attachment; filename=' + download_file
logger.info("html_report - analysis_id: %s html_path: %s download_file: %s", analysis_id, html_path,
download_file)
except FileNotFoundError:
messages.error(request, "File not found on the server")
logger.error("Couldn't find %s", resource_path)
response = HttpResponse("Couldn't find %s", resource_path)
try:
with open(resource_path, 'rb') as requested_file:
response = HttpResponse(requested_file.read(), content_type="text/plain")
response['Content-Disposition'] = 'attachment; filename=' + download_file
logger.info("html_report - analysis_id: %s html_path: %s download_file: %s", analysis_id, html_path,
download_file)
except FileNotFoundError:
messages.error(request, "File not found on the server")
logger.error("Couldn't find %s", resource_path)
response = HttpResponse("Couldn't find %s", resource_path)
return response


Expand Down

0 comments on commit 79c3d67

Please sign in to comment.