增加忽略http协议中的content-length的选项

Author: asforest

src/main/java/com/github/balloonupdate/mcpatch/client/config/AppConfig.java

@@ -101,6 +101,12 @@ public class AppConfig {
      */
     public boolean ignoreSSLCertificate;
 
+
+    /**
+     * 是否忽略对http协议中content-length的校验
+     */
+    public boolean ignoreHttpContentLength;
+
     /**
      * 测试模式，开启后每次都会重头更新，会增加流量消耗，仅用来测试更新时网速
      */
@@ -122,6 +128,7 @@ public AppConfig(Map<String, Object> map) {
         int httpTimeout = getInt(map, "http-timeout", null, 7000);
         int reties = getInt(map, "retries", "http-retries", 3);
         boolean ignoreSSLCertificate = getBoolean(map, "ignore-ssl-cert", "http-ignore-certificate", false);
+        boolean ignoreHttpContentLength = getBoolean(map, "ignore-http-content-length", "", false);
         boolean testMode = getBoolean(map, "test-mode", null, false);
 
 //        if (urls.contains("webda"))
@@ -141,6 +148,7 @@ public AppConfig(Map<String, Object> map) {
         this.httpTimeout = httpTimeout;
         this.reties = reties;
         this.ignoreSSLCertificate = ignoreSSLCertificate;
+        this.ignoreHttpContentLength = ignoreHttpContentLength;
         this.testMode = testMode;
     }
 

src/main/java/com/github/balloonupdate/mcpatch/client/network/impl/HttpProtocol.java

@@ -177,17 +177,20 @@ Response request(String path, Range range, String desc) throws McpatchBusinessEx
                 throw new McpatchBusinessException(content);
             }
 
-            // 检查content-length
-            long len = rsp.body().contentLength();
+            if (!config.ignoreHttpContentLength)
+            {
+                // 检查content-length
+                long len = rsp.body().contentLength();
 
-            if (len == -1) {
-                throw new McpatchBusinessException(String.format("服务器(%d)没有返回 content-length 头：%s (%s)", number, path, desc));
-            }
+                if (len == -1) {
+                    throw new McpatchBusinessException(String.format("服务器(%d)没有返回 content-length 头：%s (%s)", number, path, desc));
+                }
 
-            if (range.len() > 0 && len != range.len()) {
-                String text = String.format("服务器(%d)返回的 content-length 头 %d 不等于 %d: %s", number, len, range.len(), path);
+                if (range.len() > 0 && len != range.len()) {
+                    String text = String.format("服务器(%d)返回的 content-length 头 %d 不等于 %d: %s", number, len, range.len(), path);
 
-                throw new McpatchBusinessException(text);
+                    throw new McpatchBusinessException(text);
+                }
             }
 
             return rsp;

src/main/resources/mcpatch.yml

@@ -80,6 +80,9 @@ retries: 3
 # 设置 http 系协议是否忽略SSL证书验证
 ignore-ssl-cert: false
 
+# 是否忽略对http协议中content-length的校验
+ignore-http-content-length: false
+
 # 测试模式，专门用来调试更新时的网速
 # 开启后每次都会重头更新，且不会优化任何文件下载
 # 仅用于测试用途，平时正常使用勿开