[jboss-cvs] JBossBlog SVN: r241 - in trunk: lib and 1 other directories.

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

Author: adamw
Date: 2008-03-05 08:55:42 -0500 (Wed, 05 Mar 2008)
New Revision: 241

Added:
   trunk/lib/portal-common-lib.jar
Modified:
   trunk/blog.iml
   trunk/src/portal/org/jboss/blog/session/security/external/PortalSecurityServiceImpl.java
Log:


Modified: trunk/blog.iml
===================================================================
--- trunk/blog.iml	2008-03-05 12:31:55 UTC (rev 240)
+++ trunk/blog.iml	2008-03-05 13:55:42 UTC (rev 241)
@@ -206,6 +206,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/portal-common-lib.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
 </module>

Added: trunk/lib/portal-common-lib.jar
===================================================================
(Binary files differ)


Property changes on: trunk/lib/portal-common-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/portal/org/jboss/blog/session/security/external/PortalSecurityServiceImpl.java
===================================================================
--- trunk/src/portal/org/jboss/blog/session/security/external/PortalSecurityServiceImpl.java	2008-03-05 12:31:55 UTC (rev 240)
+++ trunk/src/portal/org/jboss/blog/session/security/external/PortalSecurityServiceImpl.java	2008-03-05 13:55:42 UTC (rev 241)
@@ -4,6 +4,7 @@
 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 javax.ejb.Stateless;
@@ -64,8 +65,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());