Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
In directory
james.mmbase.org:/tmp/cvs-serv8478/community/src/java/com/finalist/cmsc/services/community/security
Modified Files:
AuthenticationHibernateService.java
Log Message:
no encoding of password
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
Index: AuthenticationHibernateService.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationHibernateService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- AuthenticationHibernateService.java 8 Feb 2008 15:16:34 -0000 1.5
+++ AuthenticationHibernateService.java 21 Feb 2008 12:47:23 -0000 1.6
@@ -9,18 +9,15 @@
*/
package com.finalist.cmsc.services.community.security;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.beans.factory.annotation.Required;
-
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Restrictions;
-import org.acegisecurity.providers.encoding.MessageDigestPasswordEncoder;
-import org.acegisecurity.providers.encoding.Md5PasswordEncoder;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Required;
+import org.springframework.transaction.annotation.Transactional;
+
import com.finalist.cmsc.services.HibernateService;
/**
@@ -137,10 +134,11 @@
}
private String encodePassword(String password, String salt) {
- MessageDigestPasswordEncoder encoder = new Md5PasswordEncoder();
-// TODO Add salt to password encoder??
-// return encoder.encodePassword(password, salt);
- return encoder.encodePassword(password, null);
+ // MessageDigestPasswordEncoder encoder = new
Md5PasswordEncoder();
+ // // TODO Add salt to password encoder??
+ // // return encoder.encodePassword(password, salt);
+ // return encoder.encodePassword(password, null);
+ return password;
}
/** [EMAIL PROTECTED] */
@@ -153,10 +151,8 @@
/** [EMAIL PROTECTED] */
@Transactional(readOnly = true)
public List<Authentication> findAuthenticationsForAuthority(String
name) {
- Criteria criteria = getSession()
- .createCriteria(Authentication.class)
- .createCriteria("authorities")
- .add(Restrictions.eq("name", name));
+ Criteria criteria =
getSession().createCriteria(Authentication.class).createCriteria("authorities").add(
+ Restrictions.eq("name", name));
return findAuthenticationListByCriteria(criteria);
}
@@ -165,7 +161,7 @@
List<Authentication> result = new ArrayList<Authentication>();
List authenticationList = criteria.list();
for (Iterator iter = authenticationList.iterator();
iter.hasNext();) {
- Authentication authentication =
(Authentication)iter.next();
+ Authentication authentication = (Authentication)
iter.next();
result.add(authentication);
}
return result;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
