Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-14 08:02:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename comparison method to isGranted and add test

Browse Source
This commit is contained in:
Markus Öllinger 2018-10-03 21:51:15 +02:00 committed by Eleftheria Stein-Kousathana
parent a4ea989e9c
commit 2cc05550fc
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java
View File

@ -87,7 +87,7 @@ public class DefaultPermissionGrantingStrategy implements PermissionGrantingStra
for (AccessControlEntry ace : aces) { for (AccessControlEntry ace : aces) {
if (comparePermissionMasks(ace, p) if (isGranted(ace, p)
&& ace.getSid().equals(sid)) { && ace.getSid().equals(sid)) {
// Found a matching ACE, so its authorization decision will // Found a matching ACE, so its authorization decision will
// prevail // prevail
@ -159,7 +159,7 @@ public class DefaultPermissionGrantingStrategy implements PermissionGrantingStra
* @param p the Permission we are checking against. * @param p the Permission we are checking against.
* @return true, if the respective masks are considered to be equal. * @return true, if the respective masks are considered to be equal.
*/ */
protected boolean comparePermissionMasks(AccessControlEntry ace, Permission p) { protected boolean isGranted(AccessControlEntry ace, Permission p) {
return ace.getPermission().getMask() == p.getMask(); return ace.getPermission().getMask() == p.getMask();
} }

32
acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java
View File

@ -49,6 +49,7 @@ public class AclImplTests {
PermissionGrantingStrategy pgs; PermissionGrantingStrategy pgs;
AuditLogger mockAuditLogger; AuditLogger mockAuditLogger;
ObjectIdentity objectIdentity = new ObjectIdentityImpl(TARGET_CLASS, 100); ObjectIdentity objectIdentity = new ObjectIdentityImpl(TARGET_CLASS, 100);
private DefaultPermissionFactory permissionFactory;
// ~ Methods // ~ Methods
// ======================================================================================================== // ========================================================================================================
@ -60,6 +61,7 @@ public class AclImplTests {
mockAuditLogger = mock(AuditLogger.class); mockAuditLogger = mock(AuditLogger.class);
pgs = new DefaultPermissionGrantingStrategy(mockAuditLogger); pgs = new DefaultPermissionGrantingStrategy(mockAuditLogger);
auth.setAuthenticated(true); auth.setAuthenticated(true);
permissionFactory = new DefaultPermissionFactory();
} }
@After @After
@ -559,9 +561,39 @@ public class AclImplTests {
childAcl.setParent(changeParentAcl); childAcl.setParent(changeParentAcl);
} }
// SEC-2342
@Test
public void maskPermissionGrantingStrategy() {
DefaultPermissionGrantingStrategy maskPgs = new MaskPermissionGrantingStrategy(mockAuditLogger);
MockAclService service = new MockAclService();
AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, maskPgs, null, null,
true, new PrincipalSid("joe"));
Permission permission = permissionFactory.buildFromMask(BasePermission.READ.getMask() | BasePermission.WRITE.getMask());
Sid sid = new PrincipalSid("ben");
acl.insertAce(0, permission, sid, true);
service.updateAcl(acl);
List<Permission> permissions = Arrays.asList(BasePermission.READ);
List<Sid> sids = Arrays.asList(sid);
assertThat(acl.isGranted(permissions, sids, false)).isTrue();
}
// ~ Inner Classes // ~ Inner Classes
// ================================================================================================== // ==================================================================================================
private static class MaskPermissionGrantingStrategy extends DefaultPermissionGrantingStrategy {
public MaskPermissionGrantingStrategy(AuditLogger auditLogger) {
super(auditLogger);
}
@Override
protected boolean isGranted(AccessControlEntry ace, Permission p) {
if (p.getMask() != 0) {
return (p.getMask() & ace.getPermission().getMask()) != 0;
}
return super.isGranted(ace, p);
}
}
private class MockAclService implements MutableAclService { private class MockAclService implements MutableAclService {
public MutableAcl createAcl(ObjectIdentity objectIdentity) public MutableAcl createAcl(ObjectIdentity objectIdentity)
throws AlreadyExistsException { throws AlreadyExistsException {