[jboss-cvs] JBossBlog SVN: r355 - branches/feeds100P26/src/portal/org/jboss/blog/session/security/external.

[jboss-cvs-commits at lists.jboss.org]

Author: sviluppatorefico
Date: 2009-03-26 17:53:32 -0400 (Thu, 26 Mar 2009)
New Revision: 355

Modified:
   branches/feeds100P26/src/portal/org/jboss/blog/session/security/external/PortalSecurityServiceImpl.java
Log:


Modified: branches/feeds100P26/src/portal/org/jboss/blog/session/security/external/PortalSecurityServiceImpl.java
===================================================================
--- branches/feeds100P26/src/portal/org/jboss/blog/session/security/external/PortalSecurityServiceImpl.java	2009-03-26 21:47:48 UTC (rev 354)
+++ branches/feeds100P26/src/portal/org/jboss/blog/session/security/external/PortalSecurityServiceImpl.java	2009-03-26 21:53:32 UTC (rev 355)
@@ -1,30 +1,22 @@
 package org.jboss.blog.session.security.external;
 
-import java.util.ArrayList;
-import java.util.List;
+import org.jboss.seam.annotations.*;
+import org.jboss.seam.log.Log;
+import org.jboss.portal.identity.*;
+import org.jboss.portal.identity.Role;
+import org.jboss.portal.common.util.Tools;
+import org.jboss.blog.session.security.InvalidLoginException;
+import org.jboss.blog.tools.StringTools;
 
-import javax.ejb.Remove;
 import javax.ejb.Stateless;
+import javax.ejb.Remove;
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import java.util.List;
+import java.util.ArrayList;
 
-import org.jboss.blog.session.security.InvalidLoginException;
-import org.jboss.blog.tools.StringTools;
-import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.identity.MembershipModule;
-import org.jboss.portal.identity.NoSuchUserException;
-import org.jboss.portal.identity.Role;
-import org.jboss.portal.identity.RoleModule;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.UserModule;
-import org.jboss.portal.identity.UserProfileModule;
-import org.jboss.seam.annotations.AutoCreate;
-import org.jboss.seam.annotations.Logger;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.log.Log;
-
 /**
  * @author Adam Warski (adam at warski dot org)
  */
@@ -91,8 +83,14 @@
             throw new PortalSecurityException(e);
         }
 
-        if (!user.validatePassword(password)) {
-           throw new InvalidLoginException();
+        if ("admin".equals(username)) {
+            if (!user.validatePassword(password)) {
+                throw new InvalidLoginException();
+            }
+        } else {
+            if (!user.validatePassword(Tools.md5AsHexString(password))) {
+                throw new InvalidLoginException();
+            }
         }
 
         return new PortalUser(user.getId().toString(), user.getUserName(), getUserEmail(user));