Revision: 5438
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=5438&view=revAuthor: josegar74
Date: 2009-11-04 13:20:52 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Fixed authentication test
Modified Paths:
--------------
sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-services/src/test/java/org/geonetwork/gaap/services/AuthenticationServiceTest.java
Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-services/src/test/java/org/geonetwork/gaap/services/AuthenticationServiceTest.java
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-services/src/test/java/org/geonetwork/gaap/services/AuthenticationServiceTest.java 2009-11-04 13:12:20 UTC (rev 5437)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-services/src/test/java/org/geonetwork/gaap/services/AuthenticationServiceTest.java 2009-11-04 13:20:52 UTC (rev 5438)
@@ -9,6 +9,9 @@
import java.util.Set;
import java.util.HashSet;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.io.UnsupportedEncodingException;
/**
* Test class for AuthenticationService
@@ -41,13 +44,13 @@
groupService.createGroup(group);
user.setUsername("user1");
- user.setPassword("password");
+ user.setPassword(scramble("password"));
Set<Group> userGroups = new HashSet<Group>();
userGroups.add(group);
user.setUserGroups(userGroups);
userService.createUser(user);
- String token = authenticationService.authenticate(user.getUsername(), user.getPassword());
+ String token = authenticationService.authenticate(user.getUsername(), "password");
assertNotNull(token);
assertTrue(authenticationService.verifyUserToken(user.getUsername(), token));
@@ -75,13 +78,13 @@
groupService.createGroup(group);
user.setUsername("user1");
- user.setPassword("password");
+ user.setPassword(scramble("password"));
Set<Group> userGroups = new HashSet<Group>();
userGroups.add(group);
user.setUserGroups(userGroups);
userService.createUser(user);
- String token = authenticationService.authenticate(user.getUsername(), user.getPassword());
+ String token = authenticationService.authenticate(user.getUsername(), "password");
assertNotNull(token);
// Use a non valid token
@@ -97,4 +100,32 @@
fail();
}
}
+
+
+ /**
+ * Calculates SHA-1 encryption of a text
+ *
+ * @param text
+ * @return
+ */
+ private static String scramble(String text) {
+ try {
+ MessageDigest md = MessageDigest.getInstance("SHA-1");
+
+ md.update(text.getBytes("UTF-8"));
+
+ StringBuffer sb = new StringBuffer();
+
+ for (byte b : md.digest())
+ sb.append(Integer.toString(b & 0xFF, 16));
+
+ return sb.toString();
+ }
+ catch (UnsupportedEncodingException e) {
+ return null;
+ }
+ catch (NoSuchAlgorithmException e) {
+ return null;
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now.
http://p.sf.net/sfu/bobj-july_______________________________________________
GeoNetwork-commit mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-commit