Author: angela
Date: Thu Oct 2 13:42:36 2014
New Revision: 1628969
URL: http://svn.apache.org/r1628969
Log:
minor improvement
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserAuthentication.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserAuthentication.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserAuthentication.java?rev=1628969&r1=1628968&r2=1628969&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserAuthentication.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserAuthentication.java
Thu Oct 2 13:42:36 2014
@@ -129,7 +129,7 @@ class UserAuthentication implements Auth
} else if (credentials instanceof ImpersonationCredentials) {
ImpersonationCredentials ipCreds = (ImpersonationCredentials)
credentials;
AuthInfo info = ipCreds.getImpersonatorInfo();
- success = equalUserId(ipCreds) && impersonate(info, user);
+ success = equalUserId(ipCreds, userId) && impersonate(info,
user);
checkSuccess(success, "Impersonation not allowed.");
} else {
// guest login is allowed if an anonymous user exists in the
content (see get user above)
@@ -148,6 +148,11 @@ class UserAuthentication implements Auth
}
}
+ private static boolean equalUserId(@Nonnull ImpersonationCredentials
creds, @Nonnull String userId) {
+ Credentials base = creds.getBaseCredentials();
+ return (base instanceof SimpleCredentials) &&
userId.equals(((SimpleCredentials) base).getUserID());
+ }
+
private boolean changePassword(User user, SimpleCredentials credentials) {
try {
Object newPasswordObject =
credentials.getAttribute(CREDENTIALS_ATTRIBUTE_NEWPASSWORD);
@@ -172,11 +177,6 @@ class UserAuthentication implements Auth
return false;
}
- private boolean equalUserId(ImpersonationCredentials creds) {
- Credentials base = creds.getBaseCredentials();
- return (base instanceof SimpleCredentials) &&
userId.equals(((SimpleCredentials) base).getUserID());
- }
-
private boolean impersonate(AuthInfo info, User user) {
try {
if (user.getID().equals(info.getUserID())) {
