Timemaps should use the ACL of the original resource (#1991)

Resolves: https://fedora-repository.atlassian.net/browse/FCREPO-3825
fcrepo · May 19, 2022 · 879f528 · 879f528
1 parent 4d0a05b
commit 879f528
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/ContentExposingResource.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/ContentExposingResource.java
@@ -446,7 +446,9 @@ protected void addExternalContentHeaders(final FedoraResource resource) {
 
     private void addAclHeader(final FedoraResource resource) {
         if (!(resource instanceof WebacAcl) && !resource.isMemento()) {
-            final String resourceUri = getUri(resource.getDescribedResource()).toString();
+            final FedoraResource resourceForAcl = resource instanceof TimeMap ? resource.getOriginalResource() :
+                    resource.getDescribedResource();
+            final String resourceUri = getUri(resourceForAcl).toString();
             final String aclLocation =  resourceUri + (resourceUri.endsWith("/") ? "" : "/") + FCR_ACL;
             servletResponse.addHeader(LINK, buildLink(aclLocation, "acl"));
         }

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraVersioningIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraVersioningIT.java
@@ -842,15 +842,14 @@ private static void verifyMementoUri(final String message, final String expected
      * @param uri the URI of the resource.
      */
     private static void verifyTimeMapHeaders(final CloseableHttpResponse response, final String uri) {
-        final String ldpcvUri = uri + "/" + FCR_VERSIONS;
         checkForLinkHeader(response, RESOURCE.toString(), "type");
         checkForLinkHeader(response, CONTAINER.toString(), "type");
         checkForLinkHeader(response, RDF_SOURCE.getURI(), "type");
         checkForLinkHeader(response, uri, "original");
         checkForLinkHeader(response, uri, "timegate");
         checkForLinkHeader(response, uri + "/" + FCR_VERSIONS, "timemap");
         checkForLinkHeader(response, VERSIONING_TIMEMAP_TYPE, "type");
-        checkForLinkHeader(response, ldpcvUri + "/" + FCR_ACL, "acl");
+        checkForLinkHeader(response, uri + "/" + FCR_ACL, "acl");
         assertFalse(response.getFirstHeader("Allow").getValue().contains("DELETE"));
         assertTrue(response.getFirstHeader("Allow").getValue().contains("GET"));
         assertTrue(response.getFirstHeader("Allow").getValue().contains("HEAD"));