Author: markt
Date: Mon Jun 9 10:08:18 2014
New Revision: 1601333
URL: http://svn.apache.org/r1601333
Log:
Clean-up
i18n for ChunkedInputFilter error message
Add error flag to allow subsequent attempts at reading after an error to fail
fast
Added:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/LocalStrings.properties
- copied unchanged from r1600984,
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings.properties
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1600963,1600978,1600984,1601329-1601330,1601332
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1601333&r1=1601332&r2=1601333&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Mon Jun 9 10:08:18 2014
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.coyote.http11.filters;
import java.io.EOFException;
@@ -29,6 +28,7 @@ import org.apache.tomcat.util.buf.ByteCh
import org.apache.tomcat.util.buf.HexUtils;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.res.StringManager;
/**
* Chunked input filter. Parses chunked data according to
@@ -39,9 +39,11 @@ import org.apache.tomcat.util.http.MimeH
*/
public class ChunkedInputFilter implements InputFilter {
+ private static final StringManager sm = StringManager.getManager(
+ ChunkedInputFilter.class.getPackage().getName());
- // -------------------------------------------------------------- Constants
+ // -------------------------------------------------------------- Constants
protected static final String ENCODING_NAME = "chunked";
protected static final ByteChunk ENCODING = new ByteChunk();
@@ -49,7 +51,6 @@ public class ChunkedInputFilter implemen
// ----------------------------------------------------- Static Initializer
-
static {
ENCODING.setBytes(ENCODING_NAME.getBytes(Charset.defaultCharset()), 0,
ENCODING_NAME.length());
@@ -58,7 +59,6 @@ public class ChunkedInputFilter implemen
// ----------------------------------------------------- Instance Variables
-
/**
* Next buffer in the pipeline.
*/
@@ -106,6 +106,7 @@ public class ChunkedInputFilter implemen
*/
protected ByteChunk trailingHeaders = new ByteChunk();
+
/**
* Flag set to true if the next call to doRead() must parse a CRLF pair
* before doing anything else.
@@ -130,21 +131,29 @@ public class ChunkedInputFilter implemen
*/
private final int maxTrailerSize;
+
/**
* Size of extensions processed for this request.
*/
private long extensionSize;
+ /**
+ * Flag that indicates if an error has occurred.
+ */
+ private boolean error;
+
+
// ----------------------------------------------------------- Constructors
+
public ChunkedInputFilter(int maxTrailerSize, int maxExtensionSize) {
this.trailingHeaders.setLimit(maxTrailerSize);
this.maxExtensionSize = maxExtensionSize;
this.maxTrailerSize = maxTrailerSize;
}
- // ---------------------------------------------------- InputBuffer Methods
+ // ---------------------------------------------------- InputBuffer Methods
/**
* Read bytes.
@@ -156,11 +165,12 @@ public class ChunkedInputFilter implemen
* control, the returned value should be -1.
*/
@Override
- public int doRead(ByteChunk chunk, Request req)
- throws IOException {
-
- if (endChunk)
+ public int doRead(ByteChunk chunk, Request req) throws IOException {
+ if (endChunk) {
return -1;
+ }
+
+ checkError();
if(needCRLFParse) {
needCRLFParse = false;
@@ -169,7 +179,7 @@ public class ChunkedInputFilter implemen
if (remaining <= 0) {
if (!parseChunkHeader()) {
- throw new IOException("Invalid chunk header");
+
throwIOException(sm.getString("chunkedInputFilter.invalidHeader"));
}
if (endChunk) {
parseEndChunk();
@@ -181,8 +191,7 @@ public class ChunkedInputFilter implemen
if (pos >= lastValid) {
if (readBytes() < 0) {
- throw new IOException(
- "Unexpected end of stream whilst reading request
body");
+ throwIOException(sm.getString("chunkedInputFilter.eos"));
}
}
@@ -207,13 +216,11 @@ public class ChunkedInputFilter implemen
}
return result;
-
}
// ---------------------------------------------------- InputFilter Methods
-
/**
* Read the content length from the request.
*/
@@ -227,17 +234,14 @@ public class ChunkedInputFilter implemen
* End the current request.
*/
@Override
- public long end()
- throws IOException {
-
+ public long end() throws IOException {
// Consume extra bytes : parse the stream until the end chunk is found
while (doRead(readChunk, null) >= 0) {
// NOOP: Just consume the input
}
// Return the number of extra bytes which were consumed
- return (lastValid - pos);
-
+ return lastValid - pos;
}
@@ -246,7 +250,7 @@ public class ChunkedInputFilter implemen
*/
@Override
public int available() {
- return (lastValid - pos);
+ return lastValid - pos;
}
@@ -272,6 +276,7 @@ public class ChunkedInputFilter implemen
trailingHeaders.recycle();
trailingHeaders.setLimit(maxTrailerSize);
extensionSize = 0;
+ error = false;
}
@@ -287,12 +292,10 @@ public class ChunkedInputFilter implemen
// ------------------------------------------------------ Protected Methods
-
/**
* Read bytes from the previous buffer.
*/
- protected int readBytes()
- throws IOException {
+ protected int readBytes() throws IOException {
int nRead = buffer.doRead(readChunk, null);
pos = readChunk.getStart();
@@ -300,7 +303,6 @@ public class ChunkedInputFilter implemen
buf = readChunk.getBytes();
return nRead;
-
}
@@ -315,8 +317,7 @@ public class ChunkedInputFilter implemen
* digits. We should not parse F23IAMGONNAMESSTHISUP34CRLF as a valid
* header according to the spec.
*/
- protected boolean parseChunkHeader()
- throws IOException {
+ protected boolean parseChunkHeader() throws IOException {
int result = 0;
boolean eol = false;
@@ -356,7 +357,7 @@ public class ChunkedInputFilter implemen
// validated. Currently it is simply ignored.
extensionSize++;
if (maxExtensionSize > -1 && extensionSize > maxExtensionSize)
{
- throw new IOException("maxExtensionSize exceeded");
+
throwIOException(sm.getString("chunkedInputFilter.maxExtension"));
}
}
@@ -364,21 +365,22 @@ public class ChunkedInputFilter implemen
if (!eol) {
pos++;
}
-
}
- if (readDigit == 0 || result < 0)
+ if (readDigit == 0 || result < 0) {
return false;
+ }
- if (result == 0)
+ if (result == 0) {
endChunk = true;
+ }
remaining = result;
- if (remaining < 0)
+ if (remaining < 0) {
return false;
+ }
return true;
-
}
@@ -405,26 +407,27 @@ public class ChunkedInputFilter implemen
boolean crfound = false;
while (!eol) {
-
if (pos >= lastValid) {
- if (readBytes() <= 0)
- throw new IOException("Invalid CRLF");
+ if (readBytes() <= 0) {
+
throwIOException(sm.getString("chunkedInputFilter.invalidCrlfNoData"));
+ }
}
if (buf[pos] == Constants.CR) {
- if (crfound) throw new IOException("Invalid CRLF, two CR
characters encountered.");
+ if (crfound) {
+
throwIOException(sm.getString("chunkedInputFilter.invalidCrlfCRCR"));
+ }
crfound = true;
} else if (buf[pos] == Constants.LF) {
if (!tolerant && !crfound) {
- throw new IOException("Invalid CRLF, no CR character
encountered.");
+
throwIOException(sm.getString("chunkedInputFilter.invalidCrlfNoCR"));
}
eol = true;
} else {
- throw new IOException("Invalid CRLF");
+
throwIOException(sm.getString("chunkedInputFilter.invalidCrlf"));
}
pos++;
-
}
}
@@ -433,7 +436,6 @@ public class ChunkedInputFilter implemen
* Parse end chunk data.
*/
protected void parseEndChunk() throws IOException {
-
// Handle optional trailer headers
while (parseHeader()) {
// Loop until we run out of headers
@@ -449,8 +451,9 @@ public class ChunkedInputFilter implemen
// Read new bytes if needed
if (pos >= lastValid) {
- if (readBytes() <0)
- throw new EOFException("Unexpected end of stream whilst
reading trailer headers for chunked request");
+ if (readBytes() <0) {
+
throwEOFException(sm.getString("chunkedInputFilter.eosTrailer"));
+ }
}
chr = buf[pos];
@@ -474,8 +477,9 @@ public class ChunkedInputFilter implemen
// Read new bytes if needed
if (pos >= lastValid) {
- if (readBytes() <0)
- throw new EOFException("Unexpected end of stream whilst
reading trailer headers for chunked request");
+ if (readBytes() <0) {
+
throwEOFException(sm.getString("chunkedInputFilter.eosTrailer"));
+ }
}
chr = buf[pos];
@@ -515,8 +519,9 @@ public class ChunkedInputFilter implemen
// Read new bytes if needed
if (pos >= lastValid) {
- if (readBytes() <0)
- throw new EOFException("Unexpected end of stream
whilst reading trailer headers for chunked request");
+ if (readBytes() <0) {
+
throwEOFException(sm.getString("chunkedInputFilter.eosTrailer"));
+ }
}
chr = buf[pos];
@@ -526,7 +531,7 @@ public class ChunkedInputFilter implemen
// limit placed on trailing header size
int newlimit = trailingHeaders.getLimit() -1;
if (trailingHeaders.getEnd() > newlimit) {
- throw new IOException("Exceeded maxTrailerSize");
+
throwIOException(sm.getString("chunkedInputFilter.maxTrailer"));
}
trailingHeaders.setLimit(newlimit);
} else {
@@ -540,8 +545,9 @@ public class ChunkedInputFilter implemen
// Read new bytes if needed
if (pos >= lastValid) {
- if (readBytes() <0)
- throw new EOFException("Unexpected end of stream
whilst reading trailer headers for chunked request");
+ if (readBytes() <0) {
+
throwEOFException(sm.getString("chunkedInputFilter.eosTrailer"));
+ }
}
chr = buf[pos];
@@ -565,8 +571,9 @@ public class ChunkedInputFilter implemen
// Read new bytes if needed
if (pos >= lastValid) {
- if (readBytes() <0)
- throw new EOFException("Unexpected end of stream whilst
reading trailer headers for chunked request");
+ if (readBytes() <0) {
+
throwEOFException(sm.getString("chunkedInputFilter.eosTrailer"));
+ }
}
chr = buf[pos];
@@ -587,4 +594,23 @@ public class ChunkedInputFilter implemen
return true;
}
+
+
+ private void throwIOException(String msg) throws IOException {
+ error = true;
+ throw new IOException(msg);
+ }
+
+
+ private void throwEOFException(String msg) throws IOException {
+ error = true;
+ throw new EOFException(msg);
+ }
+
+
+ private void checkError() throws IOException {
+ if (error) {
+ throw new IOException(sm.getString("chunkedInputFilter.error"));
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
