Skip to content

[Security] Disable external entity processing in XML upload to prevent XXE #4119

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
zhoujinsong wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Security] Disable external entity processing in XML upload to prevent XXE #4119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion ...rc/main/java/org/apache/amoro/server/dashboard/controller/PlatformFileInfoController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
import java.util.HashMap;
import java.util.Map;

import javax.xml.XMLConstants;
import javax.xml.stream.XMLInputFactory;

/** The controller that handles file requests. */
public class PlatformFileInfoController {

Expand All @@ -52,7 +55,15 @@ public void uploadFile(Context ctx) throws IOException {
// validate xml config
if (name.toLowerCase().endsWith(".xml")) {
try {
Configuration configuration = new Configuration();
// Explicitly disable external entity processing to prevent XXE attacks,
// regardless of the underlying XML parser implementation on the classpath.
XMLInputFactory xif = XMLInputFactory.newInstance();
xif.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
xif.setProperty(XMLInputFactory.SUPPORT_DTD, false);
xif.setProperty(XMLConstants.FEATURE_SECURE_PROCESSING, true);
xif.createXMLStreamReader(new ByteArrayInputStream(bytes)).close();

Configuration configuration = new Configuration(false);
configuration.addResource(new ByteArrayInputStream(bytes));
configuration.setDeprecatedProperties();
} catch (Exception e) {
Expand Down
Loading