From a501c3f1aaae3eab04114490b5ac97e59db61b00 Mon Sep 17 00:00:00 2001
From: Ties de Kock <ties@tiesdekock.nl>
Date: Mon, 9 Oct 2023 09:00:51 +0200
Subject: [PATCH] Use code from library instead of from <Command-v>

---
 build.gradle                                  |  2 --
 .../ripe/rpki/rsyncit/rrdp/RrdpFetcher.java   |  4 ++--
 .../java/net/ripe/rpki/rsyncit/util/XML.java  | 20 -------------------
 3 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 src/main/java/net/ripe/rpki/rsyncit/util/XML.java

diff --git a/build.gradle b/build.gradle
index f851ab1..0a9489e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,8 +10,6 @@ plugins {
 apply plugin: 'java'
 apply plugin: 'io.spring.dependency-management'
 
-apply from: "dependencies.gradle"
-
 group = 'net.ripe.rpki'
 version = '0.0.1-SNAPSHOT'
 
diff --git a/src/main/java/net/ripe/rpki/rsyncit/rrdp/RrdpFetcher.java b/src/main/java/net/ripe/rpki/rsyncit/rrdp/RrdpFetcher.java
index d3391fb..c5dfbe9 100644
--- a/src/main/java/net/ripe/rpki/rsyncit/rrdp/RrdpFetcher.java
+++ b/src/main/java/net/ripe/rpki/rsyncit/rrdp/RrdpFetcher.java
@@ -8,11 +8,11 @@
 import net.ripe.rpki.commons.crypto.crl.X509Crl;
 import net.ripe.rpki.commons.crypto.x509cert.X509ResourceCertificateParser;
 import net.ripe.rpki.commons.util.RepositoryObjectType;
+import net.ripe.rpki.commons.util.XML;
 import net.ripe.rpki.commons.validation.ValidationResult;
 import net.ripe.rpki.rsyncit.config.Config;
 import net.ripe.rpki.rsyncit.util.Sha256;
 import net.ripe.rpki.rsyncit.util.Time;
-import net.ripe.rpki.rsyncit.util.XML;
 import org.joda.time.DateTime;
 import org.springframework.http.HttpRequest;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -128,7 +128,7 @@ FetchResult processNotificationXml(byte[] notificationBytes, Function<String, Do
         if (notificationBytes == null || notificationBytes.length == 0) {
             throw new NotificationStructureException("Empty notification file.");
         }
-        final DocumentBuilder documentBuilder = XML.newDocumentBuilder();
+        final DocumentBuilder documentBuilder = XML.newNonNamespaceAwareDocumentBuilder();
         final Document notificationXmlDoc = documentBuilder.parse(new ByteArrayInputStream(notificationBytes));
 
         var notification = validateNotificationStructure(notificationXmlDoc);
diff --git a/src/main/java/net/ripe/rpki/rsyncit/util/XML.java b/src/main/java/net/ripe/rpki/rsyncit/util/XML.java
deleted file mode 100644
index 4d34a02..0000000
--- a/src/main/java/net/ripe/rpki/rsyncit/util/XML.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.ripe.rpki.rsyncit.util;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-public class XML {
-    /**
-     * Get an DocumentBuilder that is protected from entity injection.
-     * @return new DocumenBuilder
-     * @throws ParserConfigurationException when it feels like being peak java
-     */
-    public static DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {
-        final var df = DocumentBuilderFactory.newInstance();
-        df.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
-        df.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
-        return df.newDocumentBuilder();
-    }
-}