From 15efa6720f9dc6efe27c717d9e32b31b2d45b7b8 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 23 Jul 2017 15:51:01 -0500 Subject: Specify verification purposes --- app/models/active_storage/blob.rb | 4 ++-- app/models/active_storage/service/disk_service.rb | 2 +- app/models/active_storage/variation.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/models/active_storage') diff --git a/app/models/active_storage/blob.rb b/app/models/active_storage/blob.rb index 7b45d3ad25..fdf9a2c37d 100644 --- a/app/models/active_storage/blob.rb +++ b/app/models/active_storage/blob.rb @@ -15,7 +15,7 @@ class ActiveStorage::Blob < ActiveRecord::Base class << self def find_signed(id) - find ActiveStorage.verifier.verify(id) + find ActiveStorage.verifier.verify(id, purpose: :blob_id) end def build_after_upload(io:, filename:, content_type: nil, metadata: nil) @@ -39,7 +39,7 @@ class ActiveStorage::Blob < ActiveRecord::Base def signed_id - ActiveStorage.verifier.generate(id) + ActiveStorage.verifier.generate(id, purpose: :blob_id) end def key diff --git a/app/models/active_storage/service/disk_service.rb b/app/models/active_storage/service/disk_service.rb index c7c45e2146..59b180d0e8 100644 --- a/app/models/active_storage/service/disk_service.rb +++ b/app/models/active_storage/service/disk_service.rb @@ -53,7 +53,7 @@ class ActiveStorage::Service::DiskService < ActiveStorage::Service def url(key, expires_in:, disposition:, filename:) instrument :url, key do |payload| - verified_key_with_expiration = ActiveStorage.verifier.generate(key, expires_in: expires_in) + verified_key_with_expiration = ActiveStorage.verifier.generate(key, expires_in: expires_in, purpose: :blob_key) generated_url = if defined?(Rails) && defined?(Rails.application) diff --git a/app/models/active_storage/variation.rb b/app/models/active_storage/variation.rb index b37397fcad..45274006a2 100644 --- a/app/models/active_storage/variation.rb +++ b/app/models/active_storage/variation.rb @@ -6,11 +6,11 @@ class ActiveStorage::Variation class << self def decode(key) - new ActiveStorage.verifier.verify(key) + new ActiveStorage.verifier.verify(key, purpose: :variation) end def encode(transformations) - ActiveStorage.verifier.generate(transformations) + ActiveStorage.verifier.generate(transformations, purpose: :variation) end end -- cgit v1.2.3