From 055b66e835136d003a5242664bee5437cd1e5a57 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sun, 19 Mar 2023 11:02:49 +0000
Subject: [PATCH] Fixed gateway prefix bugs.

---
 .../api/gateway/resource/GatewayResource.java      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java b/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java
index 091a0f19..9c77753f 100644
--- a/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java
+++ b/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java
@@ -2,6 +2,7 @@ package org.qortal.api.gateway.resource;
 
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.commons.lang3.StringUtils;
 import org.qortal.api.Security;
 import org.qortal.arbitrary.ArbitraryDataFile;
 import org.qortal.arbitrary.ArbitraryDataFile.ResourceIdType;
@@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
@@ -84,11 +86,11 @@ public class GatewayResource {
     public HttpServletResponse getPath(@PathParam("path") String inPath) {
         // Block requests from localhost, to prevent websites/apps from running javascript that fetches unvetted data
         Security.disallowLoopbackRequests(request);
-        return this.parsePath(inPath, "gateway", null, "", true, true);
+        return this.parsePath(inPath, "gateway", null, true, true);
     }
 
     
-    private HttpServletResponse parsePath(String inPath, String qdnContext, String secret58, String prefix, boolean usePrefix, boolean async) {
+    private HttpServletResponse parsePath(String inPath, String qdnContext, String secret58, boolean usePrefix, boolean async) {
 
         if (inPath == null || inPath.equals("")) {
             // Assume not a real file
@@ -100,6 +102,7 @@ public class GatewayResource {
         String name = null;
         String identifier = null;
         String outPath = "";
+        List<String> prefixParts = new ArrayList<>();
 
         if (!inPath.contains("/")) {
             // Assume entire inPath is a registered name
@@ -116,6 +119,7 @@ public class GatewayResource {
                     // First element matches a service, so we can assume it is one
                     service = parsedService;
                     parts.remove(0);
+                    prefixParts.add(service.name());
                 }
             } catch (IllegalArgumentException e) {
                 // Not a service
@@ -137,6 +141,7 @@ public class GatewayResource {
                     // Matched service, name and identifier combination - so assume this is an identifier and can be removed
                     identifier = parts.get(0);
                     parts.remove(0);
+                    prefixParts.add(identifier);
                 }
             }
 
@@ -146,6 +151,11 @@ public class GatewayResource {
             }
         }
 
+        String prefix = StringUtils.join(prefixParts, "/");
+        if (prefix != null && prefix.length() > 0) {
+            prefix = "/" + prefix;
+        }
+
         ArbitraryDataRenderer renderer = new ArbitraryDataRenderer(name, ResourceIdType.NAME, service, identifier, outPath,
                 secret58, prefix, usePrefix, async, qdnContext, request, response, context);
         return renderer.render();