aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2012-07-13 03:51:13 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2012-09-16 23:58:19 -0500
commita8f6d5c6450a7fe058348a7f10a908352bb6c7fc (patch)
tree245439153ec40c6840ece2b13ecc41572fe56d33 /activemodel/lib
parent885005461b3cc0d073ec08495dc3bf06d0bebf2a (diff)
downloadrails-a8f6d5c6450a7fe058348a7f10a908352bb6c7fc.tar.gz
rails-a8f6d5c6450a7fe058348a7f10a908352bb6c7fc.tar.bz2
rails-a8f6d5c6450a7fe058348a7f10a908352bb6c7fc.zip
Integrate ActiveModel::ForbiddenAttributesProtection from StrongParameters gem
Diffstat (limited to 'activemodel/lib')
-rw-r--r--activemodel/lib/active_model.rb1
-rw-r--r--activemodel/lib/active_model/forbidden_attributes_protection.rb14
2 files changed, 15 insertions, 0 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index d1cc19ec6b..f8b2b79906 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -34,6 +34,7 @@ module ActiveModel
autoload :Conversion
autoload :Dirty
autoload :EachValidator, 'active_model/validator'
+ autoload :ForbiddenAttributesProtection
autoload :Lint
autoload :MassAssignmentSecurity
autoload :Model
diff --git a/activemodel/lib/active_model/forbidden_attributes_protection.rb b/activemodel/lib/active_model/forbidden_attributes_protection.rb
new file mode 100644
index 0000000000..39f1a20734
--- /dev/null
+++ b/activemodel/lib/active_model/forbidden_attributes_protection.rb
@@ -0,0 +1,14 @@
+module ActiveModel
+ class ForbiddenAttributes < StandardError
+ end
+
+ module ForbiddenAttributesProtection
+ def sanitize_for_mass_assignment(new_attributes, options = {})
+ if !new_attributes.respond_to?(:permitted?) || (new_attributes.respond_to?(:permitted?) && new_attributes.permitted?)
+ super
+ else
+ raise ActiveModel::ForbiddenAttributes
+ end
+ end
+ end
+end