You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/02/13 21:24:15 UTC

cvs commit: jakarta-turbine-3/src/rttest/testapp/WEB-INF/conf TurbineResources.properties

jvanzyl     02/02/13 12:24:15

  Modified:    conf     Tag: rundata_security_changes
                        turbine-classic-pipeline.xml
               src/java/org/apache/turbine Tag: rundata_security_changes
                        Turbine.java
               src/java/org/apache/turbine/security/fulcrum Tag:
                        rundata_security_changes AccessController.java
                        DefaultACLCreationValve.java
                        DefaultSessionValidationValve.java LoginUser.java
                        LogoutUser.java TemplateSecureSessionValidator.java
                        TemplateSessionValidator.java
               src/rttest/testapp/WEB-INF/conf Tag:
                        rundata_security_changes
                        TurbineResources.properties
  Added:       src/java/org/apache/turbine/security/fulcrum Tag:
                        rundata_security_changes NullSessionValidator.java
  Log:
  - i now have the tests passing with a subclassed version of RunData, right
    now it's working by upcasting. i'm currently thinking i would like to push
    the whole app model into an ApplicationModel and access the security from
    within that and come up with the minimum number of messages required for
    security communication between an app model and and servlet view in
    this case. if security was handled within the model than it would be
    easy to make a GUI app as well. just musings ... i just wanted to get
    it to work. i'll try a more sophisticated test, probably work on it
    a couple more days before merging
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.2   +3 -7      jakarta-turbine-3/conf/turbine-classic-pipeline.xml
  
  Index: turbine-classic-pipeline.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/conf/turbine-classic-pipeline.xml,v
  retrieving revision 1.3.2.1
  retrieving revision 1.3.2.2
  diff -u -r1.3.2.1 -r1.3.2.2
  --- turbine-classic-pipeline.xml	5 Feb 2002 15:38:51 -0000	1.3.2.1
  +++ turbine-classic-pipeline.xml	13 Feb 2002 20:24:14 -0000	1.3.2.2
  @@ -4,13 +4,9 @@
       <valve className="org.apache.turbine.pipeline.DetermineActionValve"/>
       <valve className="org.apache.turbine.pipeline.DetermineTargetValve"/>
       <valve className="org.apache.turbine.pipeline.DefaultSessionTimeoutValve"/>
  -    
  -    <!--
  -    <valve className="org.apache.turbine.pipeline.DefaultLoginValve"/>
  -    <valve className="org.apache.turbine.pipeline.DefaultSessionValidationValve"/>
  -    <valve className="org.apache.turbine.pipeline.DefaultACLCreationValve"/>
  -    -->
  -    
  +    <valve className="org.apache.turbine.security.fulcrum.DefaultLoginValve"/>
  +    <valve className="org.apache.turbine.security.fulcrum.DefaultSessionValidationValve"/>
  +    <valve className="org.apache.turbine.security.fulcrum.DefaultACLCreationValve"/>
       <valve className="org.apache.turbine.pipeline.DefaultActionValve"/>
       <valve className="org.apache.turbine.pipeline.RunModulesValve"/>
       <valve className="org.apache.turbine.pipeline.DefaultTargetValve"/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.24.2.4  +2 -1      jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java
  
  Index: Turbine.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java,v
  retrieving revision 1.24.2.3
  retrieving revision 1.24.2.4
  diff -u -r1.24.2.3 -r1.24.2.4
  --- Turbine.java	8 Feb 2002 17:08:39 -0000	1.24.2.3
  +++ Turbine.java	13 Feb 2002 20:24:14 -0000	1.24.2.4
  @@ -123,7 +123,7 @@
    * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
    * @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
  - * @version $Id: Turbine.java,v 1.24.2.3 2002/02/08 17:08:39 jvanzyl Exp $
  + * @version $Id: Turbine.java,v 1.24.2.4 2002/02/13 20:24:14 jvanzyl Exp $
    */
   public class Turbine
       extends HttpServlet
  @@ -684,6 +684,7 @@
   
               Log.debug("[Turbine] Using descriptor path: " + descriptorPath);
               Mapper m = new Mapper();
  +            m.setDebug(true);
               pipeline = (Pipeline) m.map(descriptorPath,pipelineClass.getName());
           }
           else
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +2 -2      jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/AccessController.java
  
  Index: AccessController.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/AccessController.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- AccessController.java	8 Feb 2002 02:52:03 -0000	1.1.2.1
  +++ AccessController.java	13 Feb 2002 20:24:14 -0000	1.1.2.2
  @@ -90,7 +90,7 @@
    *
    * @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
    * @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
  - * @version $Id: AccessController.java,v 1.1.2.1 2002/02/08 02:52:03 jvanzyl Exp $
  + * @version $Id: AccessController.java,v 1.1.2.2 2002/02/13 20:24:14 jvanzyl Exp $
    */
   public class AccessController
       extends Action
  @@ -109,7 +109,7 @@
       public void doPerform( RunData data )
           throws Exception
       {
  -        DefaultTurbineRunData d = (DefaultTurbineRunData)data;
  +        FulcrumRunData d = (FulcrumRunData)data;
           
           if (d.getUser() != null && d.getUser().hasLoggedIn())
           {
  
  
  
  1.1.2.2   +4 -3      jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/DefaultACLCreationValve.java
  
  Index: DefaultACLCreationValve.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/DefaultACLCreationValve.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- DefaultACLCreationValve.java	8 Feb 2002 02:52:03 -0000	1.1.2.1
  +++ DefaultACLCreationValve.java	13 Feb 2002 20:24:14 -0000	1.1.2.2
  @@ -69,13 +69,14 @@
   import org.apache.turbine.ValveContext;
   import org.apache.turbine.pipeline.AbstractValve;
   import org.apache.turbine.RunData;
  +import org.apache.turbine.services.rundata.DefaultTurbineRunData;
   
   /**
    * Implements the action portion of the "Turbine classic" processing
    * pipeline (from the Turbine 2.x series).
    *
    * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  - * @version $Id: DefaultACLCreationValve.java,v 1.1.2.1 2002/02/08 02:52:03 jvanzyl Exp $
  + * @version $Id: DefaultACLCreationValve.java,v 1.1.2.2 2002/02/13 20:24:14 jvanzyl Exp $
    */
   public class DefaultACLCreationValve
       extends AbstractValve
  @@ -99,8 +100,8 @@
           {
               // Get the instance of the AccessController.
               accessController = (AccessController)
  -                r.getModule(ACTIONS, Turbine.getConfiguration()
  -                    .getString(ACTION_ACCESS_CONTROLLER));
  +                Class.forName(Turbine.getConfiguration()
  +                    .getString(ACTION_ACCESS_CONTROLLER)).newInstance();
           }
       }
   
  
  
  
  1.1.2.2   +3 -3      jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/DefaultSessionValidationValve.java
  
  Index: DefaultSessionValidationValve.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/DefaultSessionValidationValve.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- DefaultSessionValidationValve.java	8 Feb 2002 02:52:03 -0000	1.1.2.1
  +++ DefaultSessionValidationValve.java	13 Feb 2002 20:24:14 -0000	1.1.2.2
  @@ -76,7 +76,7 @@
    * pipeline (from the Turbine 2.x series).
    *
    * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  - * @version $Id: DefaultSessionValidationValve.java,v 1.1.2.1 2002/02/08 02:52:03 jvanzyl Exp $
  + * @version $Id: DefaultSessionValidationValve.java,v 1.1.2.2 2002/02/13 20:24:14 jvanzyl Exp $
    */
   public class DefaultSessionValidationValve
       extends AbstractValve
  @@ -100,8 +100,8 @@
           {
               // Get the instance of the Session Validator.
               sessionValidator = (SessionValidator)
  -                r.getModule(ACTIONS, Turbine.getConfiguration()
  -                    .getString(ACTION_SESSION_VALIDATOR));
  +                Class.forName(Turbine.getConfiguration()
  +                    .getString(ACTION_SESSION_VALIDATOR)).newInstance();
           }
       }
   
  
  
  
  1.1.2.2   +3 -2      jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/LoginUser.java
  
  Index: LoginUser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/LoginUser.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- LoginUser.java	8 Feb 2002 02:52:04 -0000	1.1.2.1
  +++ LoginUser.java	13 Feb 2002 20:24:14 -0000	1.1.2.2
  @@ -62,6 +62,7 @@
   import org.apache.turbine.Log;
   import org.apache.fulcrum.security.util.DataBackendException;
   import org.apache.fulcrum.security.util.TurbineSecurityException;
  +import org.apache.turbine.services.rundata.DefaultTurbineRunData;
   
   /**
    * This is where we authenticate the user logging into the system
  @@ -69,7 +70,7 @@
    * that users last login time will be updated.
    *
    * @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
  - * @version $Id: LoginUser.java,v 1.1.2.1 2002/02/08 02:52:04 jvanzyl Exp $
  + * @version $Id: LoginUser.java,v 1.1.2.2 2002/02/13 20:24:14 jvanzyl Exp $
    */
   public class LoginUser
       extends Action
  @@ -91,7 +92,7 @@
       public void doPerform( RunData data )
           throws Exception
       {
  -        DefaultTurbineRunData d = (DefaultTurbineRunData)data;
  +        FulcrumRunData d = (FulcrumRunData)data;
   
           // This prevents a db hit on second Action call during page
           // generation.  Turbine removes everything from the Session
  
  
  
  1.1.2.2   +3 -2      jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/LogoutUser.java
  
  Index: LogoutUser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/LogoutUser.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- LogoutUser.java	8 Feb 2002 02:52:04 -0000	1.1.2.1
  +++ LogoutUser.java	13 Feb 2002 20:24:14 -0000	1.1.2.2
  @@ -61,13 +61,14 @@
   import org.apache.fulcrum.security.TurbineSecurity;
   import org.apache.turbine.Log;
   import org.apache.fulcrum.security.util.AccessControlList;
  +import org.apache.turbine.services.rundata.DefaultTurbineRunData;
   
   /**
    * This action removes a user from the session. It makes sure to save
    * the User object in the session.
    *
    * @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
  - * @version $Id: LogoutUser.java,v 1.1.2.1 2002/02/08 02:52:04 jvanzyl Exp $
  + * @version $Id: LogoutUser.java,v 1.1.2.2 2002/02/13 20:24:14 jvanzyl Exp $
    */
   public class LogoutUser
       extends Action
  @@ -92,7 +93,7 @@
       public void doPerform( RunData data )
           throws Exception
       {
  -        DefaultTurbineRunData d = (DefaultTurbineRunData)data;
  +        FulcrumRunData d = (FulcrumRunData)data;
           
           User user = d.getUser();
   
  
  
  
  1.1.2.2   +3 -2      jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/TemplateSecureSessionValidator.java
  
  Index: TemplateSecureSessionValidator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/TemplateSecureSessionValidator.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- TemplateSecureSessionValidator.java	8 Feb 2002 02:52:04 -0000	1.1.2.1
  +++ TemplateSecureSessionValidator.java	13 Feb 2002 20:24:14 -0000	1.1.2.2
  @@ -56,6 +56,7 @@
   
   import org.apache.turbine.Turbine;
   import org.apache.turbine.RunData;
  +import org.apache.turbine.services.rundata.DefaultTurbineRunData;
   
   /**
    * SessionValidator that requires login for use with the WebMacroSite
  @@ -77,7 +78,7 @@
    *
    * @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
    * @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
  - * @version $Id: TemplateSecureSessionValidator.java,v 1.1.2.1 2002/02/08 02:52:04 jvanzyl Exp $
  + * @version $Id: TemplateSecureSessionValidator.java,v 1.1.2.2 2002/02/13 20:24:14 jvanzyl Exp $
    */
   public class TemplateSecureSessionValidator
       extends TemplateSessionValidator
  @@ -96,7 +97,7 @@
       public void doPerform( RunData data )
           throws Exception
       {
  -        DefaultTurbineRunData d = (DefaultTurbineRunData)data;
  +        FulcrumRunData d = (FulcrumRunData)data;
   
           // Pull user from session.
           d.populate();
  
  
  
  1.1.2.2   +5 -4      jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/TemplateSessionValidator.java
  
  Index: TemplateSessionValidator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/TemplateSessionValidator.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- TemplateSessionValidator.java	8 Feb 2002 02:52:04 -0000	1.1.2.1
  +++ TemplateSessionValidator.java	13 Feb 2002 20:24:14 -0000	1.1.2.2
  @@ -58,6 +58,7 @@
   import org.apache.turbine.RunData;
   import org.apache.fulcrum.security.TurbineSecurity;
   import org.apache.turbine.Log;
  +import org.apache.turbine.services.rundata.DefaultTurbineRunData;
   
   /**
    * SessionValidator for use with the Template Service, the
  @@ -71,7 +72,7 @@
    * @see TemplateSecureSessionValidator
    * @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
    * @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
  - * @version $Id: TemplateSessionValidator.java,v 1.1.2.1 2002/02/08 02:52:04 jvanzyl Exp $
  + * @version $Id: TemplateSessionValidator.java,v 1.1.2.2 2002/02/13 20:24:14 jvanzyl Exp $
    */
   public class TemplateSessionValidator
       extends SessionValidator
  @@ -92,7 +93,7 @@
       public void doPerform(RunData data)
           throws Exception
       {
  -        DefaultTurbineRunData d = (DefaultTurbineRunData)data;
  +        FulcrumRunData d = (FulcrumRunData)data;
   
           // pull user from session, update access times, counters
           d.populate();
  @@ -118,7 +119,7 @@
   
       protected void setTarget(RunData data)
       {
  -        DefaultTurbineRunData d = (DefaultTurbineRunData)data;
  +        FulcrumRunData d = (FulcrumRunData)data;
           String target = d.getParameters().getString("template");
   
           if (target != null)
  @@ -134,7 +135,7 @@
   
       protected void processCounter(RunData data)
       {
  -        DefaultTurbineRunData d = (DefaultTurbineRunData)data;
  +        FulcrumRunData d = (FulcrumRunData)data;
           // See comments in screens.error.InvalidState.
           if (d.getParameters().getInt(COUNTER) <
               (((Integer)d.getUser().getTemp(COUNTER)).intValue() - 1) )
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +82 -0     jakarta-turbine-3/src/java/org/apache/turbine/security/fulcrum/Attic/NullSessionValidator.java
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +5 -4      jakarta-turbine-3/src/rttest/testapp/WEB-INF/conf/TurbineResources.properties
  
  Index: TurbineResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/src/rttest/testapp/WEB-INF/conf/TurbineResources.properties,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- TurbineResources.properties	22 Jan 2002 13:56:01 -0000	1.3
  +++ TurbineResources.properties	13 Feb 2002 20:24:15 -0000	1.3.2.1
  @@ -1,5 +1,5 @@
   # -------------------------------------------------------------------
  -# $Id: TurbineResources.properties,v 1.3 2002/01/22 13:56:01 jvanzyl Exp $
  +# $Id: TurbineResources.properties,v 1.3.2.1 2002/02/13 20:24:15 jvanzyl Exp $
   #
   # This is the configuration file for Turbine.
   #
  @@ -221,7 +221,7 @@
   #
   # Default: SessionValidator
   
  -action.sessionvalidator=NullSessionValidator
  +action.sessionvalidator=org.apache.turbine.security.fulcrum.NullSessionValidator
   
   # This is the timeout in seconds for sessions. If left commented out, the
   # servlet container's default timeout will be left as is.
  @@ -231,7 +231,7 @@
   # This is the default action that builds up the AccessControlList for
   # the individual users session.
   
  -action.accesscontroller=AccessController
  +action.accesscontroller=org.apache.turbine.security.fulcrum.AccessController
   
   # Set the default Doctype.  The default Doctype can be set by using
   # the single strings: Html40Strict, Html40Transitional, or
  @@ -383,7 +383,8 @@
   # in the place of the <default> key.  
   # -------------------------------------------------------------------
   
  -services.RunDataService.default.run.data=org.apache.turbine.services.rundata.DefaultTurbineRunData
  +#services.RunDataService.default.run.data=org.apache.turbine.services.rundata.DefaultTurbineRunData
  +services.RunDataService.default.run.data=org.apache.turbine.security.fulcrum.FulcrumRunData
   services.RunDataService.default.parameter.parser=org.apache.turbine.ParameterParser
   services.RunDataService.default.cookie.parser=org.apache.fulcrum.util.parser.DefaultCookieParser
   
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>