Author: jukka
Date: Tue Jun  1 10:23:07 2010
New Revision: 950002

URL: http://svn.apache.org/viewvc?rev=950002&view=rev
Log:
JCR-2645: XML text extraction in Jackrabbit 1.x accesses external resources

Modified:
    jackrabbit/branches/1.6/RELEASE-NOTES.txt
    jackrabbit/branches/1.6/jackrabbit-text-extractors/src/main/java/org/apache/jackrabbit/extractor/ExtractorHandler.java

Modified: jackrabbit/branches/1.6/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/RELEASE-NOTES.txt?rev=950002&r1=950001&r2=950002&view=diff
==============================================================================
--- jackrabbit/branches/1.6/RELEASE-NOTES.txt (original)
+++ jackrabbit/branches/1.6/RELEASE-NOTES.txt Tue Jun  1 10:23:07 2010
@@ -24,6 +24,7 @@ This release fixes the following issues:
   JCR-2577 SISM.checkAddedChildNodes() prevents merging of concurrent changes
   JCR-2611 DefaultHighlighter.java does not encode illegal XML characters
   JCR-2613 NoSuchItemStateException on checkin after removeVersion in XA ...
+  JCR-2645 XML text extraction in Jackrabbit 1.x accesses external resources
 
 See the Jackrabbit issue tracker for more details about these changes:
 
@@ -49,13 +50,13 @@ Contributors
 The following people have contributed to this release by submitting bug
 reports or by participating in the issue resolution process.
 
-    Antonio Martinez        Marcel Reutegger        Stephan Huttenhuis
-    Bart van der Schans     Martijn Hendriks        The Dong
-    Bram de Kruijff         Paul Jara               Thomas Müller
-    Claus Köll              Peter Krokavec          Tobias Bocanegra
-    Frederic Guilbeault     Robert Sauer            Tom Quellenberg
-    Grégory Joseph          Sascha Theves
-    Jukka Zitting           Stefan Guggisberg
+    Antonio Martinez        Marcel Reutegger        Stefan Guggisberg
+    Bart van der Schans     Martijn Hendriks        Stephan Huttenhuis
+    Bram de Kruijff         Maxime Bégnis           The Dong
+    Claus Köll              Paul Jara               Thomas Müller
+    Frederic Guilbeault     Peter Krokavec          Tobias Bocanegra
+    Grégory Joseph          Robert Sauer            Tom Quellenberg
+    Jukka Zitting           Sascha Theves
 
 Thank you to everyone involved!
 

Modified: jackrabbit/branches/1.6/jackrabbit-text-extractors/src/main/java/org/apache/jackrabbit/extractor/ExtractorHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-text-extractors/src/main/java/org/apache/jackrabbit/extractor/ExtractorHandler.java?rev=950002&r1=950001&r2=950002&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-text-extractors/src/main/java/org/apache/jackrabbit/extractor/ExtractorHandler.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-text-extractors/src/main/java/org/apache/jackrabbit/extractor/ExtractorHandler.java Tue Jun  1 10:23:07 2010
@@ -16,11 +16,13 @@
  */
 package org.apache.jackrabbit.extractor;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.Writer;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -119,6 +121,15 @@ class ExtractorHandler extends DefaultHa
         }
     }
 
+    //------------------------------------------------------< EntityResolver >
+
+    /**
+     * Disables loading of external entities.
+     */
+    public InputSource resolveEntity(String publicId, String systemId) { 
+        return new InputSource(new ByteArrayInputStream(new byte[0])); 
+    }
+
     //--------------------------------------------------------< ErrorHandler >
 
     /**