[jbosstools-commits] JBoss Tools SVN: r39184 - branches/jbosstools-3.3.0.Beta1/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml.
Author: scabanovich
Date: 2012-02-28 20:22:23 -0500 (Tue, 28 Feb 2012)
New Revision: 39184
Modified:
branches/jbosstools-3.3.0.Beta1/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolver.java
branches/jbosstools-3.3.0.Beta1/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLUtilities.java
Log:
JBIDE-11066
https://issues.jboss.org/browse/JBIDE-11066
Merge to Beta1: Prevented loading of entities from internet.
Modified:
branches/jbosstools-3.3.0.Beta1/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolver.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolver.java 2012-02-29
00:48:40 UTC (rev 39183)
+++
branches/jbosstools-3.3.0.Beta1/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolver.java 2012-02-29
01:22:23 UTC (rev 39184)
@@ -10,6 +10,7 @@
import java.util.Properties;
import org.eclipse.core.runtime.FileLocator;
+import org.jboss.tools.common.CommonPlugin;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -96,10 +97,16 @@
}
}
- if(deactivate && (systemId != null) && (source == null) &&
(systemId.toLowerCase().endsWith(".dtd"))) { // this deactivates DTD
//$NON-NLS-1$
+ if(deactivate && (systemId != null) && (source == null)
+ // this deactivates DTD for .dtd and .ent resources
+ && (systemId.toLowerCase().endsWith(".dtd") ||
systemId.toLowerCase().endsWith(".ent"))
+ ) { //$NON-NLS-1$ //$NON-NLS-2$
source = new InputSource(new ByteArrayInputStream("<?xml version='1.0'
encoding='UTF-8'?>".getBytes())); //$NON-NLS-1$
}
-
+ if(source == null) {
+ CommonPlugin.getDefault().logError("WARNING: Cannot resolve entity " +
systemId); //$NON-NLS-1$
+ }
+ // TODO study if we can always return non-null value.
return source;
}
Modified:
branches/jbosstools-3.3.0.Beta1/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLUtilities.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLUtilities.java 2012-02-29
00:48:40 UTC (rev 39183)
+++
branches/jbosstools-3.3.0.Beta1/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLUtilities.java 2012-02-29
01:22:23 UTC (rev 39184)
@@ -155,7 +155,8 @@
public static EntityResolver createEmptyEntityResolver() {
return new EntityResolver() {
public InputSource resolveEntity(java.lang.String publicId, java.lang.String systemId)
throws SAXException, java.io.IOException {
- if((systemId != null) && systemId.toLowerCase().endsWith(".dtd")) {
// this deactivates DTD //$NON-NLS-1$
+ if((systemId != null) &&
+ (systemId.toLowerCase().endsWith(".dtd") ||
systemId.toLowerCase().endsWith(".ent"))) { // this deactivates DTD
//$NON-NLS-1$ //$NON-NLS-2$
return new InputSource(new ByteArrayInputStream("<?xml version='1.0'
encoding='UTF-8'?>".getBytes())); //$NON-NLS-1$
} else {
return null;