litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated the tests to store argon2 as well as md5password

Browse source
This commit is contained in:
AsimA 2018-05-22 14:57:42 +02:00
parent 96388c0951
commit 1e231013b0
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java
View file

@ -37,7 +37,7 @@ public class UserAccountsSelector {
+ "PREFIX auth: <http://vitro.mannlib.cornell.edu/ns/vitro/authorization#> \n"; + "PREFIX auth: <http://vitro.mannlib.cornell.edu/ns/vitro/authorization#> \n";
private static final String ALL_VARIABLES = "?uri ?email ?firstName " private static final String ALL_VARIABLES = "?uri ?email ?firstName "
+ "?lastName ?pwd ?expire ?count ?lastLogin ?status ?isRoot"; + "?lastName ?md5pwd ?a2pwd ?expire ?count ?lastLogin ?status ?isRoot";
private static final String COUNT_VARIABLE = "?uri"; private static final String COUNT_VARIABLE = "?uri";
@ -158,7 +158,8 @@ public class UserAccountsSelector {
private String optionalClauses() { private String optionalClauses() {
return "OPTIONAL { ?uri auth:firstName ?firstName } \n" return "OPTIONAL { ?uri auth:firstName ?firstName } \n"
+ " OPTIONAL { ?uri auth:lastName ?lastName } \n" + " OPTIONAL { ?uri auth:lastName ?lastName } \n"
+ " OPTIONAL { ?uri auth:md5password ?pwd } \n" + " OPTIONAL { ?uri auth:md5password ?md5pwd } \n"
+ " OPTIONAL { ?uri auth:argon2password ?a2pwd } \n"
+ " OPTIONAL { ?uri auth:passwordChangeExpires ?expire } \n" + " OPTIONAL { ?uri auth:passwordChangeExpires ?expire } \n"
+ " OPTIONAL { ?uri auth:loginCount ?count } \n" + " OPTIONAL { ?uri auth:loginCount ?count } \n"
+ " OPTIONAL { ?uri auth:lastLoginTime ?lastLogin } \n" + " OPTIONAL { ?uri auth:lastLoginTime ?lastLogin } \n"
@ -245,8 +246,8 @@ public class UserAccountsSelector {
user.setEmailAddress(solution.getLiteral("email").getString()); user.setEmailAddress(solution.getLiteral("email").getString());
user.setFirstName(ifLiteralPresent(solution, "firstName", "")); user.setFirstName(ifLiteralPresent(solution, "firstName", ""));
user.setLastName(ifLiteralPresent(solution, "lastName", "")); user.setLastName(ifLiteralPresent(solution, "lastName", ""));
user.setMd5Password(ifLiteralPresent(solution, "pwd", "")); user.setMd5Password(ifLiteralPresent(solution, "md5pwd", ""));
user.setArgon2Password(ifLiteralPresent(solution, "pwd", "")); user.setArgon2Password(ifLiteralPresent(solution, "a2pwd", ""));
user.setPasswordLinkExpires(ifLongPresent(solution, "expire", 0L)); user.setPasswordLinkExpires(ifLongPresent(solution, "expire", 0L));
user.setLoginCount(ifIntPresent(solution, "count", 0)); user.setLoginCount(ifIntPresent(solution, "count", 0));
user.setLastLoginTime(ifLongPresent(solution, "lastLogin", 0)); user.setLastLoginTime(ifLongPresent(solution, "lastLogin", 0));

7
api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java
View file

@ -81,8 +81,8 @@ public class UserAccountsSelectorTest extends AbstractTestClass {
assertEquals("email", "email@jones.edu", acct.getEmailAddress()); assertEquals("email", "email@jones.edu", acct.getEmailAddress());
assertEquals("firstName", "Bob", acct.getFirstName()); assertEquals("firstName", "Bob", acct.getFirstName());
assertEquals("lastName", "Caruso", acct.getLastName()); assertEquals("lastName", "Caruso", acct.getLastName());
assertEquals("password", "garbage", acct.getMd5Password()); assertEquals("md5password", "garbage", acct.getMd5Password());
assertEquals("expires", 1100234965897L, acct.getPasswordLinkExpires()); assertEquals("argon2password", "betterGarbage", acct.getArgon2Password());
assertEquals("loginCount", 50, acct.getLoginCount()); assertEquals("loginCount", 50, acct.getLoginCount());
assertEquals("lastLogin", 1020304050607080L, acct.getLastLoginTime()); assertEquals("lastLogin", 1020304050607080L, acct.getLastLoginTime());
assertEquals("status", UserAccount.Status.ACTIVE, acct.getStatus()); assertEquals("status", UserAccount.Status.ACTIVE, acct.getStatus());
@ -105,7 +105,8 @@ public class UserAccountsSelectorTest extends AbstractTestClass {
assertEquals("email", "email@henry.edu", acct.getEmailAddress()); assertEquals("email", "email@henry.edu", acct.getEmailAddress());
assertEquals("firstName", "Mary", acct.getFirstName()); assertEquals("firstName", "Mary", acct.getFirstName());
assertEquals("lastName", "McInerney", acct.getLastName()); assertEquals("lastName", "McInerney", acct.getLastName());
assertEquals("password", "garbage", acct.getMd5Password()); assertEquals("md5password", "garbage", acct.getMd5Password());
assertEquals("argon2password", "betterGarbage", acct.getArgon2Password());
assertEquals("expires", 0L, acct.getPasswordLinkExpires()); assertEquals("expires", 0L, acct.getPasswordLinkExpires());
assertEquals("loginCount", 7, acct.getLoginCount()); assertEquals("loginCount", 7, acct.getLoginCount());
assertEquals("lastLogin", 1122334455667788L, acct.getLastLoginTime()); assertEquals("lastLogin", 1122334455667788L, acct.getLastLoginTime());

2
api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java
View file

@ -391,7 +391,7 @@ public class UserAccountsDaoJenaTest extends AbstractTestClass {
ua.setFirstName(firstName); ua.setFirstName(firstName);
ua.setLastName(lastName); ua.setLastName(lastName);
ua.setArgon2Password(argon2Password); ua.setArgon2Password(argon2Password);
ua.setMd5Password(""); ua.setMd5Password(md5Password);
ua.setOldPassword(oldPassword); ua.setOldPassword(oldPassword);
ua.setPasswordLinkExpires(passwordLinkExpires); ua.setPasswordLinkExpires(passwordLinkExpires);
ua.setPasswordChangeRequired(passwordChangeRequired); ua.setPasswordChangeRequired(passwordChangeRequired);

2
api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.n3
View file

@ -113,6 +113,7 @@ mydomain:user08
auth:firstName "Mary" ; auth:firstName "Mary" ;
auth:lastName "McInerney" ; auth:lastName "McInerney" ;
auth:md5password "garbage" ; auth:md5password "garbage" ;
auth:argon2password "betterGarbage" ;
auth:passwordChangeExpires 0 ; auth:passwordChangeExpires 0 ;
auth:loginCount 7 ; auth:loginCount 7 ;
auth:lastLoginTime 1122334455667788 ; auth:lastLoginTime 1122334455667788 ;
@ -138,6 +139,7 @@ mydomain:user10
auth:firstName "Bob" ; auth:firstName "Bob" ;
auth:lastName "Caruso" ; auth:lastName "Caruso" ;
auth:md5password "garbage" ; auth:md5password "garbage" ;
auth:argon2password "betterGarbage" ;
auth:passwordChangeExpires 1100234965897 ; auth:passwordChangeExpires 1100234965897 ;
auth:loginCount 50 ; auth:loginCount 50 ;
auth:lastLoginTime 1020304050607080 ; auth:lastLoginTime 1020304050607080 ;