Skip to content

Commit 6db57c4

Browse files
committed
revert: TRUNK-6188: Add whitelisting for components loaded via Xstream
1 parent 09b4f6c commit 6db57c4

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

api/src/main/java/org/openmrs/module/reporting/serializer/ReportingSerializer.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ public Object unmarshal(HierarchicalStreamReader reader, Object root) {
8585
xstream.registerConverter(new IndicatorConverter(mapper, converterLookup));
8686

8787
xstream.registerConverter(new ReportDefinitionConverter(mapper, converterLookup));
88-
89-
setupXStreamSecurity(xstream);
9088
}
9189

9290
@Override
@@ -117,22 +115,4 @@ public void serializeToStream(Object object, OutputStream out) {
117115
throw new IllegalStateException("Unsupported encoding", e);
118116
}
119117
}
120-
121-
private void setupXStreamSecurity(XStream xstream) throws SerializationException {
122-
try {
123-
SimpleXStreamSerializer serializer = Context.getRegisteredComponent("simpleXStreamSerializer", SimpleXStreamSerializer.class);
124-
if (serializer != null) {
125-
try {
126-
Method method = serializer.getClass().getMethod("initXStream", XStream.class);
127-
method.invoke(serializer, xstream);
128-
}
129-
catch (Exception ex) {
130-
throw new SerializationException("Failed to set up XStream Security", ex);
131-
}
132-
}
133-
}
134-
catch (APIException ex) {
135-
//Ignore APIException("Error during getting registered component) for platform versions below 2.7.0
136-
}
137-
}
138118
}

0 commit comments

Comments
 (0)