From 4a4eb331f8ab6d3d15ce4a7150516ec2d4c9abbd Mon Sep 17 00:00:00 2001
From: yangxb2010000 <yangxb2010000@163.com>
Date: Thu, 22 Apr 2021 11:28:22 +0800
Subject: [PATCH] set content-length header for DefaultFullHttpResponse (#1779)

---
 .../term/impl/http/HttpRequestHandler.java    | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/com/taobao/arthas/core/shell/term/impl/http/HttpRequestHandler.java b/core/src/main/java/com/taobao/arthas/core/shell/term/impl/http/HttpRequestHandler.java
index 43c23d9e8..9978a140b 100644
--- a/core/src/main/java/com/taobao/arthas/core/shell/term/impl/http/HttpRequestHandler.java
+++ b/core/src/main/java/com/taobao/arthas/core/shell/term/impl/http/HttpRequestHandler.java
@@ -82,7 +82,7 @@ public class HttpRequestHandler extends SimpleChannelInboundHandler<FullHttpRequ
                 }
 
                 //handle webui requests
-                if (path.equals("/ui")){
+                if (path.equals("/ui")) {
                     response = createRedirectResponse(request, "/ui/");
                 }
                 if (path.equals("/ui/")) {
@@ -90,30 +90,29 @@ public class HttpRequestHandler extends SimpleChannelInboundHandler<FullHttpRequ
                 }
 
                 //try classpath resource first
-                if (response == null){
+                if (response == null) {
                     response = readFileFromResource(request, path);
                 }
 
                 //try output dir later, avoid overlay classpath resources files
-                if (response == null){
-                    response = DirectoryBrowser.directView(dir, path, request,ctx);
+                if (response == null) {
+                    response = DirectoryBrowser.directView(dir, path, request, ctx);
                     isFileResponseFinished = (response == null) ? false : true;
                 }
 
                 //not found
-                if (response == null){
+                if (response == null) {
                     response = createResponse(request, HttpResponseStatus.NOT_FOUND, "Not found");
                 }
             } catch (Throwable e) {
                 logger.error("arthas process http request error: " + request.uri(), e);
             } finally {
                 //If it is null, an error may occur
-                if (response == null){
+                if (response == null) {
                     response = createResponse(request, HttpResponseStatus.INTERNAL_SERVER_ERROR, "Server error");
                 }
-                if(!isFileResponseFinished) {
-                    ctx.write(response);
-                    ChannelFuture future = ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT);
+                if (!isFileResponseFinished) {
+                    ChannelFuture future = writeResponse(ctx, response);
                     future.addListener(ChannelFutureListener.CLOSE);
                     //reuse http api response buf
                     if (isHttpApiResponse && response instanceof DefaultFullHttpResponse) {
@@ -130,6 +129,20 @@ public class HttpRequestHandler extends SimpleChannelInboundHandler<FullHttpRequ
         }
     }
 
+    private ChannelFuture writeResponse(ChannelHandlerContext ctx, HttpResponse response) {
+        // try to add content-length header for DefaultFullHttpResponse
+        if (!HttpUtil.isTransferEncodingChunked(response)
+            && response instanceof DefaultFullHttpResponse) {
+            response.headers().set(HttpHeaderNames.CONTENT_LENGTH,
+                ((DefaultFullHttpResponse) response).content().readableBytes());
+            return ctx.writeAndFlush(response);
+        }
+
+        //chunk response
+        ctx.write(response);
+        return ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT);
+    }
+
     private HttpResponse readFileFromResource(FullHttpRequest request, String path) throws IOException {
         DefaultFullHttpResponse fullResp = null;
         InputStream in = null;
@@ -137,7 +150,7 @@ public class HttpRequestHandler extends SimpleChannelInboundHandler<FullHttpRequ
             URL res = HttpTtyConnection.class.getResource("/com/taobao/arthas/core/http" + path);
             if (res != null) {
                 fullResp = new DefaultFullHttpResponse(request.protocolVersion(),
-                        HttpResponseStatus.OK);
+                    HttpResponseStatus.OK);
                 in = res.openStream();
                 byte[] tmp = new byte[256];
                 for (int l = 0; l != -1; l = in.read(tmp)) {