svn commit: r1848345 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security: authorization/restriction/ItemNamePattern.java user/UserContext.java user/Utils.java

[angela]

Author: angela
Date: Thu Dec  6 17:47:04 2018
New Revision: 1848345

URL: http://svn.apache.org/viewvc?rev=1848345&view=rev
Log:
OAK-7944 : Minor improvements to oak security code base
- simplify expressions

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNamePattern.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserContext.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/Utils.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNamePattern.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNamePattern.java?rev=1848345&r1=1848344&r2=1848345&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNamePattern.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNamePattern.java
 Thu Dec  6 17:47:04 2018
@@ -51,7 +51,7 @@ class ItemNamePattern implements Restric
 
     @Override
     public boolean matches(@NotNull String path) {
-        return (PathUtils.denotesRoot(path) ? false : 
names.contains(PathUtils.getName(path)));
+        return (!PathUtils.denotesRoot(path) && 
names.contains(PathUtils.getName(path)));
     }
 
     @Override

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserContext.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserContext.java?rev=1848345&r1=1848344&r2=1848345&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserContext.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserContext.java
 Thu Dec  6 17:47:04 2018
@@ -49,10 +49,7 @@ final class UserContext implements Conte
             return PWD_PROPERTY_NAMES.contains(propName);
         } else if (NT_REP_MEMBER_REFERENCES.equals(ntName)) {
             return REP_MEMBERS.equals(propName);
-        } else if (NT_REP_MEMBERS.equals(ntName)) {
-            return true;
-        }
-        return false;
+        } else return NT_REP_MEMBERS.equals(ntName);
     }
 
     @Override

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/Utils.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/Utils.java?rev=1848345&r1=1848344&r2=1848345&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/Utils.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/Utils.java
 Thu Dec  6 17:47:04 2018
@@ -81,18 +81,10 @@ final class Utils {
     }
 
     static boolean canHavePasswordExpired(@NotNull String userId, @NotNull 
ConfigurationParameters config) {
-        if (UserUtil.isAdmin(config, userId) && 
!config.getConfigValue(UserAuthentication.PARAM_PASSWORD_EXPIRY_FOR_ADMIN, 
false)) {
-            return false;
-        } else {
-            return true;
-        }
+        return !UserUtil.isAdmin(config, userId) || 
config.getConfigValue(UserAuthentication.PARAM_PASSWORD_EXPIRY_FOR_ADMIN, 
false);
     }
 
     static boolean canHavePasswordExpired(@NotNull User user, @NotNull 
ConfigurationParameters config) {
-        if (user.isAdmin() && 
!config.getConfigValue(UserAuthentication.PARAM_PASSWORD_EXPIRY_FOR_ADMIN, 
false)) {
-            return false;
-        } else {
-            return true;
-        }
+        return !user.isAdmin() || 
config.getConfigValue(UserAuthentication.PARAM_PASSWORD_EXPIRY_FOR_ADMIN, 
false);
     }
 }