You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2014/07/04 14:31:19 UTC
svn commit: r1607844 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak:
security/user/UserContext.java spi/security/user/UserConstants.java
Author: angela
Date: Fri Jul 4 12:31:19 2014
New Revision: 1607844
URL: http://svn.apache.org/r1607844
Log:
OAK-1949 : UserContext needs to be adjusted to reflect changes made with OAK-1922
Modified:
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/spi/security/user/UserConstants.java
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=1607844&r1=1607843&r2=1607844&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 Fri Jul 4 12:31:19 2014
@@ -45,6 +45,8 @@ final class UserContext implements Conte
return USER_PROPERTY_NAMES.contains(property.getName());
} else if (NT_REP_GROUP.equals(ntName)) {
return GROUP_PROPERTY_NAMES.contains(property.getName());
+ } else if (NT_REP_PASSWORD.equals(ntName)) {
+ return PWD_PROPERTY_NAMES.contains(property.getName());
} else if (NT_REP_MEMBERS.equals(ntName)) {
return true;
}
@@ -59,7 +61,10 @@ final class UserContext implements Conte
@Override
public boolean definesTree(Tree tree) {
String ntName = TreeUtil.getPrimaryTypeName(tree);
- return NT_REP_GROUP.equals(ntName) || NT_REP_USER.equals(ntName) || NT_REP_MEMBERS.equals(ntName);
+ return NT_REP_GROUP.equals(ntName)
+ || NT_REP_USER.equals(ntName)
+ || NT_REP_MEMBERS.equals(ntName)
+ || NT_REP_PASSWORD.equalsIgnoreCase(ntName);
}
@Override
@@ -71,7 +76,10 @@ final class UserContext implements Conte
} else {
String path = location.getPath();
String name = Text.getName(path);
- if (USER_PROPERTY_NAMES.contains(name) || GROUP_PROPERTY_NAMES.contains(name) || path.contains(REP_MEMBERS)) {
+ if (USER_PROPERTY_NAMES.contains(name)
+ || GROUP_PROPERTY_NAMES.contains(name)
+ || path.contains(REP_MEMBERS)
+ || path.contains(REP_PWD)) {
return true;
} else {
// undefined: unable to determine if the specified location
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConstants.java?rev=1607844&r1=1607843&r2=1607844&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConstants.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConstants.java Fri Jul 4 12:31:19 2014
@@ -63,6 +63,10 @@ public interface UserConstants {
REP_IMPERSONATORS
);
+ Collection<String> PWD_PROPERTY_NAMES = ImmutableSet.of(
+ REP_PASSWORD_LAST_MODIFIED
+ );
+
/**
* Configuration option defining the ID of the administrator user.
*/