diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2019-01-22 15:35:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 15:35:57 -0500 |
| commit | afbab2822aa1324de7a1ceff10eaf3f6a9a3a63f (patch) | |
| tree | a4c53072787431110d680f9783e606f074ccc836 /activestorage | |
| parent | ea6a488f51f439854bf3c528e4225eb45f767d00 (diff) | |
| parent | 2e0ca9284a6864cfbbb632d849df3fdd7a7c554e (diff) | |
| download | rails-afbab2822aa1324de7a1ceff10eaf3f6a9a3a63f.tar.gz rails-afbab2822aa1324de7a1ceff10eaf3f6a9a3a63f.tar.bz2 rails-afbab2822aa1324de7a1ceff10eaf3f6a9a3a63f.zip | |
Merge pull request #35018 from gmcgibbon/revert_redirect_to_allow_other_host
Revert ensure external redirects are explicitly allowed
Diffstat (limited to 'activestorage')
| -rw-r--r-- | activestorage/app/controllers/active_storage/blobs_controller.rb | 2 | ||||
| -rw-r--r-- | activestorage/app/controllers/active_storage/representations_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activestorage/app/controllers/active_storage/blobs_controller.rb b/activestorage/app/controllers/active_storage/blobs_controller.rb index a8e42d7356..4fc3fbe824 100644 --- a/activestorage/app/controllers/active_storage/blobs_controller.rb +++ b/activestorage/app/controllers/active_storage/blobs_controller.rb @@ -9,6 +9,6 @@ class ActiveStorage::BlobsController < ActiveStorage::BaseController def show expires_in ActiveStorage.service_urls_expire_in - redirect_to @blob.service_url(disposition: params[:disposition]), allow_other_host: true + redirect_to @blob.service_url(disposition: params[:disposition]) end end diff --git a/activestorage/app/controllers/active_storage/representations_controller.rb b/activestorage/app/controllers/active_storage/representations_controller.rb index d01af5d939..98e11e5dbb 100644 --- a/activestorage/app/controllers/active_storage/representations_controller.rb +++ b/activestorage/app/controllers/active_storage/representations_controller.rb @@ -9,6 +9,6 @@ class ActiveStorage::RepresentationsController < ActiveStorage::BaseController def show expires_in ActiveStorage.service_urls_expire_in - redirect_to @blob.representation(params[:variation_key]).processed.service_url(disposition: params[:disposition]), allow_other_host: true + redirect_to @blob.representation(params[:variation_key]).processed.service_url(disposition: params[:disposition]) end end |