diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-26 09:36:50 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-26 09:36:50 -0800 |
| commit | bec7cf2d1f600ba141b42de917a7c51f3b565308 (patch) | |
| tree | 821d71b09df5d16ae1cef6d9bdbb4a94ff19409c /activesupport/lib/active_support | |
| parent | 9fffef5f463d3c1f518373423c9e2044836b0de6 (diff) | |
| parent | 2ba1f460008536c4d7a9fa1fba623a53e1b8aed1 (diff) | |
| download | rails-bec7cf2d1f600ba141b42de917a7c51f3b565308.tar.gz rails-bec7cf2d1f600ba141b42de917a7c51f3b565308.tar.bz2 rails-bec7cf2d1f600ba141b42de917a7c51f3b565308.zip | |
Merge pull request #4193 from nashby/remove-old-rexml-security-fix
remove rexml security fix for rubies 1.8
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/rexml.rb | 46 | ||||
| -rw-r--r-- | activesupport/lib/active_support/ruby/shim.rb | 2 |
2 files changed, 0 insertions, 48 deletions
diff --git a/activesupport/lib/active_support/core_ext/rexml.rb b/activesupport/lib/active_support/core_ext/rexml.rb deleted file mode 100644 index 0419ebc84b..0000000000 --- a/activesupport/lib/active_support/core_ext/rexml.rb +++ /dev/null @@ -1,46 +0,0 @@ -require 'active_support/core_ext/kernel/reporting' - -# Fixes the rexml vulnerability disclosed at: -# http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/ -# This fix is identical to rexml-expansion-fix version 1.0.1. -# -# We still need to distribute this fix because albeit the REXML -# in recent 1.8.7s is patched, it wasn't in early patchlevels. -require 'rexml/rexml' - -# Earlier versions of rexml defined REXML::Version, newer ones REXML::VERSION -unless (defined?(REXML::VERSION) ? REXML::VERSION : REXML::Version) > "3.1.7.2" - silence_warnings { require 'rexml/document' } - - # REXML in 1.8.7 has the patch but early patchlevels didn't update Version from 3.1.7.2. - unless REXML::Document.respond_to?(:entity_expansion_limit=) - silence_warnings { require 'rexml/entity' } - - module REXML #:nodoc: - class Entity < Child #:nodoc: - undef_method :unnormalized - def unnormalized - document.record_entity_expansion! if document - v = value() - return nil if v.nil? - @unnormalized = Text::unnormalize(v, parent) - @unnormalized - end - end - class Document < Element #:nodoc: - @@entity_expansion_limit = 10_000 - def self.entity_expansion_limit= val - @@entity_expansion_limit = val - end - - def record_entity_expansion! - @number_of_expansions ||= 0 - @number_of_expansions += 1 - if @number_of_expansions > @@entity_expansion_limit - raise "Number of entity expansions exceeded, processing aborted." - end - end - end - end - end -end diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb index 9652eb4028..41fd866481 100644 --- a/activesupport/lib/active_support/ruby/shim.rb +++ b/activesupport/lib/active_support/ruby/shim.rb @@ -4,7 +4,6 @@ # Date next_year, next_month # DateTime to_date, to_datetime, xmlschema # Enumerable group_by, none? -# REXML security fix # String ord # Time to_date, to_time, to_datetime require 'active_support' @@ -14,5 +13,4 @@ require 'active_support/core_ext/enumerable' require 'active_support/core_ext/string/conversions' require 'active_support/core_ext/string/interpolation' require 'active_support/core_ext/string/encoding' -require 'active_support/core_ext/rexml' require 'active_support/core_ext/time/conversions' |