Author: angela
Date: Thu Dec 6 13:47:34 2018
New Revision: 1848310
URL: http://svn.apache.org/viewvc?rev=1848310&view=rev
Log:
OAK-7944 : Minor improvements to oak security code base
- fix nullability issues
- fix missing annotations
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCustomMixTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AbstractPermissionRandomTestIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CustomRestrictionProviderTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java?rev=1848310&r1=1848309&r2=1848310&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java
Thu Dec 6 13:47:34 2018
@@ -289,7 +289,6 @@ public class DefaultSyncConfig {
* @return {@code true} if dynamic group membership for external
* user identities is turn on; {@code false} otherwise.
*/
- @NotNull
public boolean getDynamicMembership() {
return dynamicMembership;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProvider.java?rev=1848310&r1=1848309&r2=1848310&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProvider.java
Thu Dec 6 13:47:34 2018
@@ -291,13 +291,13 @@ class CompositePermissionProvider implem
}
@Override
- public long supportedPermissions(TreeLocation location, long permissions) {
+ public long supportedPermissions(@NotNull TreeLocation location, long
permissions) {
return supportedPermissions((aggregatedPermissionProvider) ->
aggregatedPermissionProvider
.supportedPermissions(location, permissions));
}
@Override
- public long supportedPermissions(TreePermission treePermission,
PropertyState property, long permissions) {
+ public long supportedPermissions(@NotNull TreePermission treePermission,
@Nullable PropertyState property, long permissions) {
return supportedPermissions((aggregatedPermissionProvider) ->
aggregatedPermissionProvider
.supportedPermissions(treePermission, property, permissions));
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java?rev=1848310&r1=1848309&r2=1848310&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
Thu Dec 6 13:47:34 2018
@@ -310,7 +310,6 @@ public class UserQueryManager {
}
}
- @Nullable
private static boolean isReserved(@NotNull String propName) {
return UserConstants.GROUP_PROPERTY_NAMES.contains(propName) ||
UserConstants.USER_PROPERTY_NAMES.contains(propName);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCustomMixTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCustomMixTest.java?rev=1848310&r1=1848309&r2=1848310&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCustomMixTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCustomMixTest.java
Thu Dec 6 13:47:34 2018
@@ -264,7 +264,7 @@ public class CompositeProviderCustomMixT
}
@Override
- public boolean hasPrivileges(Tree tree, String... privilegeNames) {
+ public boolean hasPrivileges(Tree tree, @NotNull String...
privilegeNames) {
Set<String> in = Sets.newHashSet(privilegeNames);
return granted.containsAll(in);
}
@@ -281,12 +281,12 @@ public class CompositeProviderCustomMixT
}
@Override
- public long supportedPermissions(TreeLocation location, long
permissions) {
+ public long supportedPermissions(@NotNull TreeLocation location, long
permissions) {
return supportedPermissions(permissions);
}
@Override
- public long supportedPermissions(TreePermission treePermission,
PropertyState property, long permissions) {
+ public long supportedPermissions(@NotNull TreePermission
treePermission, PropertyState property, long permissions) {
return supportedPermissions(permissions);
}
@@ -297,11 +297,12 @@ public class CompositeProviderCustomMixT
}
@Override
- public boolean isGranted(TreeLocation location, long permissions) {
+ public boolean isGranted(@NotNull TreeLocation location, long
permissions) {
long myperms = mapToPermissions(granted, grantMap);
return Permissions.includes(myperms, permissions);
}
+ @NotNull
@Override
public RepositoryPermission getRepositoryPermission() {
return new RepositoryPermission() {
@@ -314,8 +315,9 @@ public class CompositeProviderCustomMixT
};
}
+ @NotNull
@Override
- public TreePermission getTreePermission(Tree tree, TreeType type,
TreePermission parentPermission) {
+ public TreePermission getTreePermission(@NotNull Tree tree, @NotNull
TreeType type, @NotNull TreePermission parentPermission) {
return new CustomTreePermission(granted, grantMap);
}
@@ -324,20 +326,22 @@ public class CompositeProviderCustomMixT
Assert.fail("method should not be called");
}
+ @NotNull
@Override
public Set<String> getPrivileges(Tree tree) {
Assert.fail("method should not be called");
return null;
}
+ @NotNull
@Override
- public TreePermission getTreePermission(Tree tree, TreePermission
parentPermission) {
+ public TreePermission getTreePermission(@NotNull Tree tree, @NotNull
TreePermission parentPermission) {
Assert.fail("method should not be called");
return null;
}
@Override
- public boolean isGranted(String oakPath, String jcrActions) {
+ public boolean isGranted(@NotNull String oakPath, @NotNull String
jcrActions) {
Assert.fail("method should not be called");
return false;
}
@@ -358,8 +362,9 @@ public class CompositeProviderCustomMixT
this.grantMap = grantMap;
}
+ @NotNull
@Override
- public TreePermission getChildPermission(String childName, NodeState
childState) {
+ public TreePermission getChildPermission(@NotNull String childName,
@NotNull NodeState childState) {
Assert.fail("method should not be called");
return null;
}
@@ -371,7 +376,7 @@ public class CompositeProviderCustomMixT
}
@Override
- public boolean canRead(PropertyState property) {
+ public boolean canRead(@NotNull PropertyState property) {
Assert.fail("method should not be called");
return false;
}
@@ -395,7 +400,7 @@ public class CompositeProviderCustomMixT
}
@Override
- public boolean isGranted(long permissions, PropertyState property) {
+ public boolean isGranted(long permissions, @NotNull PropertyState
property) {
Assert.fail("method should not be called");
return false;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AbstractPermissionRandomTestIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AbstractPermissionRandomTestIT.java?rev=1848310&r1=1848309&r2=1848310&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AbstractPermissionRandomTestIT.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AbstractPermissionRandomTestIT.java
Thu Dec 6 13:47:34 2018
@@ -244,6 +244,7 @@ public abstract class AbstractPermission
public void refresh() {
}
+ @NotNull
@Override
public Set<String> getPrivileges(Tree tree) {
if (canRead(tree.getPath())) {
@@ -254,31 +255,33 @@ public abstract class AbstractPermission
}
@Override
- public boolean hasPrivileges(Tree tree, String... privilegeNames) {
+ public boolean hasPrivileges(Tree tree, @NotNull String...
privilegeNames) {
assertTrue("Implemened only for JCR_READ",
privilegeNames.length == 1 &&
privilegeNames[0].equals(JCR_READ));
return canRead(tree.getPath());
}
+ @NotNull
@Override
public RepositoryPermission getRepositoryPermission() {
throw new RuntimeException("unimplemented");
}
+ @NotNull
@Override
- public TreePermission getTreePermission(Tree tree, TreePermission
parentPermission) {
+ public TreePermission getTreePermission(@NotNull Tree tree, @NotNull
TreePermission parentPermission) {
throw new RuntimeException("unimplemented");
}
@Override
- public boolean isGranted(Tree tree, PropertyState property, long
permissions) {
+ public boolean isGranted(@NotNull Tree tree, PropertyState property,
long permissions) {
assertTrue("Implemened only for Permissions.READ on trees",
property == null && permissions == Permissions.READ);
return canRead(tree.getPath());
}
@Override
- public boolean isGranted(String oakPath, String jcrActions) {
+ public boolean isGranted(@NotNull String oakPath, @NotNull String
jcrActions) {
assertTrue("Implemened only for Session.ACTION_READ",
jcrActions.equals(Session.ACTION_READ));
return canRead(oakPath);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CustomRestrictionProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CustomRestrictionProviderTest.java?rev=1848310&r1=1848309&r2=1848310&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CustomRestrictionProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CustomRestrictionProviderTest.java
Thu Dec 6 13:47:34 2018
@@ -253,8 +253,9 @@ public class CustomRestrictionProviderTe
//------------------------------------------------<
RestrictionProvider >---
+ @NotNull
@Override
- public RestrictionPattern getPattern(String oakPath, Tree tree) {
+ public RestrictionPattern getPattern(String oakPath, @NotNull Tree
tree) {
if (oakPath != null) {
PropertyState property = tree.getProperty(RESTRICTION_NAME);
if (property != null) {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java?rev=1848310&r1=1848309&r2=1848310&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java
Thu Dec 6 13:47:34 2018
@@ -159,6 +159,7 @@ public class PrincipalConfigurationImplT
PrincipalConfigurationImpl pc = new PrincipalConfigurationImpl() {
+ @NotNull
@Override
public PrincipalProvider getPrincipalProvider(Root root,
NamePathMapper namePathMapper) {
return pp;
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy?rev=1848310&r1=1848309&r2=1848310&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy
Thu Dec 6 13:47:34 2018
@@ -23,6 +23,7 @@ import com.google.common.collect.Immutab
import org.apache.felix.jaas.LoginModuleFactory
import
org.apache.jackrabbit.oak.spi.security.authentication.AbstractLoginModule
import
org.apache.jackrabbit.oak.spi.security.authentication.AuthenticationConfiguration
+import org.jetbrains.annotations.NotNull
import org.junit.Before
import org.junit.Ignore
import org.junit.Test
@@ -85,6 +86,7 @@ class JaasConfigSpiTest extends Abstract
private Set<? extends Principal> principals;
private String userId;
+ @NotNull
@Override
protected Set<Class> getSupportedCredentials() {
return ImmutableSet.of(SimpleCredentials.class)
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy?rev=1848310&r1=1848309&r2=1848310&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy
Thu Dec 6 13:47:34 2018
@@ -24,6 +24,7 @@ import groovy.util.logging.Slf4j
import org.apache.felix.jaas.LoginModuleFactory
import
org.apache.jackrabbit.oak.spi.security.authentication.AbstractLoginModule
import
org.apache.jackrabbit.oak.spi.security.authentication.PreAuthenticatedLogin
+import org.jetbrains.annotations.NotNull
import org.junit.Before
import org.junit.Ignore
import org.junit.Test
@@ -69,6 +70,8 @@ class TokenAuthenticationTest extends Ab
@Slf4j
private static class PreAuthLoginModule extends AbstractLoginModule {
private MyCredential credential
+
+ @NotNull
@Override
protected Set<Class> getSupportedCredentials() {
return Sets.newHashSet(MyCredential.class)
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java?rev=1848310&r1=1848309&r2=1848310&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java
Thu Dec 6 13:47:34 2018
@@ -25,6 +25,7 @@ import javax.jcr.SimpleCredentials;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -149,13 +150,14 @@ public class CompositeCredentialsSupport
private final Map<String, Object> attributes = new HashMap<String,
Object>();
+ @NotNull
@Override
public Set<Class> getCredentialClasses() {
return ImmutableSet.of(TestCredentials.class);
}
@Override
- public String getUserId(Credentials credentials) {
+ public String getUserId(@NotNull Credentials credentials) {
if (credentials instanceof TestCredentials) {
return "Test1CredentialsSupport";
} else {
@@ -163,8 +165,9 @@ public class CompositeCredentialsSupport
}
}
+ @NotNull
@Override
- public Map<String, ?> getAttributes(Credentials credentials) {
+ public Map<String, ?> getAttributes(@NotNull Credentials credentials) {
if (credentials instanceof TestCredentials) {
return attributes;
} else {
@@ -173,7 +176,7 @@ public class CompositeCredentialsSupport
}
@Override
- public boolean setAttributes(Credentials credentials, Map<String, ?>
attributes) {
+ public boolean setAttributes(@NotNull Credentials credentials,
@NotNull Map<String, ?> attributes) {
if (credentials instanceof TestCredentials) {
this.attributes.putAll(attributes);
return true;
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java?rev=1848310&r1=1848309&r2=1848310&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
Thu Dec 6 13:47:34 2018
@@ -35,6 +35,7 @@ import org.apache.jackrabbit.oak.namepat
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -119,7 +120,7 @@ public class ClearMembershipActionTest {
}
@Override
- public Set<String> addMembers(String... strings) throws
RepositoryException {
+ public Set<String> addMembers(@NotNull String... strings) throws
RepositoryException {
throw new UnsupportedOperationException();
}
@@ -129,7 +130,7 @@ public class ClearMembershipActionTest {
}
@Override
- public Set<String> removeMembers(String... strings) throws
RepositoryException {
+ public Set<String> removeMembers(@NotNull String... strings) throws
RepositoryException {
throw new UnsupportedOperationException();
}
