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 dj...@apache.org on 2015/12/15 11:40:46 UTC
svn commit: r1720112 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/security/user/UserAuthentication.java
test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java
Author: dj
Date: Tue Dec 15 10:40:46 2015
New Revision: 1720112
URL: http://svn.apache.org/viewvc?rev=1720112&view=rev
Log:
OAK-3792 : Provide Simple Exception Name in Credentials Attribute for PW Expiry
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserAuthentication.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.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=1720112&r1=1720111&r2=1720112&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 Tue Dec 15 10:40:46 2015
@@ -169,7 +169,7 @@ class UserAuthentication implements Auth
}
}
} catch (PasswordHistoryException e) {
- credentials.setAttribute(e.getClass().getName(), e.getMessage());
+ credentials.setAttribute(e.getClass().getSimpleName(), e.getMessage());
log.error("Failed to change password for user " + userId, e.getMessage());
} catch (RepositoryException e) {
log.error("Failed to change password for user " + userId, e.getMessage());
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java?rev=1720112&r1=1720111&r2=1720112&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java Tue Dec 15 10:40:46 2015
@@ -98,7 +98,7 @@ public class PasswordExpiryHistoryTest e
fail("User password changed in spite of enabled pw history");
} catch (CredentialExpiredException c) {
// success, pw found in history
- Object attr = pwChangeCreds.getAttribute(PasswordHistoryException.class.getName());
+ Object attr = pwChangeCreds.getAttribute(PasswordHistoryException.class.getSimpleName());
assertEquals(
"credentials should contain pw change failure reason",
"New password is identical to the current password.",
@@ -129,7 +129,7 @@ public class PasswordExpiryHistoryTest e
fail("User password changed in spite of enabled pw history");
} catch (CredentialExpiredException c) {
// success, pw found in history
- Object attr = pwChangeCreds.getAttribute(PasswordHistoryException.class.getName());
+ Object attr = pwChangeCreds.getAttribute(PasswordHistoryException.class.getSimpleName());
assertEquals(
"credentials should contain pw change failure reason",
"New password was found in password history.",
@@ -159,7 +159,7 @@ public class PasswordExpiryHistoryTest e
fail("User password changed in spite of expected validation failure");
} catch (CredentialExpiredException c) {
// success, pw found in history
- assertNull(pwChangeCreds.getAttribute(PasswordHistoryException.class.getName()));
+ assertNull(pwChangeCreds.getAttribute(PasswordHistoryException.class.getSimpleName()));
}
}
}