inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1-MC1 (5.1.0) to HEAD (5.1)

Browse Source 
119076 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117464 gjames: MNT-14892 RA-604 BCRYPT test fix.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jean-Pierre Huynh
2015-12-10 10:02:09 +00:00
parent 8785301cb0
commit db8ac679b6
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/test-java/org/alfresco/repo/security/authentication/AuthenticationTest.java
View File

@@ -1980,13 +1980,27 @@ public class AuthenticationTest extends TestCase
{ {
String SOME_PASSWORD = "1 passw0rd"; String SOME_PASSWORD = "1 passw0rd";
String defaultencoding = compositePasswordEncoder.getPreferredEncoding(); String defaultencoding = compositePasswordEncoder.getPreferredEncoding();
String user1 = "uzer"+GUID.generate();
String user2 = "uzer"+GUID.generate();
List<String> encs = Arrays.asList("bcrypt10", "md4"); List<String> encs = Arrays.asList("bcrypt10", "md4");
final String myTestDomain = TEST_TENANT_DOMAIN+"my.test";
TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork<Object>() {
public Object doWork() throws Exception {
if (!tenantAdminService.existsTenant(myTestDomain)) {
tenantAdminService.createTenant(myTestDomain, TENANT_ADMIN_PW.toCharArray(), null);
}
return null;
}
}, TenantService.DEFAULT_DOMAIN);
for (String enc : encs) for (String enc : encs)
{ {
compositePasswordEncoder.setPreferredEncoding(enc); compositePasswordEncoder.setPreferredEncoding(enc);
String hash = compositePasswordEncoder.encodePreferred(SOME_PASSWORD,null); String hash = compositePasswordEncoder.encodePreferred(SOME_PASSWORD,null);
assertCreateHashed(SOME_PASSWORD, hash, null, "me@you.com"); assertCreateHashed(SOME_PASSWORD, hash, null, user1+ TenantService.SEPARATOR + myTestDomain);
assertCreateHashed(SOME_PASSWORD, null, SOME_PASSWORD.toCharArray(), "you@me.com"); assertCreateHashed(SOME_PASSWORD, null, SOME_PASSWORD.toCharArray(), user2+ TenantService.SEPARATOR + myTestDomain);
} }
compositePasswordEncoder.setPreferredEncoding(defaultencoding); compositePasswordEncoder.setPreferredEncoding(defaultencoding);
} }