You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2015/12/20 13:47:41 UTC
[11/31] flex-blazeds git commit: Adding an
"allow-xml-external-entity-expansion" property to the serialization config.
Adding an "allow-xml-external-entity-expansion" property to the serialization config.
Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/ec8cfac5
Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/ec8cfac5
Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/ec8cfac5
Branch: refs/heads/master
Commit: ec8cfac557d65b7176a7a3b7b5f5d7a59fc0e498
Parents: 9164389
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Wed Jul 29 14:11:26 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Wed Jul 29 14:11:26 2015 +0200
----------------------------------------------------------------------
.../messaging/endpoints/AbstractEndpoint.java | 3 ++
.../flex/messaging/io/SerializationContext.java | 7 ++--
.../flex/messaging/io/amf/AbstractAmfInput.java | 3 +-
.../src/flex/messaging/io/amfx/AmfxInput.java | 3 +-
.../core/src/flex/messaging/util/XMLUtil.java | 35 ++++++++++----------
resources/config/services-config.xml | 7 ++++
6 files changed, 37 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/ec8cfac5/modules/core/src/flex/messaging/endpoints/AbstractEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/messaging/endpoints/AbstractEndpoint.java b/modules/core/src/flex/messaging/endpoints/AbstractEndpoint.java
index 27784fb..d773f1c 100644
--- a/modules/core/src/flex/messaging/endpoints/AbstractEndpoint.java
+++ b/modules/core/src/flex/messaging/endpoints/AbstractEndpoint.java
@@ -109,6 +109,8 @@ public abstract class AbstractEndpoint extends ManageableComponent
private static final String LEGACY_THROWABLE = "legacy-throwable";
private static final String LEGACY_BIG_NUMBERS = "legacy-big-numbers";
private static final String LEGACY_EXTERNALIZABLE = "legacy-externalizable";
+ private static final String ALLOW_XML_EXTERNAL_ENTITY_EXPANSION = "allow-xml-external-entity-expansion";
+
private static final String LOG_PROPERTY_ERRORS = "log-property-errors";
private static final String IGNORE_PROPERTY_ERRORS = "ignore-property-errors";
private static final String INCLUDE_READ_ONLY = "include-read-only";
@@ -276,6 +278,7 @@ public abstract class AbstractEndpoint extends ManageableComponent
serializationContext.legacyThrowable = serialization.getPropertyAsBoolean(LEGACY_THROWABLE, false);
serializationContext.legacyBigNumbers = serialization.getPropertyAsBoolean(LEGACY_BIG_NUMBERS, false);
serializationContext.legacyExternalizable = serialization.getPropertyAsBoolean(LEGACY_EXTERNALIZABLE, false);
+ serializationContext.allowXmlExternalEntityExpansion = serialization.getPropertyAsBoolean(ALLOW_XML_EXTERNAL_ENTITY_EXPANSION, false);
serializationContext.maxObjectNestLevel = (int)serialization.getPropertyAsLong(MAX_OBJECT_NEST_LEVEL, 512);
serializationContext.maxCollectionNestLevel = (int)serialization.getPropertyAsLong(MAX_COLLECTION_NEST_LEVEL, 15);
serializationContext.preferVectors = serialization.getPropertyAsBoolean(PREFER_VECTORS, false);
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/ec8cfac5/modules/core/src/flex/messaging/io/SerializationContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/messaging/io/SerializationContext.java b/modules/core/src/flex/messaging/io/SerializationContext.java
index 7245160..24f5d78 100644
--- a/modules/core/src/flex/messaging/io/SerializationContext.java
+++ b/modules/core/src/flex/messaging/io/SerializationContext.java
@@ -41,7 +41,7 @@ public class SerializationContext implements Serializable, Cloneable
public boolean restoreReferences;
public boolean supportRemoteClass;
public boolean supportDatesByReference; // Typically used by AMF Version 3 requests
-
+
/**
* Determines whether an ASObject is created by default for a type that is
* missing on the server, instead of throwing a server resource not found
@@ -76,10 +76,12 @@ public class SerializationContext implements Serializable, Cloneable
// How deep level of nest object in the object graph that we support
public int maxObjectNestLevel = 512;
- // How deep levle of nest collection objects in the object graph that we support
+ // How deep level of nest collection objects in the object graph that we support
// Similarly like how many dimensional matrix that we support for serialization.
public int maxCollectionNestLevel = 15;
+ public boolean allowXmlExternalEntityExpansion = false;
+
/**
* In server-to-client serialization, determines whether Java Arrays and Lists
* should be serialized as Flash Vectors, rather than Flash Array, and Flex
@@ -225,6 +227,7 @@ public class SerializationContext implements Serializable, Cloneable
context.deserializationValidator = deserializationValidator;
context.maxObjectNestLevel = maxObjectNestLevel;
context.maxCollectionNestLevel = maxCollectionNestLevel;
+ context.allowXmlExternalEntityExpansion = allowXmlExternalEntityExpansion;
context.preferVectors = preferVectors;
return context;
}
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/ec8cfac5/modules/core/src/flex/messaging/io/amf/AbstractAmfInput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/messaging/io/amf/AbstractAmfInput.java b/modules/core/src/flex/messaging/io/amf/AbstractAmfInput.java
index f6124b9..1ee3d12 100644
--- a/modules/core/src/flex/messaging/io/amf/AbstractAmfInput.java
+++ b/modules/core/src/flex/messaging/io/amf/AbstractAmfInput.java
@@ -82,7 +82,8 @@ public abstract class AbstractAmfInput extends AmfIO implements ActionMessageInp
return xml;
// Validation performed in XMLUtil#stringToDocument.
- return XMLUtil.stringToDocument(xml, !(context.legacyXMLNamespaces));
+ return XMLUtil.stringToDocument(xml, !(context.legacyXMLNamespaces),
+ context.allowXmlExternalEntityExpansion);
}
/**
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/ec8cfac5/modules/core/src/flex/messaging/io/amfx/AmfxInput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/messaging/io/amfx/AmfxInput.java b/modules/core/src/flex/messaging/io/amfx/AmfxInput.java
index 82a1fe5..9bb7caa 100644
--- a/modules/core/src/flex/messaging/io/amfx/AmfxInput.java
+++ b/modules/core/src/flex/messaging/io/amfx/AmfxInput.java
@@ -1049,7 +1049,8 @@ public class AmfxInput
xml = unescapeCloseCDATA(xml);
// Validation performed in XMLUtil#stringToDocument.
- Object value = XMLUtil.stringToDocument(xml, !(context.legacyXMLNamespaces));
+ Object value = XMLUtil.stringToDocument(xml, !(context.legacyXMLNamespaces),
+ context.allowXmlExternalEntityExpansion);
setValue(value);
}
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/ec8cfac5/modules/core/src/flex/messaging/util/XMLUtil.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/messaging/util/XMLUtil.java b/modules/core/src/flex/messaging/util/XMLUtil.java
index da3349e..9674a48 100644
--- a/modules/core/src/flex/messaging/util/XMLUtil.java
+++ b/modules/core/src/flex/messaging/util/XMLUtil.java
@@ -16,9 +16,9 @@
*/
package flex.messaging.util;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
+import flex.messaging.MessageException;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -28,11 +28,9 @@ import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-
-import flex.messaging.MessageException;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
/**
* Utility class for converting strings to XML documents and
@@ -59,7 +57,7 @@ public class XMLUtil
*/
public static String documentToString(Document document) throws IOException
{
- String xml = null;
+ String xml;
try
{
@@ -99,7 +97,7 @@ public class XMLUtil
*/
public static Document stringToDocument(String xml)
{
- return stringToDocument(xml, true);
+ return stringToDocument(xml, true, false);
}
/**
@@ -111,7 +109,7 @@ public class XMLUtil
* is name-space aware
* @return Document
*/
- public static Document stringToDocument(String xml, boolean nameSpaceAware)
+ public static Document stringToDocument(String xml, boolean nameSpaceAware, boolean allowXmlExternalEntityExpansion)
{
ClassUtil.validateCreation(Document.class);
@@ -124,12 +122,15 @@ public class XMLUtil
InputSource input = new InputSource(reader);
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- // Disable local resolution of entities due to security issues
- // See: https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing
- factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
- factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
- factory.setXIncludeAware(false);
- factory.setExpandEntityReferences(false);
+ if(!allowXmlExternalEntityExpansion)
+ {
+ // Disable local resolution of entities due to security issues
+ // See: https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing
+ factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+ factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+ factory.setXIncludeAware(false);
+ factory.setExpandEntityReferences(false);
+ }
factory.setNamespaceAware(nameSpaceAware);
factory.setValidating(false);
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/ec8cfac5/resources/config/services-config.xml
----------------------------------------------------------------------
diff --git a/resources/config/services-config.xml b/resources/config/services-config.xml
index fb87328..4d3a54b 100755
--- a/resources/config/services-config.xml
+++ b/resources/config/services-config.xml
@@ -282,6 +282,13 @@
max object nest limit can prevent a recursion stack overflow. By default, it is set to 512.
-->
<max-object-nest-level>512</max-object-nest-level>
+ <!--
+ Per default the expansion of external entities in xml is disabled for
+ security reasons. If you require them to be expanded, turn this option
+ to true. See also:
+ https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing
+ -->
+ <allow-xml-external-entity-expansion>true</allow-xml-external-entity-expansion>
</serialization>
<!-- Optional. Use this to limit the client channel's connect attempt
to the specified time interval.