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

Author: jhoech
Date: 2008-11-20 03:45:58-0800
New Revision: 10646

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

Log:
FIX - correction for commit in revision 10636: confirm data from Turbine security is used for checking a user for its confirmed status to avoid automatic login of deleted users
  DEL - introduced constant for confirmation value "CONFIRMED" deleted again from ScarabUser

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=10646&p1=trunk/src/java/org/tigris/scarab/om/ScarabUser.java&p2=trunk/src/java/org/tigris/scarab/om/ScarabUser.java&r1=10645&r2=10646
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/ScarabUser.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/ScarabUser.java	2008-11-20 03:45:58-0800
@@ -73,7 +73,6 @@
 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 

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=10646&p1=trunk/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java&p2=trunk/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java&r1=10645&r2=10646
==============================================================================
--- trunk/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java	(original)
+++ trunk/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java	2008-11-20 03:45:58-0800
@@ -8,6 +8,7 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.fulcrum.security.entity.User;
 import org.apache.fulcrum.security.util.DataBackendException;
 import org.apache.fulcrum.security.util.UnknownEntityException;
 import org.apache.log4j.Logger;
@@ -163,7 +164,7 @@
                 String creds[] = {ntlm.getUsername(), domainController};
                 ScarabUser user = (ScarabUser)TurbineSecurity.getUser(creds[0]);
                 
-                if(user != null && user.getConfirmed().equals(ScarabUser.CONFIRMED))
+                if(user != null && user.getConfirmed().equals(User.CONFIRM_DATA))
                 {
                 	Login.simpleLogin(data, user);