Respect subpath for (render_)protected_upload_path

This commit is contained in:
Sebastian Serth
2022-09-28 10:59:20 +02:00
parent 0b374491ac
commit 3263d4f838
3 changed files with 6 additions and 6 deletions

View File

@ -62,7 +62,7 @@ class SubmissionsController < ApplicationController
raise Pundit::NotAuthorizedError if @embed_options[:disable_download]
if @file.native_file?
redirect_to protected_upload_path(id: @file.id, filename: @file.name_with_extension)
redirect_to protected_upload_path(id: @file.id, filename: @file.filepath)
else
send_data(@file.content, filename: @file.name_with_extension, disposition: 'attachment')
end
@ -92,7 +92,7 @@ class SubmissionsController < ApplicationController
# Finally grant access and send the file
if @file.native_file?
url = render_protected_upload_url(id: @file.id, filename: @file.name_with_extension)
url = render_protected_upload_url(id: @file.id, filename: @file.filepath)
redirect_to AuthenticatedUrlHelper.sign(url, @file)
else
send_data(@file.content, filename: @file.name_with_extension, disposition: 'inline')