Author: angela
Date: Fri Dec 14 16:47:19 2018
New Revision: 1848958
URL: http://svn.apache.org/viewvc?rev=1848958&view=rev
Log:
OAK-7944 : Minor improvements to oak security code base
- redundant checks for null
- access modifier can be weaker
- map.foreach instead of loop
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtil.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java?rev=1848958&r1=1848957&r2=1848958&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
Fri Dec 14 16:47:19 2018
@@ -196,7 +196,7 @@ public class ExternalPrincipalConfigurat
private Set<ServiceReference> enablingRefs = new HashSet<>();
private boolean isEnabled = false;
- public SyncConfigTracker(@NotNull BundleContext context, @NotNull
SyncHandlerMappingTracker mappingTracker) {
+ private SyncConfigTracker(@NotNull BundleContext context, @NotNull
SyncHandlerMappingTracker mappingTracker) {
super(context, SyncHandler.class.getName(), null);
this.mappingTracker = mappingTracker;
}
@@ -262,7 +262,7 @@ public class ExternalPrincipalConfigurat
private Map<ServiceReference, String[]> referenceMap = new HashMap<>();
- public SyncHandlerMappingTracker(@NotNull BundleContext context) {
+ private SyncHandlerMappingTracker(@NotNull BundleContext context) {
super(context, SyncHandlerMapping.class.getName(), null);
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.java?rev=1848958&r1=1848957&r2=1848958&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.java
Fri Dec 14 16:47:19 2018
@@ -82,7 +82,7 @@ public class ExternalIdentityImporterTes
}
private static void shutdown(Repository repo) {
- if (repo != null && repo instanceof JackrabbitRepository) {
+ if (repo instanceof JackrabbitRepository) {
((JackrabbitRepository) repo).shutdown();
}
}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java?rev=1848958&r1=1848957&r2=1848958&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
Fri Dec 14 16:47:19 2018
@@ -71,7 +71,7 @@ class CugAccessControlManager extends Ab
private final ConfigurationParameters config;
private final PrincipalManager principalManager;
- public CugAccessControlManager(@NotNull Root root,
+ CugAccessControlManager(@NotNull Root root,
@NotNull NamePathMapper namePathMapper,
@NotNull SecurityProvider securityProvider,
@NotNull Set<String> supportedPaths) {
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtil.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtil.java?rev=1848958&r1=1848957&r2=1848958&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtil.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtil.java
Fri Dec 14 16:47:19 2018
@@ -44,20 +44,20 @@ final class CugUtil implements CugConsta
private CugUtil(){}
- public static boolean hasCug(@NotNull Tree tree) {
+ static boolean hasCug(@NotNull Tree tree) {
return tree.exists() && tree.hasChild(REP_CUG_POLICY);
}
- public static boolean hasCug(@Nullable NodeState state) {
+ static boolean hasCug(@Nullable NodeState state) {
return state != null && state.hasChildNode(REP_CUG_POLICY);
}
- public static boolean hasCug(@Nullable NodeBuilder builder) {
+ static boolean hasCug(@Nullable NodeBuilder builder) {
return builder != null && builder.hasChildNode(REP_CUG_POLICY);
}
@Nullable
- public static Tree getCug(@NotNull Tree tree) {
+ static Tree getCug(@NotNull Tree tree) {
Tree cugTree = (CugUtil.hasCug(tree)) ? tree.getChild(REP_CUG_POLICY)
: null;
if (cugTree != null &&
NT_REP_CUG_POLICY.equals(TreeUtil.getPrimaryTypeName(cugTree))) {
return cugTree;
@@ -66,23 +66,23 @@ final class CugUtil implements CugConsta
}
}
- public static boolean definesCug(@NotNull Tree tree) {
+ static boolean definesCug(@NotNull Tree tree) {
return tree.exists() && REP_CUG_POLICY.equals(tree.getName()) &&
NT_REP_CUG_POLICY.equals(TreeUtil.getPrimaryTypeName(tree));
}
- public static boolean definesCug(@NotNull String name, @NotNull NodeState
state) {
+ static boolean definesCug(@NotNull String name, @NotNull NodeState state) {
return REP_CUG_POLICY.equals(name) &&
NT_REP_CUG_POLICY.equals(NodeStateUtils.getPrimaryTypeName(state));
}
- public static boolean definesCug(@NotNull Tree tree, @NotNull
PropertyState property) {
+ static boolean definesCug(@NotNull Tree tree, @NotNull PropertyState
property) {
return REP_PRINCIPAL_NAMES.equals(property.getName()) &&
definesCug(tree);
}
- public static boolean hasNestedCug(@NotNull Tree cugTree) {
+ static boolean hasNestedCug(@NotNull Tree cugTree) {
return cugTree.hasProperty(CugConstants.HIDDEN_NESTED_CUGS);
}
- public static boolean isSupportedPath(@Nullable String oakPath, @NotNull
Set<String> supportedPaths) {
+ static boolean isSupportedPath(@Nullable String oakPath, @NotNull
Set<String> supportedPaths) {
if (oakPath == null) {
return false;
} else {
@@ -95,7 +95,7 @@ final class CugUtil implements CugConsta
return false;
}
- public static Set<String> getSupportedPaths(@NotNull
ConfigurationParameters params, @NotNull MountInfoProvider mountInfoProvider) {
+ static Set<String> getSupportedPaths(@NotNull ConfigurationParameters
params, @NotNull MountInfoProvider mountInfoProvider) {
Set<String> supportedPaths =
params.getConfigValue(CugConstants.PARAM_CUG_SUPPORTED_PATHS,
ImmutableSet.of());
if (!supportedPaths.isEmpty() &&
mountInfoProvider.hasNonDefaultMounts()) {
for (Mount mount : mountInfoProvider.getNonDefaultMounts()) {
@@ -113,7 +113,7 @@ final class CugUtil implements CugConsta
return supportedPaths;
}
- public static int getImportBehavior(ConfigurationParameters config) {
+ static int getImportBehavior(ConfigurationParameters config) {
String importBehaviorStr =
config.getConfigValue(ProtectedItemImporter.PARAM_IMPORT_BEHAVIOR,
ImportBehavior.NAME_ABORT);
return ImportBehavior.valueFromString(importBehaviorStr);
}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java?rev=1848958&r1=1848957&r2=1848958&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java
Fri Dec 14 16:47:19 2018
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull
*/
class TopLevelPaths implements CugConstants {
- static final long NONE = -1;
+ private static final long NONE = -1;
static final long MAX_CNT = 10;
private final Root root;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java?rev=1848958&r1=1848957&r2=1848958&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
Fri Dec 14 16:47:19 2018
@@ -417,6 +417,7 @@ class TokenProviderImpl implements Token
* new token node.
*
*/
+ @NotNull
private TokenInfo createTokenNode(@NotNull Tree parent, @NotNull String
tokenName,
long expTime, @NotNull String uuid,
@NotNull String id, Map<String, ?>
attributes)
@@ -617,7 +618,7 @@ class TokenProviderImpl implements Token
if (pos > -1) {
tk = tk.substring(pos + 1);
}
- if (key == null || !PasswordUtil.isSame(key, getKeyValue(tk,
userId))) {
+ if (!PasswordUtil.isSame(key, getKeyValue(tk, userId))) {
return false;
}
@@ -632,13 +633,12 @@ class TokenProviderImpl implements Token
// update set of informative attributes on the credentials
// based on the properties present on the token node.
Collection<String> attrNames =
Arrays.asList(tokenCredentials.getAttributeNames());
- for (Map.Entry<String,String> attr : publicAttributes.entrySet()) {
- String name = attr.getKey();
+ publicAttributes.forEach((name, value) -> {
if (!attrNames.contains(name)) {
- tokenCredentials.setAttribute(name, attr.getValue());
+ tokenCredentials.setAttribute(name, value);
}
- }
+ });
return true;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java?rev=1848958&r1=1848957&r2=1848958&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
Fri Dec 14 16:47:19 2018
@@ -130,7 +130,7 @@ class UserPrincipalProvider implements P
public Set<? extends Principal> getPrincipals(@NotNull String userID) {
Set<Principal> principals = new HashSet<>();
Tree tree = userProvider.getAuthorizable(userID);
- if (tree != null && UserUtil.isType(tree, AuthorizableType.USER)) {
+ if (UserUtil.isType(tree, AuthorizableType.USER)) {
Principal userPrincipal = createUserPrincipal(userID, tree);
if (userPrincipal != null) {
principals.add(userPrincipal);
@@ -248,7 +248,7 @@ class UserPrincipalProvider implements P
Iterator<String> groupPaths =
membershipProvider.getMembership(authorizableTree, true);
while (groupPaths.hasNext()) {
Tree groupTree =
userProvider.getAuthorizableByPath(groupPaths.next());
- if (groupTree != null && UserUtil.isType(groupTree,
AuthorizableType.GROUP)) {
+ if (UserUtil.isType(groupTree, AuthorizableType.GROUP)) {
Principal gr = createGroupPrincipal(groupTree);
if (gr != null) {
groupPrincipals.add(gr);
