add blobs proxy controller

pull/217/head
Pete Matsyburka 2 years ago
parent 5a3174a720
commit a728aa8689

@ -0,0 +1,29 @@
# frozen_string_literal: true
module Api
class ActiveStorageBlobsProxyController < ApiBaseController
include ActiveStorage::Streaming
skip_before_action :authenticate_user!
skip_authorization_check
def show
blob_uuid = ApplicationRecord.signed_id_verifier.verified(params[:signed_uuid])
return head :not_found unless blob_uuid
blob = ActiveStorage::Blob.find_by!(uuid: blob_uuid)
if request.headers['Range'].present?
send_blob_byte_range_data blob, request.headers['Range']
else
http_cache_forever public: true do
response.headers['Accept-Ranges'] = 'bytes'
response.headers['Content-Length'] = blob.byte_size.to_s
send_blob_stream blob, disposition: params[:disposition]
end
end
end
end
end

@ -15,7 +15,7 @@ class SubmissionsDownloadController < ApplicationController
urls = urls =
Submitters.select_attachments_for_download(last_submitter).map do |attachment| Submitters.select_attachments_for_download(last_submitter).map do |attachment|
helpers.rails_blob_url(attachment) ActiveStorage::Blob.proxy_url(attachment.blob)
end end
render json: urls render json: urls

@ -76,7 +76,7 @@ class Submission < ApplicationRecord
def audit_trail_url def audit_trail_url
return if audit_trail.blank? return if audit_trail.blank?
Rails.application.routes.url_helpers.rails_storage_proxy_url(audit_trail, **Docuseal.default_url_options) ActiveStorage::Blob.proxy_url(audit_trail.blob)
end end
alias audit_log_url audit_trail_url alias audit_log_url audit_trail_url
end end

@ -14,13 +14,20 @@ ActiveSupport.on_load(:active_storage_attachment) do
return unless first_page return unless first_page
Rails.application.routes.url_helpers.rails_storage_proxy_url(first_page, **Docuseal.default_url_options) ActiveStorage::Blob.proxy_url(first_page.blob)
end end
end end
ActiveSupport.on_load(:active_storage_blob) do ActiveSupport.on_load(:active_storage_blob) do
attribute :uuid, :string, default: -> { SecureRandom.uuid } attribute :uuid, :string, default: -> { SecureRandom.uuid }
def self.proxy_url(blob, expires_in: nil)
Rails.application.routes.url_helpers.blobs_proxy_url(
signed_uuid: blob.signed_uuid(expires_in:), filename: blob.filename,
**Docuseal.default_url_options
)
end
def uuid def uuid
super || begin super || begin
new_uuid = SecureRandom.uuid new_uuid = SecureRandom.uuid
@ -29,6 +36,10 @@ ActiveSupport.on_load(:active_storage_blob) do
end end
end end
def signed_uuid(expires_in: nil)
ApplicationRecord.signed_id_verifier.generate(uuid, expires_in:)
end
def delete def delete
service.delete(key) service.delete(key)
end end

@ -82,6 +82,8 @@ Rails.application.routes.draw do
resources :submissions_export, only: %i[index new] resources :submissions_export, only: %i[index new]
end end
resources :preview_document_page, only: %i[show], path: '/preview/:signed_uuid' resources :preview_document_page, only: %i[show], path: '/preview/:signed_uuid'
resource :blobs_proxy, only: %i[show], path: '/blobs_proxy/:signed_uuid/*filename(.:format)',
controller: 'api/active_storage_blobs_proxy'
resources :start_form, only: %i[show update], path: 'd', param: 'slug' do resources :start_form, only: %i[show update], path: 'd', param: 'slug' do
get :completed get :completed

@ -98,7 +98,7 @@ module Submissions
end end
link = link =
Rails.application.routes.url_helpers.rails_blob_url(document, **Docuseal.default_url_options) ActiveStorage::Blob.proxy_url(document.blob)
[ [
composer.document.layout.formatted_text_box( composer.document.layout.formatted_text_box(
@ -228,7 +228,7 @@ module Submissions
Array.wrap(value).map do |uuid| Array.wrap(value).map do |uuid|
attachment = submitter.attachments.find { |a| a.uuid == uuid } attachment = submitter.attachments.find { |a| a.uuid == uuid }
link = link =
Rails.application.routes.url_helpers.rails_blob_url(attachment, **Docuseal.default_url_options) ActiveStorage::Blob.proxy_url(attachment.blob)
{ link:, text: "#{attachment.filename}\n", style: :link } { link:, text: "#{attachment.filename}\n", style: :link }
end, end,

@ -131,7 +131,7 @@ module Submissions
height - (area['y'] * height) - lines[..next_index].sum(&:height) + height_diff height - (area['y'] * height) - lines[..next_index].sum(&:height) + height_diff
], ],
A: { Type: :Action, S: :URI, A: { Type: :Action, S: :URI,
URI: h.rails_blob_url(attachment, **Docuseal.default_url_options) } URI: ActiveStorage::Blob.proxy_url(attachment.blob) }
} }
) )

@ -76,7 +76,7 @@ module Submitters
def rails_storage_proxy_url(attachment) def rails_storage_proxy_url(attachment)
return if attachment.blank? return if attachment.blank?
r.rails_storage_proxy_url(attachment, **Docuseal.default_url_options) ActiveStorage::Blob.proxy_url(attachment.blob)
end end
def r def r

Loading…
Cancel
Save