Request parsed using UTF-8 charset + Bug Proxy fails when the non-CONNECT HTTP response is chunked ecovaci/winfoom#6 solved

Author: ecovaci

src/main/java/org/kpax/winfoom/proxy/AsynchronousSocketChannelWrapper.java

@@ -16,7 +16,7 @@
 import org.apache.commons.lang3.Validate;
 import org.apache.http.HttpVersion;
 import org.apache.http.ProtocolVersion;
-import org.kpax.winfoom.util.CrlfFormat;
+import org.kpax.winfoom.util.ObjectFormat;
 import org.kpax.winfoom.util.HttpUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,7 +28,6 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.AsynchronousSocketChannel;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 
 /**
  * A helper class that wraps an {@link AsynchronousSocketChannel}.
@@ -65,7 +64,7 @@ OutputStream getOutputStream() {
     }
 
     void write(Object obj) throws IOException {
-        outputStream.write(CrlfFormat.format(obj));
+        outputStream.write(ObjectFormat.toCrlf(obj, ObjectFormat.UTF_8));
     }
 
     void writeln(Object obj) throws IOException {
@@ -74,7 +73,7 @@ void writeln(Object obj) throws IOException {
     }
 
     void writeln() throws IOException {
-        outputStream.write(CrlfFormat.CRLF.getBytes());
+        outputStream.write(ObjectFormat.CRLF.getBytes());
     }
 
     void writelnError(int statusCode, Exception e) {

src/main/java/org/kpax/winfoom/proxy/SocketHandler.java

@@ -12,10 +12,12 @@
 
 package org.kpax.winfoom.proxy;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.http.*;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.config.MessageConstraints;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.execchain.TunnelRefusedException;
@@ -28,6 +30,7 @@
 import org.kpax.winfoom.config.UserConfig;
 import org.kpax.winfoom.util.HttpUtils;
 import org.kpax.winfoom.util.LocalIOUtils;
+import org.kpax.winfoom.util.ObjectFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,7 +106,11 @@ void handleRequest() {
         try {
             // Prepare request parsing (this is the client's request)
             SessionInputBufferImpl inputBuffer = new SessionInputBufferImpl(
-                    new HttpTransportMetricsImpl(), LocalIOUtils.DEFAULT_BUFFER_SIZE);
+                    new HttpTransportMetricsImpl(),
+                    LocalIOUtils.DEFAULT_BUFFER_SIZE,
+                    LocalIOUtils.DEFAULT_BUFFER_SIZE,
+                    MessageConstraints.DEFAULT,
+                    ObjectFormat.UTF_8.newDecoder());
             inputBuffer.bind(localSocketChannel.getInputStream());
 
             // Parse the request (all but the message body )
@@ -306,8 +313,22 @@ private void handleNonConnectResponse(final CloseableHttpResponse response) {
             localSocketChannel.write(response.getStatusLine());
 
             for (Header header : response.getAllHeaders()) {
-                logger.debug("Write response header: {}", header);
-                localSocketChannel.write(header);
+                if (HttpHeaders.TRANSFER_ENCODING.equals(header.getName())) {
+                    // Strip 'chunked' from Transfer-Encoding header's value
+                    // since the response is not chunked
+                    String nonChunkedTransferEncoding = HttpUtils.stripChunked(header.getValue());
+                    if (StringUtils.isNotEmpty(nonChunkedTransferEncoding)) {
+                        localSocketChannel.write(
+                                HttpUtils.createHttpHeader(HttpHeaders.TRANSFER_ENCODING,
+                                        nonChunkedTransferEncoding));
+                        logger.debug("Add chunk-striped header response");
+                    } else {
+                        logger.debug("Remove transfer encoding chunked header response");
+                    }
+                } else {
+                    logger.debug("Write response header: {}", header);
+                    localSocketChannel.write(header);
+                }
             }
 
             // Empty line marking the end

src/main/java/org/kpax/winfoom/util/CrlfFormat.java renamed to src/main/java/org/kpax/winfoom/util/ObjectFormat.java

@@ -14,25 +14,38 @@
 
 import org.apache.commons.lang3.Validate;
 
+import java.nio.charset.Charset;
+
 /**
  * @author Eugen Covaci
  */
-public final class CrlfFormat {
+public final class ObjectFormat {
 
     public static final String CRLF = "\r\n";
 
-    private CrlfFormat() {
+    public static final Charset UTF_8 = Charset.forName("UTF-8");
+
+    private ObjectFormat() {
     }
 
     /**
-     * Calls the <code>input.toString()</code> and appends CRLF.
+     * @see #toCrlf(Object, Charset)
      *
+     */
+    public static byte[] toCrlf(Object input) {
+        Validate.notNull(input, "input cannot be null");
+        return (input + CRLF).getBytes();
+    }
+
+    /**
+     *  Calls the <code>input.toString()</code> and appends CRLF.
      * @param input The object to be formatted (not null).
+     * @param charset The charset to be used (not null).
      * @return The resulted string as bytes.
      */
-    public static byte[] format(Object input) {
+    public static byte[] toCrlf(Object input, Charset charset) {
         Validate.notNull(input, "input cannot be null");
-        return (input + CRLF).getBytes();
+        return (input + CRLF).getBytes(charset);
     }
 
 }