From a8f6a6bca0ba919eee22ae8c25f06fd1cb28ae40 Mon Sep 17 00:00:00 2001
From: Saad Hdia <saad.hdia@gmail.com>
Date: Mon, 13 Apr 2026 04:53:36 +0100
Subject: [PATCH] =?UTF-8?q?Fix:=20Refonte=20compl=C3=A8te=20du=20r=C3=A9se?=
 =?UTF-8?q?au=20HTTP/HTTPS=20pour=20la=20compatibilit=C3=A9=20avec=20Cloud?=
 =?UTF-8?q?flare=20et=20TLS=201.2+?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Support HTTPS natif (SNI) : Implémentation du passage par 'SslStream' avec 'AuthenticateAsClient(host)' pour transmettre correctement le Server Name Indication (SNI) aux trackers. Cela corrige l'erreur de port 'plain HTTP' et le rejet imposé par Cloudflare.
- Upgrade .NET 4.8 & TLS : Migration du projet de '.NET Framework 4.0' vers '4.8' et utilisation de 'SslProtocols.None'. Cela active automatiquement l'utilisation des standards de cryptographie modernes (TLS 1.2 et TLS 1.3) pour sécuriser le trafic.
- Correction du blocage Keep-Alive (Timeout 3 mins) : Ajout coercitif du header 'Connection: close' pour les terminaux simulés. Cela force les serveurs (type Nginx/Cloudflare) clôturant le flux à renvoyer le paquet au lieu de figer la boucle 'streamToUse.Read' indéfiniment en HTTP/1.1.
- Nettoyage du Payload : Les requêtes emulées sont maintenant strictement terminées par des retours chariots valides '\r\n\r\n' évitant ainsi l'erreur 400 Bad Request.
- Assainissement : Retrait des anciens analyseurs StyleCop inaccessibles des fichiers '.csproj' bloquant les compilations MSBuild.
---
 .../RatioMaster.Tests.csproj                  |  5 +--
 Source/RatioMaster/RM.cs                      | 41 +++++++++++++++++--
 Source/RatioMaster/RatioMaster.csproj         |  7 +---
 3 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/Source/RatioMaster.Tests/RatioMaster.Tests.csproj b/Source/RatioMaster.Tests/RatioMaster.Tests.csproj
index 9034c62..6f0dd24 100644
--- a/Source/RatioMaster.Tests/RatioMaster.Tests.csproj
+++ b/Source/RatioMaster.Tests/RatioMaster.Tests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -59,9 +59,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Source/RatioMaster/RM.cs b/Source/RatioMaster/RM.cs
index 947d940..63c7bca 100644
--- a/Source/RatioMaster/RM.cs
+++ b/Source/RatioMaster/RM.cs
@@ -1,4 +1,4 @@
-namespace RatioMaster_source
+namespace RatioMaster_source
 {
     using System;
     using System.ComponentModel;
@@ -1622,10 +1622,42 @@ private TrackerResponse MakeWebRequestEx(Uri reqUri)
                     }
                 }
 
-                string cmd = "GET " + path + " " + currentClient.HttpProtocol + "\r\n" + currentClient.Headers.Replace("{host}", host) + "\r\n";
+                string headers = currentClient.Headers.Replace("{host}", host);
+                string lowerCaseHeaders = headers.ToLower();
+                if (!lowerCaseHeaders.Contains("connection: close"))
+                {
+                    headers = headers.TrimEnd('\r', '\n') + "\r\nConnection: close\r\n";
+                }
+                else if (!headers.EndsWith("\r\n"))
+                {
+                    headers += "\r\n";
+                }
+
+                string cmd = "GET " + path + " " + currentClient.HttpProtocol + "\r\n" + headers + "\r\n";
+                cmd = cmd.TrimEnd('\r', '\n') + "\r\n\r\n";
+
                 AddLogLine("======== Sending Command to Tracker ========");
                 AddLogLine(cmd);
-                sock.Send(_usedEnc.GetBytes(cmd));
+
+                Stream streamToUse;
+                NetworkStreamEx ns = new NetworkStreamEx(sock, false);
+                if (reqUri.Scheme.ToLower() == "https")
+                {
+                    System.Net.Security.SslStream sslStream = new System.Net.Security.SslStream(
+                        ns,
+                        false,
+                        delegate { return true; }
+                    );
+                    sslStream.AuthenticateAsClient(host, new System.Security.Cryptography.X509Certificates.X509CertificateCollection(), System.Security.Authentication.SslProtocols.None, false);
+                    streamToUse = sslStream;
+                }
+                else
+                {
+                    streamToUse = ns;
+                }
+
+                byte[] cmdBytes = _usedEnc.GetBytes(cmd);
+                streamToUse.Write(cmdBytes, 0, cmdBytes.Length);
 
                 // simple reading loop
                 // read while have the data
@@ -1635,11 +1667,12 @@ private TrackerResponse MakeWebRequestEx(Uri reqUri)
                     MemoryStream memStream = new MemoryStream();
                     while (true)
                     {
-                        int dataLen = sock.Receive(data);
+                        int dataLen = streamToUse.Read(data, 0, data.Length);
                         if (0 == dataLen)
                             break;
                         memStream.Write(data, 0, dataLen);
                     }
+                    streamToUse.Dispose();
 
                     if (memStream.Length == 0)
                     {
diff --git a/Source/RatioMaster/RatioMaster.csproj b/Source/RatioMaster/RatioMaster.csproj
index 5e47b53..4fa94af 100644
--- a/Source/RatioMaster/RatioMaster.csproj
+++ b/Source/RatioMaster/RatioMaster.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -23,7 +23,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <NoWin32Manifest>true</NoWin32Manifest>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -213,9 +213,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.