Scarab commit: svn commit: r10636 - trunk/src/java/org/tigris/scarab: om pipeline

Author: jhoech
Date: 2008-10-30 04:59:06-0700
New Revision: 10636

Modified:
   trunk/src/java/org/tigris/scarab/om/ScarabUser.java
   trunk/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java

Log:
FIX - Issue SCB2617: User is checked if confirmed first, before do simple login on automatic ntlm authentication in NTLMLoginValve.
  ADD - constant added to ScarabUser for confirmed value

Modified: trunk/src/java/org/tigris/scarab/om/ScarabUser.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/ScarabUser.java?view=diff&rev=10636&p1=trunk/src/java/org/tigris/scarab/om/ScarabUser.java&p2=trunk/src/java/org/tigris/scarab/om/ScarabUser.java&r1=10635&r2=10636
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/ScarabUser.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/ScarabUser.java	2008-10-30 04:59:06-0700
@@ -73,6 +73,8 @@
 public interface ScarabUser extends User, Persistent
 {
     public static String DELETED = "DELETED";
+    public static String CONFIRMED = "CONFIRMED";
+    
     /**
      * This method is responsible for creating a new user. It will throw an 
      * exception if there is any sort of error (such as a duplicate login id) 

Modified: trunk/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java?view=diff&rev=10636&p1=trunk/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java&p2=trunk/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java&r1=10635&r2=10636
==============================================================================
--- trunk/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java	(original)
+++ trunk/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java	2008-10-30 04:59:06-0700
@@ -162,14 +162,18 @@
                 // Once the user has been authenticated, we'll try logging in Scarab.
                 String creds[] = {ntlm.getUsername(), domainController};
                 ScarabUser user = (ScarabUser)TurbineSecurity.getUser(creds[0]);
-                Login.simpleLogin(data, user);
-                data.setTarget("SelectModule.vm");
                 
-                // Inform the user that s/he's been logged in using NTLM credentials!
-                L10NMessage mesg = new L10NMessage(L10NKeySet.AutomaticallyLoggedIn, creds);
-                ScarabLocalizationTool l10n = new ScarabLocalizationTool();
-                l10n.init(user.getLocale());
-                data.setMessage(mesg.getMessage(l10n));
+                if(user != null && user.getConfirmed().equals(ScarabUser.CONFIRMED))
+                {
+                	Login.simpleLogin(data, user);
+                	
+                	//Inform the user that s/he's been logged in using NTLM credentials!
+                    L10NMessage mesg = new L10NMessage(L10NKeySet.AutomaticallyLoggedIn, creds);
+                    ScarabLocalizationTool l10n = new ScarabLocalizationTool();
+                    l10n.init(user.getLocale());
+                    data.setMessage(mesg.getMessage(l10n));
+                }
+                data.setTarget("SelectModule.vm");
             }
             catch (DataBackendException e)
             {