Merge pull request #724 from trellis-ldp/feature/acl-link-headers

Include acl link headers in responses to ACL resources
trellis-ldp · Mar 7, 2020 · 79d9eb4 · 79d9eb4
2 parents 6ab7251 + b92b107
commit 79d9eb4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/components/webac/src/main/java/org/trellisldp/webac/WebAcFilter.java b/components/webac/src/main/java/org/trellisldp/webac/WebAcFilter.java
@@ -195,11 +195,12 @@ public void filter(final ContainerRequestContext ctx) {
 
     @Override
     public void filter(final ContainerRequestContext req, final ContainerResponseContext res) {
-        if (SUCCESSFUL.equals(res.getStatusInfo().getFamily()) && !DELETE.equals(req.getMethod())
-                && !req.getUriInfo().getQueryParameters().getOrDefault(HttpConstants.EXT, emptyList())
-                    .contains(HttpConstants.ACL)) {
+        if (SUCCESSFUL.equals(res.getStatusInfo().getFamily()) && !DELETE.equals(req.getMethod())) {
+            final boolean isAcl = req.getUriInfo().getQueryParameters()
+                .getOrDefault(HttpConstants.EXT, emptyList()).contains(HttpConstants.ACL);
+            final String rel = isAcl ? HttpConstants.ACL + " self" : HttpConstants.ACL;
             res.getHeaders().add(LINK, fromUri(getRequestUri(req).queryParam(HttpConstants.EXT, HttpConstants.ACL)
-                        .build()).rel(HttpConstants.ACL).build());
+                        .build()).rel(rel).build());
         }
     }
 

diff --git a/components/webac/src/test/java/org/trellisldp/webac/WebAcFilterTest.java b/components/webac/src/test/java/org/trellisldp/webac/WebAcFilterTest.java
@@ -403,7 +403,13 @@ void testFilterResponseWebac2() {
 
         assertTrue(headers.isEmpty());
         filter.filter(mockContext, mockResponseContext);
-        assertTrue(headers.isEmpty());
+
+        final Link link = (Link) headers.getFirst("Link");
+        assertNotNull(link);
+        assertTrue(link.getRels().contains("acl"));
+        assertTrue(link.getRels().contains("self"));
+        assertEquals("http://localhost/?ext=acl", link.getUri().toString());
+
     }
 
     @Test