cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config valve.xml

2004-04-15 Thread markt
markt   2004/04/15 14:34:00

  Modified:webapps/tomcat-docs/config valve.xml
  Log:
  - Fix bug 19521. Add warning to RequestDumperValve docs to make users
aware of possible side effects.
  
  Revision  ChangesPath
  1.11  +6 -0  jakarta-tomcat-4.0/webapps/tomcat-docs/config/valve.xml
  
  Index: valve.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/valve.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- valve.xml 6 Mar 2004 10:56:49 -   1.10
  +++ valve.xml 15 Apr 2004 21:34:00 -  1.11
  @@ -267,6 +267,12 @@
   or Context to be logged to the a href=logger.htmlLogger/a that
   corresponds to that container./p
   
  +pstrongWARNING: Using this valve has side-effects./strong
 The
  +output from this valve includes any parameters included with the request.
  +The parameters will be decoded using the default platform encoding. Any
  +subsequent calls to coderequest.setCharacterEncoding()/code within
  +the web application will have no effect./p
  +
 /subsection
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config valve.xml

2004-03-06 Thread markt
markt   2004/03/06 02:56:49

  Modified:webapps/tomcat-docs/config valve.xml
  Log:
  Fix bug 16507. Update valve docs to provide pointer to the Jakarta Regexp docs.
   - Reported by Paul Ramirez
  
  Revision  ChangesPath
  1.10  +12 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/config/valve.xml
  
  Index: valve.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/valve.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- valve.xml 24 Dec 2003 20:40:50 -  1.9
  +++ valve.xml 6 Mar 2004 10:56:49 -   1.10
  @@ -154,6 +154,12 @@
   a href=context.htmlContext/a), and must accept any request
   presented to this container for processing before it will be passed on./p
   
  +pThe syntax for emregular expressions/em is different than that for
  +'standard' wildcard matching. Tomcat uses the
  +a href=http://jakarta.apache.org/regexp/;Jakarta Regexp/a library.
  +Please consult the Regexp documentation for details of the expressions
  +supported./p
  +
 /subsection
   
 subsection name=Attributes
  @@ -204,6 +210,12 @@
   (a href=engine.htmlEngine/a, a href=host.htmlHost/a, or
   a href=context.htmlContext/a), and must accept any request
   presented to this container for processing before it will be passed on./p
  +
  +pThe syntax for emregular expressions/em is different than that for
  +'standard' wildcard matching. Tomcat uses the
  +a href=http://jakarta.apache.org/regexp/;Jakarta Regexp/a library.
  +Please consult the Regexp documentation for details of the expressions
  +supported./p
   
 /subsection
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config valve.xml

2003-12-24 Thread markt
markt   2003/12/24 12:40:50

  Modified:catalina/src/share/org/apache/catalina/authenticator
AuthenticatorBase.java BasicAuthenticator.java
DigestAuthenticator.java FormAuthenticator.java
NonLoginAuthenticator.java SSLAuthenticator.java
SingleSignOn.java
   webapps/tomcat-docs/config valve.xml
  Log:
  - Port of patch from TC5.
  - Fix bugs 4350, 9077, 10040 and 23881.
  - SSO in embedded Tomcat.
  - Patch provided by Brian Stansberry.
  
  Revision  ChangesPath
  1.39  +87 -24
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
  
  Index: AuthenticatorBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- AuthenticatorBase.java18 Jul 2003 04:39:31 -  1.38
  +++ AuthenticatorBase.java24 Dec 2003 20:40:50 -  1.39
  @@ -84,7 +84,6 @@
   import org.apache.catalina.HttpRequest;
   import org.apache.catalina.HttpResponse;
   import org.apache.catalina.Lifecycle;
  -import org.apache.catalina.LifecycleEvent;
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.LifecycleListener;
   import org.apache.catalina.Logger;
  @@ -99,7 +98,6 @@
   import org.apache.catalina.deploy.LoginConfig;
   import org.apache.catalina.deploy.SecurityConstraint;
   import org.apache.catalina.util.LifecycleSupport;
  -import org.apache.catalina.util.RequestUtil;
   import org.apache.catalina.util.StringManager;
   import org.apache.catalina.valves.ValveBase;
   
  @@ -666,7 +664,7 @@
*
* @param request Request we are processing
* @param response Response we are creating
  - * @param login Login configuration describing how authentication
  + * @param configLogin configuration describing how authentication
*  should be performed
*
* @exception IOException if an input/output error occurs
  @@ -817,7 +815,6 @@
   protected synchronized String generateSessionId() {
   
   // Generate a byte array containing a session identifier
  -Random random = getRandom();
   byte bytes[] = new byte[SESSION_ID_BYTES];
   getRandom().nextBytes(bytes);
   bytes = getDigest().digest(bytes);
  @@ -975,6 +972,52 @@
   
   
   /**
  + * Attempts reauthentication to the codeRealm/code using
  + * the credentials included in argument codeentry/code.
  + *
  + * @param ssoId identifier of SingleSignOn session with which the
  + *  caller is associated
  + * @param request   the request that needs to be authenticated
  + */
  +protected boolean reauthenticateFromSSO(String ssoId, HttpRequest request) {
  +
  +if (sso == null || ssoId == null)
  +return false;
  +
  +boolean reauthenticated = false;
  +
  +SingleSignOnEntry entry = sso.lookup(ssoId);
  +if (entry != null  entry.getCanReauthenticate()) {
  +Principal reauthPrincipal = null;
  +Container parent = getContainer();
  +if (parent != null) {
  +Realm realm = getContainer().getRealm();
  +String username = entry.getUsername();
  +if (realm != null  username != null) {
  +reauthPrincipal =
  +realm.authenticate(username, entry.getPassword());
  +}
  +}
  +
  +if (reauthPrincipal != null) {
  +associate(ssoId, getSession(request, true));
  +request.setAuthType(entry.getAuthType());
  +request.setUserPrincipal(reauthPrincipal);
  +
  +reauthenticated = true;
  +if (debug = 1) {
  +log( Reauthenticated cached principal ' +
  +entry.getPrincipal().getName() + ' with auth type ' +
  +entry.getAuthType() + ');
  +}
  +}
  +}
  +
  +return reauthenticated;
  +}
  +
  +
  +/**
* Register an authenticated Principal and authentication type in our
* request, in the current session (if there is one), and with our
* SingleSignOn valve, if there is one.  Set the appropriate cookie
  @@ -998,10 +1041,10 @@
   // Cache the authentication information in our request
   request.setAuthType(authType);
   request.setUserPrincipal(principal);
  -
  +
  +Session session = getSession(request, false);
   // Cache the authentication information in our session, if any
  -if (cache) {
  -Session session = getSession(request, false);
 

cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config valve.xml

2001-10-26 Thread amyroh

amyroh  01/10/26 11:12:01

  Modified:webapps/tomcat-docs/config valve.xml
  Log:
  Add an optional '%S' item for logging user session id in the access log.  This will 
allow to better tracking the activities of a single user session.
  
  Revision  ChangesPath
  1.6   +1 -0  jakarta-tomcat-4.0/webapps/tomcat-docs/config/valve.xml
  
  Index: valve.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/valve.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- valve.xml 2001/10/12 17:09:37 1.5
  +++ valve.xml 2001/10/26 18:12:01 1.6
  @@ -121,6 +121,7 @@
   lib%q/b - Query string (prepended with a '?' if it exists)/li
   lib%r/b - First line of the request (method and request URI)/li
   lib%s/b - HTTP status code of the response/li
  +lib%s/b - User session ID/li
   lib%t/b - Date and time, in Common Log Format/li
   lib%u/b - Remote user that was authenticated (if any), else '-'/li
   lib%U/b - Requested URL path/li
  
  
  



cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config valve.xml

2001-09-30 Thread remm

remm01/09/30 12:37:44

  Modified:webapps/tomcat-docs/config valve.xml
  Log:
  - The Remote Address Filter and Remote Host Filter mention the attribute name
  accept as the attribute needed to accept incoming connections. The attribute
  name that actually works is allow.
  - Patch submitted by Sebastian Fernandez (spf at graphics.cornell.edu)
  
  Revision  ChangesPath
  1.4   +2 -2  jakarta-tomcat-4.0/webapps/tomcat-docs/config/valve.xml
  
  Index: valve.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/valve.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- valve.xml 2001/09/26 02:29:21 1.3
  +++ valve.xml 2001/09/30 19:37:44 1.4
  @@ -167,7 +167,7 @@
   strongorg.apache.catalina.valves.RemoteAddrValve/strong./p
 /attribute
   
  -  attribute name=accept required=false
  +  attribute name=allow required=false
   pA comma-separated list of emregular expression/em patterns
   that the remote client's IP address is compared to.  If this attribute
   is specified, the remote address MUST match for this request to be
  @@ -218,7 +218,7 @@
   strongorg.apache.catalina.valves.RemoteHostValve/strong./p
 /attribute
   
  -  attribute name=accept required=false
  +  attribute name=allow required=false
   pA comma-separated list of emregular expression/em patterns
   that the remote client's hostname is compared to.  If this attribute
   is specified, the remote hostname MUST match for this request to be
  
  
  



cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config valve.xml

2001-09-30 Thread remm

remm01/09/30 12:38:24

  Modified:webapps/tomcat-docs/config Tag: tomcat_40_branch valve.xml
  Log:
  - The Remote Address Filter and Remote Host Filter mention the attribute name
  accept as the attribute needed to accept incoming connections. The attribute
  name that actually works is allow.
  - Patch submitted by Sebastian Fernandez (spf at graphics.cornell.edu)
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.2.2.2   +2 -2  jakarta-tomcat-4.0/webapps/tomcat-docs/config/valve.xml
  
  Index: valve.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/valve.xml,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- valve.xml 2001/09/26 02:28:07 1.2.2.1
  +++ valve.xml 2001/09/30 19:38:24 1.2.2.2
  @@ -167,7 +167,7 @@
   strongorg.apache.catalina.valves.RemoteAddrValve/strong./p
 /attribute
   
  -  attribute name=accept required=false
  +  attribute name=allow required=false
   pA comma-separated list of emregular expression/em patterns
   that the remote client's IP address is compared to.  If this attribute
   is specified, the remote address MUST match for this request to be
  @@ -218,7 +218,7 @@
   strongorg.apache.catalina.valves.RemoteHostValve/strong./p
 /attribute
   
  -  attribute name=accept required=false
  +  attribute name=allow required=false
   pA comma-separated list of emregular expression/em patterns
   that the remote client's hostname is compared to.  If this attribute
   is specified, the remote hostname MUST match for this request to be