From 3e344c1ee855c1eab2004cf06610e1165fc39e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Wed, 3 Apr 2024 15:31:15 +0300 Subject: [PATCH] Allow Converter to fetch jdt's dot.xml dtd As dot.xml files are generated inside EF infra, stored there and converter run there - there should be no security concern over fetching a dtd (coming from EF too). --- .../eclipse/releng/build/tools/convert/ant/Converter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/ant/Converter.java b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/ant/Converter.java index fda3a15..7ec828c 100644 --- a/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/ant/Converter.java +++ b/bundles/org.eclipse.releng.build.tools.convert/src/org/eclipse/releng/build/tools/convert/ant/Converter.java @@ -9,7 +9,6 @@ package org.eclipse.releng.build.tools.convert.ant; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileFilter; import java.io.IOException; @@ -208,7 +207,10 @@ public void parse2() throws ParserConfigurationException { factory.setValidating(validation); factory.setIgnoringElementContentWhitespace(true); final DocumentBuilder builder = factory.newDocumentBuilder(); - builder.setEntityResolver((publicId, systemId) -> new InputSource(new ByteArrayInputStream(new byte[0]))); + // Commented due to + // https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1943 + // builder.setEntityResolver((publicId, systemId) -> new InputSource(new + // ByteArrayInputStream(new byte[0]))); final String inputSourceOption = options.get(INPUT_SOURCE); if (options.get(RECURSIVE) != null) {