[brooklyn-server] branch master updated: Added default security config for XStream

[heneveld]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 3c0811e  Added default security config for XStream
     new 81dd1d0  This closes #1044
3c0811e is described below

commit 3c0811ef79069f1b5dca2e36639c4822091723e4
Author: Juan Cabrerizo <j...@cloudsoft.io>
AuthorDate: Tue Feb 12 15:57:07 2019 +0000

    Added default security config for XStream
---
 .../java/org/apache/brooklyn/util/core/xstream/XmlSerializer.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git 
a/core/src/main/java/org/apache/brooklyn/util/core/xstream/XmlSerializer.java 
b/core/src/main/java/org/apache/brooklyn/util/core/xstream/XmlSerializer.java
index 073f5ad..0ec770f 100644
--- 
a/core/src/main/java/org/apache/brooklyn/util/core/xstream/XmlSerializer.java
+++ 
b/core/src/main/java/org/apache/brooklyn/util/core/xstream/XmlSerializer.java
@@ -61,6 +61,12 @@ public class XmlSerializer<T> {
                 return XmlSerializer.this.wrapMapperForNormalUsage( 
super.wrapMapper(next) );
             }
         };
+
+        XStream.setupDefaultSecurity(xstream);
+        xstream.allowTypesByWildcard(new String[] {
+               "*"
+        });
+
         if (loader!=null) {
             xstream.setClassLoader(loader);
         }