diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-23 15:55:53 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-23 15:55:53 -0500 |
| commit | 229394b5ac747d1c54dd837ed67ff721906daf37 (patch) | |
| tree | bdce405e19f3d490aa5cb3730f10d96ec689f6ea /app | |
| parent | a4f36f957e013f6da34e04f0d3f1d86d86491454 (diff) | |
| parent | df698991612575fe015d27bc138c5111de384c15 (diff) | |
| download | rails-229394b5ac747d1c54dd837ed67ff721906daf37.tar.gz rails-229394b5ac747d1c54dd837ed67ff721906daf37.tar.bz2 rails-229394b5ac747d1c54dd837ed67ff721906daf37.zip | |
Merge branch 'master' into explore-polymorphism
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/active_storage/disk_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/active_storage/blob.rb | 4 | ||||
| -rw-r--r-- | app/models/active_storage/service/disk_service.rb | 2 | ||||
| -rw-r--r-- | app/models/active_storage/variation.rb | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/active_storage/disk_controller.rb b/app/controllers/active_storage/disk_controller.rb index 7269239216..a42b4833a7 100644 --- a/app/controllers/active_storage/disk_controller.rb +++ b/app/controllers/active_storage/disk_controller.rb @@ -24,7 +24,7 @@ class ActiveStorage::DiskController < ActionController::Base end def decode_verified_key - ActiveStorage.verifier.verified(params[:encoded_key]) + ActiveStorage.verifier.verified(params[:encoded_key], purpose: :blob_key) end def disposition_param 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 |