Skip to content

Commit 7ede053

Browse files
dotasekdotasek
committed
Move new documentbuilderfactory calls to XMLUtils
1 parent c030740 commit 7ede053

File tree

43 files changed

+153
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+153
-135
lines changed

‎org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CDAUtilities.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class CDAUtilities {
5151
private final Document doc;
5252

5353
public CDAUtilities(InputStream stream) throws Exception {
54-
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
54+
DocumentBuilderFactory factory = XMLUtil.newXXEProtectedDocumentBuilderFactory();
5555
factory.setNamespaceAware(true);
5656
DocumentBuilder builder = factory.newDocumentBuilder();
5757

‎org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CKMImporter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private Document loadXml(String address) throws Exception {
130130
res.checkThrowException();
131131
InputStream xml = new ByteArrayInputStream(res.getContent());
132132

133-
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
133+
DocumentBuilderFactory dbf = XMLUtil.newXXEProtectedDocumentBuilderFactory();
134134
DocumentBuilder db = dbf.newDocumentBuilder();
135135
return db.parse(xml);
136136
}

‎org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CountryCodesConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ private String lang3To2(String lang) {
357357
}
358358

359359
private Document load() throws ParserConfigurationException, SAXException, IOException {
360-
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
360+
DocumentBuilderFactory factory = XMLUtil.newXXEProtectedDocumentBuilderFactory();
361361
factory.setNamespaceAware(true);
362362
DocumentBuilder builder = factory.newDocumentBuilder();
363363

‎org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/DicomPackageBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ private JsonObject buildPackage() {
131131
}
132132

133133
private CodeSystem buildCodeSystem() throws ParserConfigurationException, FileNotFoundException, SAXException, IOException {
134-
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
134+
DocumentBuilderFactory factory = XMLUtil.newXXEProtectedDocumentBuilderFactory();
135135
factory.setNamespaceAware(true);
136136
DocumentBuilder builder = factory.newDocumentBuilder();
137137
Document doc = builder.parse(ManagedFileAccess.inStream(Utilities.path(source, "Resources", "Ontology", "DCM", "dcm.owl")));

‎org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ICPC2Importer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void setTargetFileNameVS(String targetFileName) {
120120
}
121121

122122
public void go() throws Exception {
123-
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
123+
DocumentBuilderFactory factory = XMLUtil.newXXEProtectedDocumentBuilderFactory();
124124
factory.setNamespaceAware(false);
125125
DocumentBuilder builder = factory.newDocumentBuilder();
126126
Document doc = builder.parse(ManagedFileAccess.inStream(sourceFileName));

‎org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/LoincToDEConvertor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private void log(String string) {
148148

149149
}
150150
private void loadLoinc() throws FileNotFoundException, SAXException, IOException, ParserConfigurationException {
151-
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
151+
DocumentBuilderFactory factory = XMLUtil.newXXEProtectedDocumentBuilderFactory();
152152
factory.setNamespaceAware(true);
153153
DocumentBuilder builder = factory.newDocumentBuilder();
154154

‎org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/adl/ADLImporter.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.hl7.fhir.convertors.misc.adl;
22

3-
import java.io.FileInputStream;
4-
import java.io.FileOutputStream;
53
import java.util.ArrayList;
64
import java.util.HashMap;
75
import java.util.List;
@@ -89,7 +87,7 @@ private static String getParam(String[] args, String name) {
8987

9088
private void execute() throws Exception {
9189
// load config
92-
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
90+
DocumentBuilderFactory factory = XMLUtil.newXXEProtectedDocumentBuilderFactory();
9391
factory.setNamespaceAware(true);
9492
DocumentBuilder builder = factory.newDocumentBuilder();
9593
adlConfig = builder.parse(ManagedFileAccess.inStream(config)).getDocumentElement();

‎org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/iso21090/ISO21090Importer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ private String getDoco(Element en) {
317317
}
318318

319319
private void load() throws ParserConfigurationException, SAXException, IOException {
320-
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
320+
DocumentBuilderFactory factory = XMLUtil.newXXEProtectedDocumentBuilderFactory();
321321
factory.setNamespaceAware(false);
322322
DocumentBuilder builder = factory.newDocumentBuilder();
323323
Document doc = builder.parse(ManagedFileAccess.inStream("C:\\work\\projects\\org.hl7.v3.dt\\iso\\iso-21090-datatypes.xsd"));

‎org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/terminologies/LoincToDEConvertor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ private void log(String string) {
162162
}
163163

164164
private void loadLoinc() throws FileNotFoundException, SAXException, IOException, ParserConfigurationException {
165-
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
165+
DocumentBuilderFactory factory = XMLUtil.newXXEProtectedDocumentBuilderFactory();
166166
factory.setNamespaceAware(true);
167167
DocumentBuilder builder = factory.newDocumentBuilder();
168168

‎org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/DigitalSignatures.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
6060
import javax.xml.parsers.ParserConfigurationException;
6161

6262
import org.hl7.fhir.exceptions.FHIRException;
63+
import org.hl7.fhir.utilities.xml.XMLUtil;
6364
import org.hl7.fhir.utilities.xml.XmlGenerator;
6465
import org.w3c.dom.Document;
6566
import org.xml.sax.SAXException;
@@ -73,7 +74,7 @@ public static void main(String[] args)
7374
//
7475
byte[] inputXml = "<Envelope xmlns=\"urn:envelope\">\r\n</Envelope>\r\n".getBytes();
7576
// load the document that's going to be signed
76-
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
77+
DocumentBuilderFactory dbf = XMLUtil.newXXEProtectedDocumentBuilderFactory();
7778
dbf.setNamespaceAware(true);
7879
DocumentBuilder builder = dbf.newDocumentBuilder();
7980
Document doc = builder.parse(new ByteArrayInputStream(inputXml));

0 commit comments

Comments
 (0)