cxf git commit: Set secure processing feature on all TransformerFactories
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes b4870788d -> 47a5c5606 Set secure processing feature on all TransformerFactories Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/47a5c560 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/47a5c560 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/47a5c560 Branch: refs/heads/3.0.x-fixes Commit: 47a5c560636146e34458bce280a284905cf41d0c Parents: b487078 Author: Colm O hEigeartaigh Authored: Wed Apr 6 12:05:54 2016 +0100 Committer: Colm O hEigeartaigh Committed: Wed Apr 6 12:40:12 2016 +0100 -- .../org/apache/cxf/profile/FastInfosetExperiment.java | 1 + .../cxf/feature/transform/AbstractXSLTInterceptor.java | 12 ++-- .../java/org/apache/cxf/staxutils/StaxUtilsTest.java| 11 +++ .../demo/colocated/client/DispatchSourceClient.java | 4 +++- .../server/GreeterDOMSourcePayloadProvider.java | 4 +++- .../src/main/java/demo/hw/client/Get.java | 4 +++- .../src/main/java/demo/restful/client/Client.java | 4 +++- .../org/apache/cxf/jaxrs/impl/ResponseImplTest.java | 6 -- .../apache/cxf/jaxrs/provider/SourceProviderTest.java | 5 +++-- .../cxf/jaxws/handler/HandlerChainInvokerTest.java | 4 +++- .../org/apache/cxf/javascript/JsXMLHttpRequest.java | 6 -- .../org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 9 ++--- .../cxf/systest/handlers/HandlerInvocationTest.java | 4 ++-- .../systest/provider/AbstractSourcePayloadProvider.java | 4 +++- .../systest/provider/HWSAXSourcePayloadProvider.java| 4 +++- .../systest/provider/HWStreamSourcePayloadProvider.java | 4 +++- .../apache/cxf/systest/provider/TestLogicalHandler.java | 4 +++- .../provider/datasource/DataSourceProviderTest.java | 8 +--- .../java/org/apache/cxf/systest/ws/rm/SequenceTest.java | 7 --- .../cxf/systest/ws/security/WSSecurityClientTest.java | 9 + .../jaxwsmm/MessageProviderWithAddressingPolicy.java| 5 +++-- .../tools/common/toolspec/parser/CommandLineParser.java | 4 +++- 22 files changed, 84 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/47a5c560/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java -- diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java index 23ee83e..4c35e21 100644 --- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java +++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java @@ -64,6 +64,7 @@ public class FastInfosetExperiment { private FastInfosetExperiment() throws ParserConfigurationException { documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); transformerFactory = TransformerFactory.newInstance(); + transformerFactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); fiFile = new File("fiTest.fixml"); } http://git-wip-us.apache.org/repos/asf/cxf/blob/47a5c560/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java -- diff --git a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java index b18ffcf..4259220 100644 --- a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java +++ b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java @@ -41,7 +41,15 @@ import org.apache.cxf.staxutils.StaxUtils; * Creates an XMLStreamReader from the InputStream on the Message. */ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptor { -private static final TransformerFactory TRANSFORM_FACTORIY = TransformerFactory.newInstance(); +private static final TransformerFactory TRANSFORM_FACTORY = TransformerFactory.newInstance(); + +static { +try { + TRANSFORM_FACTORY.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); +} catch (javax.xml.transform.TransformerConfigurationException ex) { +// +} +} private String contextPropertyName; private final Templates xsltTemplate; @@ -61,7 +69,7 @@ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptorhttp://git-wip-us.apache.org/repos/asf/cxf/blob/47a5c560/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java --
cxf git commit: Set secure processing feature on all TransformerFactories
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 3fac6a1dd -> 00646355e Set secure processing feature on all TransformerFactories Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/00646355 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/00646355 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/00646355 Branch: refs/heads/3.1.x-fixes Commit: 00646355eeda1f09d0f92a094d1275870c52a8a7 Parents: 3fac6a1 Author: Colm O hEigeartaigh Authored: Wed Apr 6 12:05:54 2016 +0100 Committer: Colm O hEigeartaigh Committed: Wed Apr 6 12:06:25 2016 +0100 -- .../org/apache/cxf/profile/FastInfosetExperiment.java | 1 + .../cxf/feature/transform/AbstractXSLTInterceptor.java | 12 ++-- .../java/org/apache/cxf/staxutils/StaxUtilsTest.java| 11 +++ .../demo/colocated/client/DispatchSourceClient.java | 4 +++- .../server/GreeterDOMSourcePayloadProvider.java | 4 +++- .../src/main/java/demo/hw/client/Get.java | 4 +++- .../src/main/java/demo/restful/client/Client.java | 4 +++- .../org/apache/cxf/jaxrs/impl/ResponseImplTest.java | 6 -- .../apache/cxf/jaxrs/provider/SourceProviderTest.java | 5 +++-- .../cxf/jaxws/handler/HandlerChainInvokerTest.java | 4 +++- .../org/apache/cxf/javascript/JsXMLHttpRequest.java | 6 -- .../org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 9 ++--- .../cxf/systest/handlers/HandlerInvocationTest.java | 4 ++-- .../systest/provider/AbstractSourcePayloadProvider.java | 4 +++- .../systest/provider/HWSAXSourcePayloadProvider.java| 4 +++- .../systest/provider/HWStreamSourcePayloadProvider.java | 4 +++- .../apache/cxf/systest/provider/TestLogicalHandler.java | 4 +++- .../provider/datasource/DataSourceProviderTest.java | 8 +--- .../java/org/apache/cxf/systest/ws/rm/SequenceTest.java | 7 --- .../cxf/systest/ws/security/WSSecurityClientTest.java | 9 + .../jaxwsmm/MessageProviderWithAddressingPolicy.java| 5 +++-- .../tools/common/toolspec/parser/CommandLineParser.java | 4 +++- 22 files changed, 84 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/00646355/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java -- diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java index 23ee83e..4c35e21 100644 --- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java +++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java @@ -64,6 +64,7 @@ public class FastInfosetExperiment { private FastInfosetExperiment() throws ParserConfigurationException { documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); transformerFactory = TransformerFactory.newInstance(); + transformerFactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); fiFile = new File("fiTest.fixml"); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00646355/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java -- diff --git a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java index b18ffcf..4259220 100644 --- a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java +++ b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java @@ -41,7 +41,15 @@ import org.apache.cxf.staxutils.StaxUtils; * Creates an XMLStreamReader from the InputStream on the Message. */ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptor { -private static final TransformerFactory TRANSFORM_FACTORIY = TransformerFactory.newInstance(); +private static final TransformerFactory TRANSFORM_FACTORY = TransformerFactory.newInstance(); + +static { +try { + TRANSFORM_FACTORY.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); +} catch (javax.xml.transform.TransformerConfigurationException ex) { +// +} +} private String contextPropertyName; private final Templates xsltTemplate; @@ -61,7 +69,7 @@ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptorhttp://git-wip-us.apache.org/repos/asf/cxf/blob/00646355/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java --
cxf git commit: Set secure processing feature on all TransformerFactories
Repository: cxf Updated Branches: refs/heads/master 435a0c7da -> 96d04323e Set secure processing feature on all TransformerFactories Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/96d04323 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/96d04323 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/96d04323 Branch: refs/heads/master Commit: 96d04323ed27f81de36b5b99913abde421a86bf2 Parents: 435a0c7 Author: Colm O hEigeartaigh Authored: Wed Apr 6 12:05:54 2016 +0100 Committer: Colm O hEigeartaigh Committed: Wed Apr 6 12:05:54 2016 +0100 -- .../org/apache/cxf/profile/FastInfosetExperiment.java | 1 + .../cxf/feature/transform/AbstractXSLTInterceptor.java | 12 ++-- .../java/org/apache/cxf/staxutils/StaxUtilsTest.java| 11 +++ .../demo/colocated/client/DispatchSourceClient.java | 4 +++- .../server/GreeterDOMSourcePayloadProvider.java | 4 +++- .../src/main/java/demo/hw/client/Get.java | 4 +++- .../src/main/java/demo/restful/client/Client.java | 4 +++- .../org/apache/cxf/jaxrs/impl/ResponseImplTest.java | 6 -- .../apache/cxf/jaxrs/provider/SourceProviderTest.java | 5 +++-- .../cxf/jaxws/handler/HandlerChainInvokerTest.java | 4 +++- .../org/apache/cxf/javascript/JsXMLHttpRequest.java | 6 -- .../org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 9 ++--- .../cxf/systest/handlers/HandlerInvocationTest.java | 4 ++-- .../systest/provider/AbstractSourcePayloadProvider.java | 4 +++- .../systest/provider/HWSAXSourcePayloadProvider.java| 4 +++- .../systest/provider/HWStreamSourcePayloadProvider.java | 4 +++- .../apache/cxf/systest/provider/TestLogicalHandler.java | 4 +++- .../provider/datasource/DataSourceProviderTest.java | 8 +--- .../java/org/apache/cxf/systest/ws/rm/SequenceTest.java | 7 --- .../cxf/systest/ws/security/WSSecurityClientTest.java | 9 + .../jaxwsmm/MessageProviderWithAddressingPolicy.java| 5 +++-- .../tools/common/toolspec/parser/CommandLineParser.java | 4 +++- 22 files changed, 84 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/96d04323/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java -- diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java index 23ee83e..4c35e21 100644 --- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java +++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java @@ -64,6 +64,7 @@ public class FastInfosetExperiment { private FastInfosetExperiment() throws ParserConfigurationException { documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); transformerFactory = TransformerFactory.newInstance(); + transformerFactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); fiFile = new File("fiTest.fixml"); } http://git-wip-us.apache.org/repos/asf/cxf/blob/96d04323/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java -- diff --git a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java index b18ffcf..4259220 100644 --- a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java +++ b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java @@ -41,7 +41,15 @@ import org.apache.cxf.staxutils.StaxUtils; * Creates an XMLStreamReader from the InputStream on the Message. */ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptor { -private static final TransformerFactory TRANSFORM_FACTORIY = TransformerFactory.newInstance(); +private static final TransformerFactory TRANSFORM_FACTORY = TransformerFactory.newInstance(); + +static { +try { + TRANSFORM_FACTORY.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); +} catch (javax.xml.transform.TransformerConfigurationException ex) { +// +} +} private String contextPropertyName; private final Templates xsltTemplate; @@ -61,7 +69,7 @@ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptorhttp://git-wip-us.apache.org/repos/asf/cxf/blob/96d04323/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java