Skip to content

Fix/xxe confirmed #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kenwynejohnes wants to merge 2 commits into
base: main-6.2
Choose a base branch
from
+23 −3
Open

Fix/xxe confirmed #317

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b6e65d
XXE fix from mobb
kenwynejohnes Apr 4, 2025
105600b
Remove redundant imports
kenwynejohnes Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions java/timebase/server/src/main/java/com/epam/deltix/qsrv/hf/tickdb/http/TimebaseServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
import static com.epam.deltix.qsrv.hf.tickdb.http.AbstractHandler.*;
import static com.epam.deltix.qsrv.hf.tickdb.http.HTTPProtocol.*;

import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;

/**
*
*/
Expand Down Expand Up @@ -97,6 +101,11 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
final Unmarshaller um = TBJAXBContext.createUnmarshaller();
final Object body;

XMLInputFactory xif = XMLInputFactory.newFactory();
xif.setProperty(XMLInputFactory.SUPPORT_DTD, false);
xif.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
XMLStreamReader xsr = null;

if (DEBUG) {
try {
final String xml = BasicIOUtil.readFromStream(req.getInputStream());
Expand All @@ -107,13 +116,24 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
LOGGER.fine("request: " + xml);
}

body = um.unmarshal(new StringReader(xml));
try {
xsr = xif.createXMLStreamReader(new StringReader(xml));
} catch(XMLStreamException e) {
throw new RuntimeException(e);
}
body = um.unmarshal(xsr);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
}
else
body = um.unmarshal(req.getInputStream());
else {
try {
xsr = xif.createXMLStreamReader(req.getInputStream());
} catch(XMLStreamException e) {
throw new RuntimeException(e);
}
body = um.unmarshal(xsr);
}

if (body instanceof XmlRequest)
HTTPProtocol.validateVersion(((XmlRequest) body).version);
Expand Down