diff options
author | Michael Koziarski <michael@koziarski.com> | 2008-09-02 16:22:20 +0200 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2008-09-02 16:22:20 +0200 |
commit | ebfa43c423ac16bb699424d8d3db11855dd79a91 (patch) | |
tree | 66903b22083cdc07eb583bba2630d3855a6eda6c /activesupport/lib | |
parent | 76797b443929005f43512a147e97f02f3145ed81 (diff) | |
download | rails-ebfa43c423ac16bb699424d8d3db11855dd79a91.tar.gz rails-ebfa43c423ac16bb699424d8d3db11855dd79a91.tar.bz2 rails-ebfa43c423ac16bb699424d8d3db11855dd79a91.zip |
Merge rexml-expansion-fix gem into activesupport.
Addresses the security issue documented at:
* http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/core_ext/rexml.rb | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/rexml.rb b/activesupport/lib/active_support/core_ext/rexml.rb new file mode 100644 index 0000000000..af8ce3af47 --- /dev/null +++ b/activesupport/lib/active_support/core_ext/rexml.rb @@ -0,0 +1,35 @@ +require 'rexml/document' +require 'rexml/entity' + +# 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 + +unless REXML::VERSION > "3.1.7.2" + module REXML + class Entity < Child + 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 + @@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 |