From db2509cbd1331f850c0dac4e65f2c45049044eaa Mon Sep 17 00:00:00 2001
From: Alex Lewin <sl2281@cam.ac.uk>
Date: Thu, 21 May 2026 15:15:29 +0100
Subject: [PATCH 1/2] Add endpoint to get xml file from content

to be used to load sitemap
---
 .../cam/cl/dtg/isaac/api/IsaacController.java | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/api/IsaacController.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/api/IsaacController.java
index c8cdd07093..d575297f7c 100644
--- a/src/main/java/uk/ac/cam/cl/dtg/isaac/api/IsaacController.java
+++ b/src/main/java/uk/ac/cam/cl/dtg/isaac/api/IsaacController.java
@@ -63,6 +63,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_XML;
 import static uk.ac.cam.cl.dtg.isaac.api.Constants.*;
 import static uk.ac.cam.cl.dtg.segue.api.Constants.*;
 
@@ -417,6 +418,48 @@ public final Response getDocumentByPath(@Context final Request request,
         }
     }
 
+    /**
+     * Endpoint to allow xml files to be requested from the content database.
+     *
+     * @param httpServletRequest
+     *            - used for the Referer header for helpful error messages.
+     * @return a Response containing the file contents as Content-Disposition: attachment, or a SegueErrorResponse.
+     */
+    @GET
+    @Produces(APPLICATION_XML)
+    @Path("/xml/{path:.*}")
+    @Operation(summary = "Get an xml file from the content database.")
+    public final Response getXMLByPath(@Context final HttpServletRequest httpServletRequest, @PathParam("path") final String path) {
+        if (!Files.getFileExtension(path).equalsIgnoreCase("xml")) {
+            SegueErrorResponse error = new SegueErrorResponse(Status.BAD_REQUEST, "Invalid file type requested");
+            return error.toResponse();
+        }
+
+        try {
+            ByteArrayOutputStream fileContent = this.contentManager.getFileBytes(path);
+
+            if (null == fileContent) {
+                String refererHeader = httpServletRequest.getHeader("Referer");
+                log.warn("Unable to locate sitemap file. Referer: ({})", refererHeader);
+                return new SegueErrorResponse(Status.NOT_FOUND, "Unable to locate sitemap file.").toResponse();
+            }
+
+            return Response.ok(fileContent.toByteArray()).type(APPLICATION_XML)
+                    .cacheControl(getCacheControl(NUMBER_SECONDS_IN_ONE_DAY, true))
+                    .header("Content-Disposition", "attachment")  // Do not show this file in the browser.
+                    .build();
+
+        } catch (final IOException e) {
+            SegueErrorResponse error = new SegueErrorResponse(Status.INTERNAL_SERVER_ERROR, "Error reading sitemap file!");
+            log.error(error.getErrorMessage(), e);
+            return error.toResponse();
+        } catch (final UnsupportedOperationException e) {
+            SegueErrorResponse error = new SegueErrorResponse(Status.INTERNAL_SERVER_ERROR, "Multiple files match the path provided.");
+            log.error(error.getErrorMessage(), e);
+            return error.toResponse();
+        }
+    }
+
     /**
      * Get some statistics out of how many questions the user has completed.
      * 

From 86065cbee02ec212a57caa431bc96513dc9feb2b Mon Sep 17 00:00:00 2001
From: Alex Lewin <sl2281@cam.ac.uk>
Date: Thu, 21 May 2026 15:21:56 +0100
Subject: [PATCH 2/2] Generify error messages

---
 .../java/uk/ac/cam/cl/dtg/isaac/api/IsaacController.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/api/IsaacController.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/api/IsaacController.java
index d575297f7c..30f0523c99 100644
--- a/src/main/java/uk/ac/cam/cl/dtg/isaac/api/IsaacController.java
+++ b/src/main/java/uk/ac/cam/cl/dtg/isaac/api/IsaacController.java
@@ -440,8 +440,8 @@ public final Response getXMLByPath(@Context final HttpServletRequest httpServlet
 
             if (null == fileContent) {
                 String refererHeader = httpServletRequest.getHeader("Referer");
-                log.warn("Unable to locate sitemap file. Referer: ({})", refererHeader);
-                return new SegueErrorResponse(Status.NOT_FOUND, "Unable to locate sitemap file.").toResponse();
+                log.warn("Unable to locate file. Referer: ({})", refererHeader);
+                return new SegueErrorResponse(Status.NOT_FOUND, "Unable to locate file.").toResponse();
             }
 
             return Response.ok(fileContent.toByteArray()).type(APPLICATION_XML)
@@ -450,7 +450,7 @@ public final Response getXMLByPath(@Context final HttpServletRequest httpServlet
                     .build();
 
         } catch (final IOException e) {
-            SegueErrorResponse error = new SegueErrorResponse(Status.INTERNAL_SERVER_ERROR, "Error reading sitemap file!");
+            SegueErrorResponse error = new SegueErrorResponse(Status.INTERNAL_SERVER_ERROR, "Error reading file!");
             log.error(error.getErrorMessage(), e);
             return error.toResponse();
         } catch (final UnsupportedOperationException e) {