From 1e231013b0c22735639417fc49a19135a24d3983 Mon Sep 17 00:00:00 2001 From: AsimA Date: Tue, 22 May 2018 14:57:42 +0200 Subject: [PATCH] Updated the tests to store argon2 as well as md5password --- .../webapp/controller/accounts/UserAccountsSelector.java | 9 +++++---- .../controller/accounts/UserAccountsSelectorTest.java | 7 ++++--- .../vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java | 2 +- .../controller/accounts/UserAccountsSelectorTest.n3 | 2 ++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java index e2ac96c16..6caadf24c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java @@ -37,7 +37,7 @@ public class UserAccountsSelector { + "PREFIX auth: \n"; 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"; @@ -158,7 +158,8 @@ public class UserAccountsSelector { private String optionalClauses() { return "OPTIONAL { ?uri auth:firstName ?firstName } \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:loginCount ?count } \n" + " OPTIONAL { ?uri auth:lastLoginTime ?lastLogin } \n" @@ -245,8 +246,8 @@ public class UserAccountsSelector { user.setEmailAddress(solution.getLiteral("email").getString()); user.setFirstName(ifLiteralPresent(solution, "firstName", "")); user.setLastName(ifLiteralPresent(solution, "lastName", "")); - user.setMd5Password(ifLiteralPresent(solution, "pwd", "")); - user.setArgon2Password(ifLiteralPresent(solution, "pwd", "")); + user.setMd5Password(ifLiteralPresent(solution, "md5pwd", "")); + user.setArgon2Password(ifLiteralPresent(solution, "a2pwd", "")); user.setPasswordLinkExpires(ifLongPresent(solution, "expire", 0L)); user.setLoginCount(ifIntPresent(solution, "count", 0)); user.setLastLoginTime(ifLongPresent(solution, "lastLogin", 0)); diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java index b58b596c1..a66c5998e 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java @@ -81,8 +81,8 @@ public class UserAccountsSelectorTest extends AbstractTestClass { assertEquals("email", "email@jones.edu", acct.getEmailAddress()); assertEquals("firstName", "Bob", acct.getFirstName()); assertEquals("lastName", "Caruso", acct.getLastName()); - assertEquals("password", "garbage", acct.getMd5Password()); - assertEquals("expires", 1100234965897L, acct.getPasswordLinkExpires()); + assertEquals("md5password", "garbage", acct.getMd5Password()); + assertEquals("argon2password", "betterGarbage", acct.getArgon2Password()); assertEquals("loginCount", 50, acct.getLoginCount()); assertEquals("lastLogin", 1020304050607080L, acct.getLastLoginTime()); assertEquals("status", UserAccount.Status.ACTIVE, acct.getStatus()); @@ -105,7 +105,8 @@ public class UserAccountsSelectorTest extends AbstractTestClass { assertEquals("email", "email@henry.edu", acct.getEmailAddress()); assertEquals("firstName", "Mary", acct.getFirstName()); 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("loginCount", 7, acct.getLoginCount()); assertEquals("lastLogin", 1122334455667788L, acct.getLastLoginTime()); diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java index 5f1e35992..9e18f5603 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java @@ -391,7 +391,7 @@ public class UserAccountsDaoJenaTest extends AbstractTestClass { ua.setFirstName(firstName); ua.setLastName(lastName); ua.setArgon2Password(argon2Password); - ua.setMd5Password(""); + ua.setMd5Password(md5Password); ua.setOldPassword(oldPassword); ua.setPasswordLinkExpires(passwordLinkExpires); ua.setPasswordChangeRequired(passwordChangeRequired); diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.n3 b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.n3 index 45f4cfd47..95307fd2e 100644 --- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.n3 +++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.n3 @@ -113,6 +113,7 @@ mydomain:user08 auth:firstName "Mary" ; auth:lastName "McInerney" ; auth:md5password "garbage" ; + auth:argon2password "betterGarbage" ; auth:passwordChangeExpires 0 ; auth:loginCount 7 ; auth:lastLoginTime 1122334455667788 ; @@ -138,6 +139,7 @@ mydomain:user10 auth:firstName "Bob" ; auth:lastName "Caruso" ; auth:md5password "garbage" ; + auth:argon2password "betterGarbage" ; auth:passwordChangeExpires 1100234965897 ; auth:loginCount 50 ; auth:lastLoginTime 1020304050607080 ;