remm 2002/09/09 00:56:22
Modified: coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
Added: coyote/src/java/org/apache/coyote/tomcat4
CoyotePrincipal.java
Log:
- Fix bug 12196: expose the principal authenticated by the native webserver.
- Note: This is not compatible with Tomcat's realms, unless we also expose roles.
Revision Changes Path
1.9 +13 -6
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CoyoteAdapter.java 20 Jun 2002 18:53:44 -0000 1.8
+++ CoyoteAdapter.java 9 Sep 2002 07:56:22 -0000 1.9
@@ -309,9 +309,16 @@
// Parse cookies
parseCookies(req, request);
-
- // Set the SSL properties
+
+ // Set the SSL properties
res.action(ActionCode.ACTION_REQ_SSL_ATTRIBUTE,request.getRequest());
+
+ // Set the remote principal
+ String principal = req.getRemoteUser().toString();
+ if (principal != null) {
+ request.setUserPrincipal(new CoyotePrincipal(principal));
+ }
+
}
/**
1.1
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyotePrincipal.java
Index: CoyotePrincipal.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyotePrincipal.java,v
1.1 2002/09/09 07:56:22 remm Exp $
* $Revision: 1.1 $
* $Date: 2002/09/09 07:56:22 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* [Additional notices, if required by prior licensing conditions]
*
*/
package org.apache.coyote.tomcat4;
import java.security.Principal;
/**
* Generic implementation of <strong>java.security.Principal</strong> that
* is used to represent principals authenticated at the protocol handler level.
*
* @author Remy Maucherat
* @version $Revision: 1.1 $ $Date: 2002/09/09 07:56:22 $
*/
public class CoyotePrincipal
implements Principal {
// ----------------------------------------------------------- Constructors
public CoyotePrincipal(String name) {
this.name = name;
}
// ------------------------------------------------------------- Properties
/**
* The username of the user represented by this Principal.
*/
protected String name = null;
public String getName() {
return (this.name);
}
// --------------------------------------------------------- Public Methods
/**
* Return a String representation of this object, which exposes only
* information that should be public.
*/
public String toString() {
StringBuffer sb = new StringBuffer("CoyotePrincipal[");
sb.append(this.name);
sb.append("]");
return (sb.toString());
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
