kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge branch 'master' into explore-polymorphism

Browse source
This commit is contained in:
David Heinemeier Hansson 2017-07-23 15:55:53 -05:00
commit 229394b5ac
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/active_storage/disk_controller.rb
View file

@ -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

4
app/models/active_storage/blob.rb
View file

@ -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

2
app/models/active_storage/service/disk_service.rb
View file

@ -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)

4
app/models/active_storage/variation.rb
View file

@ -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

4
test/controllers/disk_controller_test.rb
View file

@ -11,13 +11,13 @@ class ActiveStorage::DiskControllerTest < ActionController::TestCase
end
test "showing blob inline" do
get :show, params: { filename: @blob.filename, encoded_key: ActiveStorage.verifier.generate(@blob.key, expires_in: 5.minutes) }
get :show, params: { filename: @blob.filename, encoded_key: ActiveStorage.verifier.generate(@blob.key, expires_in: 5.minutes, purpose: :blob_key) }
assert_equal "inline; filename=\"#{@blob.filename}\"", @response.headers["Content-Disposition"]
assert_equal "text/plain", @response.headers["Content-Type"]
end
test "sending blob as attachment" do
get :show, params: { filename: @blob.filename, encoded_key: ActiveStorage.verifier.generate(@blob.key, expires_in: 5.minutes), disposition: :attachment }
get :show, params: { filename: @blob.filename, encoded_key: ActiveStorage.verifier.generate(@blob.key, expires_in: 5.minutes, purpose: :blob_key), disposition: :attachment }
assert_equal "attachment; filename=\"#{@blob.filename}\"", @response.headers["Content-Disposition"]
assert_equal "text/plain", @response.headers["Content-Type"]
end

2
test/models/blob_test.rb
View file

@ -35,6 +35,6 @@ class ActiveStorage::BlobTest < ActiveSupport::TestCase
private
def expected_url_for(blob, disposition: :inline)
"/rails/active_storage/disk/#{ActiveStorage.verifier.generate(blob.key, expires_in: 5.minutes)}/#{blob.filename}?disposition=#{disposition}"
"/rails/active_storage/disk/#{ActiveStorage.verifier.generate(blob.key, expires_in: 5.minutes, purpose: :blob_key)}/#{blob.filename}?disposition=#{disposition}"
end
end