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

ActionDispatch::Http::UploadedFile is a permitted scalar [Closes #9051]

Browse source
This commit is contained in:
Xavier Noria 2013-01-23 23:14:47 +01:00
parent 3af85ed311
commit 8ac94d7c89
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
actionpack/lib/action_controller/metal/strong_parameters.rb
View file

@ -1,6 +1,7 @@
require 'active_support/core_ext/hash/indifferent_access' require 'active_support/core_ext/hash/indifferent_access'
require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/array/wrap'
require 'active_support/rescuable' require 'active_support/rescuable'
require 'action_dispatch/http/upload'
module ActionController module ActionController
# Raised when a required parameter is missing. # Raised when a required parameter is missing.
@ -190,8 +191,9 @@ module ActionController
# #
# +:name+ passes it is a key of +params+ whose associated value is of type # +:name+ passes it is a key of +params+ whose associated value is of type
# +String+, +Symbol+, +NilClass+, +Numeric+, +TrueClass+, +FalseClass+, # +String+, +Symbol+, +NilClass+, +Numeric+, +TrueClass+, +FalseClass+,
# +Date+, +Time+, +DateTime+, +StringIO+, or +IO+. Otherwise, the key +:name+ # +Date+, +Time+, +DateTime+, +StringIO+, +IO+, or
# is filtered out. # +ActionDispatch::Http::UploadedFile+. Otherwise, the key +:name+ is
# filtered out.
# #
# You may declare that the parameter should be an array of permitted scalars # You may declare that the parameter should be an array of permitted scalars
# by mapping it to an empty array: # by mapping it to an empty array:
@ -371,6 +373,7 @@ module ActionController
# DateTimes are Dates, we document the type but avoid the redundant check. # DateTimes are Dates, we document the type but avoid the redundant check.
StringIO, StringIO,
IO, IO,
ActionDispatch::Http::UploadedFile,
] ]
def permitted_scalar?(value) def permitted_scalar?(value)

3
actionpack/test/controller/parameters/parameters_permit_test.rb
View file

@ -1,4 +1,5 @@
require 'abstract_unit' require 'abstract_unit'
require 'action_dispatch/http/upload'
require 'action_controller/metal/strong_parameters' require 'action_controller/metal/strong_parameters'
class ParametersPermitTest < ActiveSupport::TestCase class ParametersPermitTest < ActiveSupport::TestCase
@ -31,7 +32,7 @@ class ParametersPermitTest < ActiveSupport::TestCase
values += [0, 1.0, 2**128, BigDecimal.new(1)] values += [0, 1.0, 2**128, BigDecimal.new(1)]
values += [true, false] values += [true, false]
values += [Date.today, Time.now, DateTime.now] values += [Date.today, Time.now, DateTime.now]
values += [StringIO.new] values += [STDOUT, StringIO.new, ActionDispatch::Http::UploadedFile.new(tempfile: __FILE__)]
values.each do |value| values.each do |value|
params = ActionController::Parameters.new(id: value) params = ActionController::Parameters.new(id: value)