hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r765294 - in /httpcomponents/httpclient/trunk: ./ httpclient/src/main/java/org/apache/http/impl/conn/ httpclient/src/test/java/org/apache/http/impl/conn/ httpclient/src/test/java/org/apache/http/mockup/
Date Wed, 15 Apr 2009 18:19:54 GMT
Author: olegk
Date: Wed Apr 15 18:19:53 2009
New Revision: 765294

URL: http://svn.apache.org/viewvc?rev=765294&view=rev
Log:
Fixed problem with the default HTTP response parser failing to handle garbage preceding a
valid HTTP response

Added:
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultResponseParser.java
  (with props)
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java
  (with props)
Modified:
    httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java

Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?rev=765294&r1=765293&r2=765294&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Wed Apr 15 18:19:53 2009
@@ -1,6 +1,10 @@
 Changes since 4.0 beta 2
 -------------------
 
+* Fixed problem with the default HTTP response parser failing to handle garbage 
+  preceding a valid HTTP response.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
 * NonRepeatableRequestExceptions now include the cause that the original
   request failed.
   Contributed by Sam Berlin <sberlin at apache.org>

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java?rev=765294&r1=765293&r2=765294&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java
Wed Apr 15 18:19:53 2009
@@ -35,6 +35,8 @@
 
 import net.jcip.annotations.ThreadSafe;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpException;
 import org.apache.http.HttpMessage;
 import org.apache.http.HttpResponseFactory;
@@ -56,6 +58,8 @@
 @ThreadSafe // no public methods
 public class DefaultResponseParser extends AbstractMessageParser {
     
+    private final Log log = LogFactory.getLog(getClass());
+	
     private final HttpResponseFactory responseFactory;
     private final CharArrayBuffer lineBuf;
     private final int maxGarbageLines;
@@ -80,12 +84,12 @@
     @Override
     protected HttpMessage parseHead(
             final SessionInputBuffer sessionBuffer) throws IOException, HttpException {
-        // clear the buffer
-        this.lineBuf.clear();
         //read out the HTTP status string
         int count = 0;
         ParserCursor cursor = null;
         do {
+            // clear the buffer
+            this.lineBuf.clear();
             int i = sessionBuffer.readLine(this.lineBuf);
             if (i == -1 && count == 0) {
                 // The server just dropped connection on us
@@ -100,6 +104,9 @@
                 throw new ProtocolException("The server failed to respond with a " +
                         "valid HTTP response");
             }
+            if (this.log.isDebugEnabled()) {
+            	this.log.debug("Garbage in response: " + this.lineBuf.toString());
+            }
             count++;
         } while(true);
         //create the status line from the status string

Added: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultResponseParser.java?rev=765294&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultResponseParser.java
(added)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultResponseParser.java
Wed Apr 15 18:19:53 2009
@@ -0,0 +1,162 @@
+/*
+ * $HeadURL$
+ * $Revision$
+ * $Date$
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * 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/>.
+ *
+ */
+
+package org.apache.http.impl.conn;
+
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpVersion;
+import org.apache.http.NoHttpResponseException;
+import org.apache.http.ProtocolException;
+import org.apache.http.conn.params.ConnConnectionPNames;
+import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.io.HttpMessageParser;
+import org.apache.http.io.SessionInputBuffer;
+import org.apache.http.message.BasicLineParser;
+import org.apache.http.mockup.SessionInputBufferMockup;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpParams;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Tests for <code>DefaultResponseParser</code>.
+ */
+public class TestDefaultResponseParser extends TestCase {
+
+    public TestDefaultResponseParser(String testName) {
+        super(testName);
+    }
+
+    public static void main(String args[]) {
+        String[] testCaseName = { TestDefaultResponseParser.class.getName() };
+        junit.textui.TestRunner.main(testCaseName);
+    }
+
+    public static Test suite() {
+        return new TestSuite(TestDefaultResponseParser.class);
+    }
+    
+    public void testResponseParsingWithSomeGarbage() throws Exception {
+    	String s = 
+    		"garbage\r\n" + 
+    		"garbage\r\n" + 
+    		"more garbage\r\n" + 
+    		"HTTP/1.1 200 OK\r\n" + 
+    		"header1: value1\r\n" + 
+    		"header2: value2\r\n" + 
+    		"\r\n"; 
+    	
+    	HttpParams params = new BasicHttpParams();
+    	SessionInputBuffer inbuffer = new SessionInputBufferMockup(s, "US-ASCII", params); 
+    	HttpMessageParser parser = new DefaultResponseParser(
+    			inbuffer, 
+    			BasicLineParser.DEFAULT,
+    			new DefaultHttpResponseFactory(),
+    			params);
+    	
+    	HttpResponse response = (HttpResponse) parser.parse();
+    	assertNotNull(response);
+    	assertEquals(HttpVersion.HTTP_1_1, response.getProtocolVersion());
+    	assertEquals(200, response.getStatusLine().getStatusCode());
+    	
+    	Header[] headers = response.getAllHeaders();
+    	assertNotNull(headers);
+    	assertEquals(2, headers.length);
+    	assertEquals("header1", headers[0].getName());
+    	assertEquals("header2", headers[1].getName());
+    }
+
+    public void testResponseParsingWithTooMuchGarbage() throws Exception {
+    	String s = 
+    		"garbage\r\n" + 
+    		"garbage\r\n" + 
+    		"more garbage\r\n" + 
+    		"HTTP/1.1 200 OK\r\n" + 
+    		"header1: value1\r\n" + 
+    		"header2: value2\r\n" + 
+    		"\r\n"; 
+    	
+    	HttpParams params = new BasicHttpParams();
+    	params.setParameter(ConnConnectionPNames.MAX_STATUS_LINE_GARBAGE, 2);
+    	SessionInputBuffer inbuffer = new SessionInputBufferMockup(s, "US-ASCII", params); 
+    	HttpMessageParser parser = new DefaultResponseParser(
+    			inbuffer, 
+    			BasicLineParser.DEFAULT,
+    			new DefaultHttpResponseFactory(),
+    			params);
+    	
+    	try {
+        	parser.parse();
+        	fail("ProtocolException should have been thrown");
+    	} catch (ProtocolException ex) {
+    	}
+    }
+
+    public void testResponseParsingNoResponse() throws Exception {
+    	HttpParams params = new BasicHttpParams();
+    	SessionInputBuffer inbuffer = new SessionInputBufferMockup("", "US-ASCII", params);

+    	HttpMessageParser parser = new DefaultResponseParser(
+    			inbuffer, 
+    			BasicLineParser.DEFAULT,
+    			new DefaultHttpResponseFactory(),
+    			params);
+    	
+    	try {
+        	parser.parse();
+        	fail("NoHttpResponseException should have been thrown");
+    	} catch (NoHttpResponseException ex) {
+    	}
+    }
+    
+    public void testResponseParsingOnlyGarbage() throws Exception {
+    	String s = 
+    		"garbage\r\n" + 
+    		"garbage\r\n" + 
+    		"more garbage\r\n" + 
+    		"a lot more garbage\r\n";
+    	HttpParams params = new BasicHttpParams();
+    	SessionInputBuffer inbuffer = new SessionInputBufferMockup(s, "US-ASCII", params); 
+    	HttpMessageParser parser = new DefaultResponseParser(
+    			inbuffer, 
+    			BasicLineParser.DEFAULT,
+    			new DefaultHttpResponseFactory(),
+    			params);
+    	
+    	try {
+        	parser.parse();
+        	fail("ProtocolException should have been thrown");
+    	} catch (ProtocolException ex) {
+    	}
+    }
+    
+}

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultResponseParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultResponseParser.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultResponseParser.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java?rev=765294&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java
(added)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java
Wed Apr 15 18:19:53 2009
@@ -0,0 +1,125 @@
+/*
+ * $HeadURL$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * 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/>.
+ *
+ */
+
+package org.apache.http.mockup;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+
+import org.apache.http.impl.io.AbstractSessionInputBuffer;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpParams;
+
+/**
+ * {@link org.apache.http.io.SessionInputBuffer} mockup implementation.
+ */
+public class SessionInputBufferMockup extends AbstractSessionInputBuffer {
+
+    public static final int BUFFER_SIZE = 16;
+    
+    public SessionInputBufferMockup(
+            final InputStream instream, 
+            int buffersize, 
+            final HttpParams params) {
+        super();
+        init(instream, buffersize, params);
+    }
+
+    public SessionInputBufferMockup(
+            final InputStream instream, 
+            int buffersize) {
+        this(instream, buffersize, new BasicHttpParams());
+    }
+
+    public SessionInputBufferMockup(
+            final byte[] bytes, 
+            final HttpParams params) {
+        this(bytes, BUFFER_SIZE, params);
+    }
+
+    public SessionInputBufferMockup(
+            final byte[] bytes) {
+        this(bytes, BUFFER_SIZE, new BasicHttpParams());
+    }
+
+    public SessionInputBufferMockup(
+            final byte[] bytes, 
+            int buffersize, 
+            final HttpParams params) {
+        this(new ByteArrayInputStream(bytes), buffersize, params);
+    }
+
+    public SessionInputBufferMockup(
+            final byte[] bytes, 
+            int buffersize) {
+        this(new ByteArrayInputStream(bytes), buffersize, new BasicHttpParams());
+    }
+
+    public SessionInputBufferMockup(
+            final String s, 
+            final String charset, 
+            int buffersize,
+            final HttpParams params) 
+        throws UnsupportedEncodingException {
+        this(s.getBytes(charset), buffersize, params);
+    }
+    
+    public SessionInputBufferMockup(
+            final String s, 
+            final String charset, 
+            int buffersize) 
+        throws UnsupportedEncodingException {
+        this(s.getBytes(charset), buffersize, new BasicHttpParams());
+    }
+    
+    public SessionInputBufferMockup(
+            final String s, 
+            final String charset,
+            final HttpParams params) 
+        throws UnsupportedEncodingException {
+        this(s.getBytes(charset), params);
+    }
+    
+    public SessionInputBufferMockup(
+            final String s, 
+            final String charset) 
+        throws UnsupportedEncodingException {
+        this(s.getBytes(charset), new BasicHttpParams());
+    
+    }
+    
+    public boolean isDataAvailable(int timeout) throws IOException {
+        return true;
+    }
+
+}

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message