You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by lu...@apache.org on 2003/10/17 20:45:40 UTC
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters BufferedInputFilter.java
luehe 2003/10/17 11:45:40
Modified: http11/src/java/org/apache/coyote/http11 Constants.java
Http11Processor.java
Added: http11/src/java/org/apache/coyote/http11/filters
BufferedInputFilter.java
Log:
In case the server needs to reinitiate SSL handshake (with client auth
enabled), consume request body and buffer it, so that it does not
interfere with client's handshake messages.
Many thanks to Bill Barker for helping me with this!
Revision Changes Path
1.21 +8 -2 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Constants.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Constants.java 6 Oct 2003 08:46:04 -0000 1.20
+++ Constants.java 17 Oct 2003 18:45:40 -0000 1.21
@@ -201,7 +201,7 @@
/**
- * Indetity filters (input and output).
+ * Identity filters (input and output).
*/
public static final int IDENTITY_FILTER = 0;
@@ -219,9 +219,15 @@
/**
- * GZIP filters (input and output).
+ * GZIP filter (output).
*/
public static final int GZIP_FILTER = 3;
+
+
+ /**
+ * Buffered filter (input)
+ */
+ public static final int BUFFERED_FILTER = 3;
/**
1.84 +12 -1 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- Http11Processor.java 14 Oct 2003 21:35:21 -0000 1.83
+++ Http11Processor.java 17 Oct 2003 18:45:40 -0000 1.84
@@ -81,6 +81,7 @@
import org.apache.coyote.http11.filters.IdentityOutputFilter;
import org.apache.coyote.http11.filters.VoidInputFilter;
import org.apache.coyote.http11.filters.VoidOutputFilter;
+import org.apache.coyote.http11.filters.BufferedInputFilter;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
import org.apache.tomcat.util.buf.Ascii;
@@ -997,7 +998,14 @@
request.localAddr().setString(localAddr);
} else if (actionCode == ActionCode.ACTION_REQ_SSL_CERTIFICATE) {
- if( sslSupport != null) {
+ if( sslSupport != null) {
+ /*
+ * Consume and buffer the request body, so that it does not
+ * interfere with the client's handshake messages
+ */
+ InputFilter[] inputFilters = inputBuffer.getFilters();
+ inputBuffer.addActiveFilter
+ (inputFilters[Constants.BUFFERED_FILTER]);
try {
Object sslO = sslSupport.getPeerCertificateChain(true);
if( sslO != null) {
@@ -1478,6 +1486,9 @@
// Create and add the void filters.
inputBuffer.addFilter(new VoidInputFilter());
outputBuffer.addFilter(new VoidOutputFilter());
+
+ // Create and add buffered input filter
+ inputBuffer.addFilter(new BufferedInputFilter());
// Create and add the chunked filters.
//inputBuffer.addFilter(new GzipInputFilter());
1.1 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
Index: BufferedInputFilter.java
===================================================================
/*
* ====================================================================
*
* 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 apache@apache.org.
*
* 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.http11.filters;
import java.io.IOException;
import org.apache.coyote.Request;
import org.apache.coyote.InputBuffer;
import org.apache.coyote.http11.InputFilter;
import org.apache.tomcat.util.buf.ByteChunk;
/**
* Input filter responsible for reading and buffering the request body, so that
* it does not interfere with client SSL handshake messages.
*/
public class BufferedInputFilter implements InputFilter {
// -------------------------------------------------------------- Constants
private static final String ENCODING_NAME = "buffered";
private static final ByteChunk ENCODING = new ByteChunk();
// ----------------------------------------------------- Instance Variables
private ByteChunk buffered = new ByteChunk(1024);
private ByteChunk tempRead = new ByteChunk(1024);
private InputBuffer buffer;
private boolean hasRead = false;
// ----------------------------------------------------- Static Initializer
static {
ENCODING.setBytes(ENCODING_NAME.getBytes(), 0, ENCODING_NAME.length());
}
// ---------------------------------------------------- InputBuffer Methods
/**
* Reads the request body and buffers it.
*/
public void setRequest(Request request) {
// save off the Request body
try {
while (buffer.doRead(tempRead, request) >= 0) {
buffered.append(tempRead);
tempRead.recycle();
}
} catch(IOException iex) {
// Ignore
}
}
/**
* Fills the given ByteChunk with the buffered request body.
*/
public int doRead(ByteChunk chunk, Request request) throws IOException {
if (hasRead || buffered.getLength() <= 0) {
return -1;
} else {
chunk.setBytes(buffered.getBytes(), buffered.getStart(),
buffered.getLength());
hasRead = true;
}
return chunk.getLength();
}
public void setBuffer(InputBuffer buffer) {
this.buffer = buffer;
}
public void recycle() {
buffered.recycle();
tempRead.recycle();
hasRead = false;
buffer = null;
}
public ByteChunk getEncodingName() {
return ENCODING;
}
public long end() throws IOException {
return 0;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters
BufferedInputFilter.java
Posted by Remy Maucherat <re...@apache.org>.
luehe@apache.org wrote:
> luehe 2003/10/17 11:45:40
>
> Modified: http11/src/java/org/apache/coyote/http11 Constants.java
> Http11Processor.java
> Added: http11/src/java/org/apache/coyote/http11/filters
> BufferedInputFilter.java
> Log:
> In case the server needs to reinitiate SSL handshake (with client auth
> enabled), consume request body and buffer it, so that it does not
> interfere with client's handshake messages.
>
> Many thanks to Bill Barker for helping me with this!
This patch is sort of rocket science, but seems good :)
Remy
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org