diff options
| author | Matthew Draper <matthew@trebex.net> | 2018-08-29 14:07:37 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 14:07:37 +0930 |
| commit | 068fe7dc9045856b822833db5cb7cb690e6000d7 (patch) | |
| tree | e9c6ce3a42e29e09bb899b6e4c7e695d97b3c428 /actionpack/lib/action_dispatch/http | |
| parent | 28e5085070f95f32a6a909cce6d77fd460c73885 (diff) | |
| parent | 7c9751d7fe3aec1e67004d1bb5e4a1702fcacafb (diff) | |
| download | rails-068fe7dc9045856b822833db5cb7cb690e6000d7.tar.gz rails-068fe7dc9045856b822833db5cb7cb690e6000d7.tar.bz2 rails-068fe7dc9045856b822833db5cb7cb690e6000d7.zip | |
Merge pull request #33718 from kddeisz/permit-list
Finish converting whitelist and blacklist references
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/mime_negotiation.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb index d7435fa8df..be129965d1 100644 --- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb +++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb @@ -85,10 +85,7 @@ module ActionDispatch if variant.all? { |v| v.is_a?(Symbol) } @variant = ActiveSupport::ArrayInquirer.new(variant) else - raise ArgumentError, "request.variant must be set to a Symbol or an Array of Symbols. " \ - "For security reasons, never directly set the variant to a user-provided value, " \ - "like params[:variant].to_sym. Check user-provided value against a whitelist first, " \ - "then set the variant: request.variant = :tablet if params[:variant] == 'tablet'" + raise ArgumentError, "request.variant must be set to a Symbol or an Array of Symbols." end end |