usa	2014-10-27 20:18:02 +0900 (Mon, 27 Oct 2014)

  New Revision: 48161

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48161

  Log:
    * lib/rexml/entity.rb: keep the entity size within the limitation.
      reported by Willis Vandevanter <will@s...> and
      patched by nahi.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rexml/entity.rb
    trunk/test/rexml/test_document.rb
    trunk/test/rexml/test_entity.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48160)
+++ ChangeLog	(revision 48161)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Oct 27 20:13:37 2014  NAKAMURA Usaku  <usa@r...>
+
+	* lib/rexml/entity.rb: keep the entity size within the limitation.
+	  reported by Willis Vandevanter <will@s...> and
+	  patched by nahi.
+
 Mon Oct 27 17:17:24 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* proc.c (method_proc): the receiver of binding from method should
Index: lib/rexml/entity.rb
===================================================================
--- lib/rexml/entity.rb	(revision 48160)
+++ lib/rexml/entity.rb	(revision 48161)
@@ -138,8 +138,14 @@ module REXML https://github.com/ruby/ruby/blob/trunk/lib/rexml/entity.rb#L138
         matches = @value.scan(PEREFERENCE_RE)
         rv = @value.clone
         if @parent
+          sum = 0
           matches.each do |entity_reference|
             entity_value = @parent.entity( entity_reference[0] )
+            if sum + entity_value.bytesize > Security.entity_expansion_text_limit
+              raise "entity expansion has grown too large"
+            else
+              sum += entity_value.bytesize
+            end
             rv.gsub!( /%#{entity_reference.join};/um, entity_value )
           end
         end
Index: test/rexml/test_document.rb
===================================================================
--- test/rexml/test_document.rb	(revision 48160)
+++ test/rexml/test_document.rb	(revision 48161)
@@ -48,6 +48,20 @@ EOF https://github.com/ruby/ruby/blob/trunk/test/rexml/test_document.rb#L48
 </member>
 EOF
 
+    XML_WITH_NESTED_PARAMETER_ENTITY = <<EOF
+<!DOCTYPE root [
+  <!ENTITY % a "BOOM.BOOM.BOOM.BOOM.BOOM.BOOM.BOOM.BOOM.BOOM.">
+  <!ENTITY % b "%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;">
+  <!ENTITY % c "%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;">
+  <!ENTITY % d "%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;">
+  <!ENTITY % e "%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;">
+  <!ENTITY % f "%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;">
+  <!ENTITY % g "%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;">
+  <!ENTITY test "test %g;">
+]>
+<cd></cd>
+EOF
+
     XML_WITH_4_ENTITY_EXPANSION = <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE member [
@@ -84,6 +98,19 @@ EOF https://github.com/ruby/ruby/blob/trunk/test/rexml/test_document.rb#L98
       end
     ensure
       REXML::Security.entity_expansion_limit = 10000
+    end
+
+    def test_entity_expansion_limit_for_parameter_entity
+      assert_raise(REXML::ParseException) do
+        REXML::Document.new(XML_WITH_NESTED_PARAMETER_ENTITY)
+      end
+      REXML::Security.entity_expansion_limit = 100
+      assert_equal(100, REXML::Security.entity_expansion_limit)
+      assert_raise(REXML::ParseException) do
+        REXML::Document.new(XML_WITH_NESTED_PARAMETER_ENTITY)
+      end
+    ensure
+      REXML::Security.entity_expansion_limit = 10000
     end
 
     def test_tag_in_cdata_with_not_ascii_only_but_ascii8bit_encoding_source
Index: test/rexml/test_entity.rb
===================================================================
--- test/rexml/test_entity.rb	(revision 48160)
+++ test/rexml/test_entity.rb	(revision 48161)
@@ -123,6 +123,22 @@ module REXMLTests https://github.com/ruby/ruby/blob/trunk/test/rexml/test_entity.rb#L123
       end
     end
 
+    def test_entity_string_limit_for_parameter_entity
+      template = '<!DOCTYPE bomb [ <!ENTITY % a "^" > <!ENTITY bomb "$" > ]><root/>'
+      len      = 5120 # 5k per entity
+      template.sub!(/\^/, "B" * len)
+
+      # 10k is OK
+      entities = '%a;' * 2 # 5k entity * 2 = 10k
+      REXML::Document.new(template.sub(/\$/, entities))
+
+      # above 10k explodes
+      entities = '%a;' * 3 # 5k entity * 2 = 15k
+      assert_raises(REXML::ParseException) do
+        REXML::Document.new(template.sub(/\$/, entities))
+      end
+    end
+
     def test_raw
       source = '<!DOCTYPE foo [
 <!ENTITY ent "replace">

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/