[jboss-svn-commits] JBL Code SVN: r11686 - in labs/jbosslabs/branches/identity_integration/trunk/portal-extensions: jbwebsite-user-admin/src/java/org/jboss/website/user/util and 2 other directories.

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

Author: sohil.shah at jboss.com
Date: 2007-05-04 12:23:30 -0400 (Fri, 04 May 2007)
New Revision: 11686

Modified:
   labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/login-config.xml
   labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/UsernameAndPasswordLoginModule.java
   labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/
   labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/SyncNukesUsersTestCase.java
Log:


Modified: labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/login-config.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/login-config.xml	2007-05-04 14:53:50 UTC (rev 11685)
+++ labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/login-config.xml	2007-05-04 16:23:30 UTC (rev 11686)
@@ -10,20 +10,12 @@
 <policy>
    <application-policy name="portal">
       <authentication>         
-         <login-module code="org.jboss.website.user.util.UsernameAndPasswordLoginModule" flag="sufficient">
+         <login-module code="org.jboss.website.user.util.UsernameAndPasswordLoginModule" flag="required">
             <module-option name="unauthenticatedIdentity">guest</module-option>                        
-            <module-option name="password-stacking">useFirstPass</module-option>           
-            <module-option name="hashAlgorithm">MD5</module-option>
-            <module-option name="hashEncoding">HEX</module-option>             
+            <module-option name="password-stacking">useFirstPass</module-option>                       
             <module-option name="authenticatedRoles">Authenticated,RegisteredUsers</module-option>
-         </login-module>
-         <login-module code="org.jboss.website.user.util.UsernameAndPasswordLoginModule" flag="sufficient">
-            <module-option name="unauthenticatedIdentity">guest</module-option>                        
-            <module-option name="password-stacking">useFirstPass</module-option>                                    
-            <module-option name="authenticatedRoles">Authenticated,RegisteredUsers</module-option>
-         </login-module>
-         
-         
+         </login-module>         
+                  
          <!--
          <login-module code="org.jboss.labs.login.LabsLoginModule" flag="sufficient">
             <module-option name="unauthenticatedIdentity">guest</module-option>

Modified: labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/UsernameAndPasswordLoginModule.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/UsernameAndPasswordLoginModule.java	2007-05-04 14:53:50 UTC (rev 11685)
+++ labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/UsernameAndPasswordLoginModule.java	2007-05-04 16:23:30 UTC (rev 11686)
@@ -120,17 +120,17 @@
          log.error(e);
       }
    }
-
+   
    /**
     * 
     */
-   protected String getUsersPassword() throws LoginException
+   protected boolean validatePassword(String inputPassword,String expectedPassword)
    {
       boolean syncNeeded = false;
       Identity identity = null;
       try
       {
-         String encryptedPassword = null;
+         boolean loginSuccess = false;
          HttpServletRequest request = (HttpServletRequest) PolicyContext
                .getContext("javax.servlet.http.HttpServletRequest");
 
@@ -163,17 +163,26 @@
                request.getSession().setAttribute("username", this.getUsername());
                throw e;
             }
-
-            encryptedPassword = new String(identity.getPassword());
+            
+            loginSuccess = provider.login(this.getUsername(), inputPassword.getBytes());
+            if(!loginSuccess)
+            {
+               //lets make sure this is not part of sso auto login, in which case input password is already
+               //in the encrypted format. if it is, the verification logic should be
+               String storedPassword = new String(identity.getPassword());
+               if(storedPassword.equalsIgnoreCase(inputPassword))
+               {
+                  loginSuccess = true;
+               }
+            }
          }
-
-         syncNeeded = true;
-         return encryptedPassword.toLowerCase();
+         syncNeeded = true;         
+         return loginSuccess;
       }
       catch (Exception e)
       {
          log.error(this, e);
-         throw new LoginException(e.toString());
+         return false;
       }
       finally
       {
@@ -190,11 +199,19 @@
             catch(Exception e)
             {
                log.error(e);
-               throw new LoginException(e.toString());
+               return false;
             }
          }
       }
    }
+
+   /**
+    * 
+    */
+   protected String getUsersPassword() throws LoginException
+   {
+      return "";
+   }
    
    /**
     * 


Property changes on: labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration
___________________________________________________________________
Name: svn:ignore
   + target


Modified: labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/SyncNukesUsersTestCase.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/SyncNukesUsersTestCase.java	2007-05-04 14:53:50 UTC (rev 11685)
+++ labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/SyncNukesUsersTestCase.java	2007-05-04 16:23:30 UTC (rev 11686)
@@ -115,7 +115,7 @@
             session.beginTransaction();
             
             //read a NukeUserBean            
-            Query query = session.createQuery("from NukeUserBean as u where u.userName='admin' OR u.userName='sohil.shah at jboss.com' OR u.userName='soshah'");
+            Query query = session.createQuery("from NukeUserBean as u");
             
             int counter = 1;            
             for(Iterator itr=query.iterate();itr.hasNext();)