不再对HTTP类请求做Content-Length校验

Author: asforest

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

@@ -105,12 +105,6 @@ public class AppConfig {
      */
     public boolean ignoreSSLCertificate;
 
-
-    /**
-     * 是否忽略对http协议中content-length的校验
-     */
-    public boolean ignoreHttpContentLength;
-
     /**
      * 测试模式，开启后每次都会重头更新，会增加流量消耗，仅用来测试更新时网速
      */
@@ -133,7 +127,6 @@ 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"))
@@ -154,7 +147,6 @@ 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

@@ -3,10 +3,12 @@
 import com.github.balloonupdate.mcpatch.client.config.AppConfig;
 import com.github.balloonupdate.mcpatch.client.data.Range;
 import com.github.balloonupdate.mcpatch.client.exceptions.McpatchBusinessException;
+import com.github.balloonupdate.mcpatch.client.logging.Log;
 import com.github.balloonupdate.mcpatch.client.network.UpdatingServer;
 import com.github.balloonupdate.mcpatch.client.utils.BytesUtils;
 import com.github.balloonupdate.mcpatch.client.utils.ReduceReportingFrequency;
 import com.github.balloonupdate.mcpatch.client.utils.RuntimeAssert;
+import kotlin.Pair;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -160,11 +162,22 @@ Response request(String path, Range range, String desc) throws McpatchBusinessEx
         // 拼接 URL
         String url = baseUrl + path;
 
+        Log.debug("Http Request URL: " + url);
+
         // 构建请求
         Request req = buildRequest(url, range, null);
 
         try {
+
             Response rsp = client.newCall(req).execute();
+
+//            for (Pair<? extends String, ? extends String> header : req.headers()) {
+//                Log.info("Req Header: " + header.component1() + ": " + header.component2());
+//            }
+//            for (Pair<? extends String, ? extends String> header : rsp.headers()) {
+//                Log.info("Rsp Header: " + header.component1() + ": " + header.component2());
+//            }
+
             int code = rsp.code();
 
             // 检查状态码
@@ -177,22 +190,6 @@ Response request(String path, Range range, String desc) throws McpatchBusinessEx
                 throw new McpatchBusinessException(content);
             }
 
-            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 (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);
-                }
-            }
-
             return rsp;
         } catch (ConnectException e) {
             throw new McpatchBusinessException("连接被拒绝，请检查网络。" + url, e);
@@ -246,14 +243,12 @@ public IgnoreSSLCert() {
                 context = SSLContext.getInstance("TLS");
 
                 trustManager = new X509TrustManager() {
-                    public void checkClientTrusted(X509Certificate[] paramArrayOfX509Certificate, String paramString) { }
-
-                    public void checkServerTrusted(X509Certificate[] paramArrayOfX509Certificate, String paramString) { }
-
-                    public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; }
+                    public void checkClientTrusted(X509Certificate[] chain, String authType) {}
+                    public void checkServerTrusted(X509Certificate[] chain, String authType) {}
+                    public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[]{}; }
                 };
 
-                context.init(null, new TrustManager[]{ trustManager }, null);
+                context.init(null, new TrustManager[]{ trustManager }, new java.security.SecureRandom());
             } catch (NoSuchAlgorithmException | KeyManagementException e) {
                 throw new RuntimeException(e);
             }

src/main/resources/mcpatch.yml

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