Skip to content

Commit 8867e90

Browse files
committed
Adjust WAC inheritance algorithm to rely on acl:default
1 parent 351aa30 commit 8867e90

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

auth/webac/src/main/java/org/trellisldp/webac/WebAcService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@ private AuthorizedModes getAuthz(final IRI identifier, final IRI agent) {
246246

247247
private AuthorizedModes getModesFor(final IRI identifier, final IRI agent) {
248248
return getNearestResource(identifier).map(resource -> {
249-
final Authorizations authorizations = getAllAuthorizationsFor(resource, false);
249+
final Authorizations authorizations = getAllAuthorizationsFor(resource,
250+
!identifier.equals(resource.getIdentifier()));
250251
return new AuthorizedModes(authorizations.getIdentifier(), authorizations.stream()
251252
.filter(agentFilter(agent)).flatMap(auth -> auth.getMode().stream()).collect(toSet()));
252253
}).orElseGet(() -> new AuthorizedModes(root, emptySet()));

auth/webac/src/test/java/org/trellisldp/webac/WebAcServiceTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,7 @@ void testInheritRoot() {
600600
when(mockSession.getAgent()).thenReturn(agentIRI);
601601

602602
assertAll("Test default ACL writability",
603+
checkCannotWrite(nonexistentIRI),
603604
checkCannotWrite(resourceIRI),
604605
checkCanWrite(childIRI),
605606
checkCannotWrite(parentIRI),

0 commit comments

Comments
 (0)