Bug fixes. Removed HTTP/2 support. That was fucking things up a bit.

MohammadEfhamiCc · Dec 4, 2024 · 738fed2 · 738fed2
1 parent 74dad3a
commit 738fed2
Show file tree

Hide file tree

Showing 13 changed files with 186 additions and 216 deletions.
diff --git a/bin/checksums.txt b/bin/checksums.txt
@@ -1,14 +1,14 @@
 # DarkFlare Binary Checksums
-# Generated: Tue Dec  3 19:19:42 UTC 2024
+# Generated: Wed Dec  4 15:13:34 UTC 2024
 
-d74d77f413a7607cb742678bb2cc35ea009ef9e9bedeb8f6461a4f5222c52a33  checksums.txt
-444278a858153540bc7b8ba97435d6d73e93e5fb93cc767373606463b1410c16  darkflare-client-darwin-amd64
-3d2eb54b97b4aa09949d94985e1dcc6fff363b22be8362d26b45e2f258403f98  darkflare-client-darwin-arm64
-46de95f637486958231679b1ea53f5bb724c9b731d323c9cf0528c5cd2dc41d9  darkflare-client-linux-amd64
-866618bb5ca641a8fa78823fa2dc4d235086c47d8ae7a2210613fd9b94bd4681  darkflare-client-linux-arm64
-4dc79e82b47ce82ca894431756c0f9b5620fcc0d228bdbefbd106b7c354c17cd  darkflare-client-windows-amd64.exe
-0df41165f843f3e53c9de5d9c5ec94660696d20cc6b6da3f28fe9ddaee696e4f  darkflare-server-darwin-amd64
-05d6156bd38ac90784ff4b862cbc83d9c77b047237f0d731b10faf78b728878c  darkflare-server-darwin-arm64
-88a2c60f99d0372d7e71593f724fbedef1a5cdd4c53eb215e87f969f6d6788ae  darkflare-server-linux-amd64
-404ed6254b31f39ee42a6906d9b1a6d2af8050e2f81df14316ac95e9db3f9c70  darkflare-server-linux-arm64
-9178c5f3f06182ef150237b8aa97802679b2def2edde271c909c81271aca7a6b  darkflare-server-windows-amd64.exe
+dcb32ff048378506046d364cd2c226ba0f8d137a49a924670a9f7c434a8d3049  checksums.txt
+192bf6b64d0849325882c2f8e626fffc7bd3414c47fccdc14b582bae2f161c36  darkflare-client-darwin-amd64
+4362838083f35051ff6dae482b754b875c8413e9c3ac73363257cd752c8e3751  darkflare-client-darwin-arm64
+a500646c956354f087c74f2553d3ace97d3c45fcc1b7523fe6a8020b73bc6546  darkflare-client-linux-amd64
+ac31b5ad270c58232e97d9075e5e2edd92f3d1f3fac794d6ffa22cc2ea98cd74  darkflare-client-linux-arm64
+c963e061ff460230a76ceed0caa34575e8eea716a1845be37d2aa25f913c6547  darkflare-client-windows-amd64.exe
+066cec69f0535357477f375e930a4177ec113b8ca9fe4a9d93a9e8ea5871a989  darkflare-server-darwin-amd64
+e2e6289a82224326f83f09ffffc0d81c1687a59faae53ec76bee202efa21c432  darkflare-server-darwin-arm64
+6b2dfc3eff05d72acdd1987c07083aaf95fad39fd21058efd114d8d41a16fde3  darkflare-server-linux-amd64
+000e4aeff6dadf39c2ce764b75570589562bf43ace691278da115a9e37e7c52b  darkflare-server-linux-arm64
+efdca3b075f561dfeac9f0713d8f47a5e95017b2541c083f8bedf2250dd50fd0  darkflare-server-windows-amd64.exe
diff --git a/bin/darkflare-client-darwin-amd64 b/bin/darkflare-client-darwin-amd64
diff --git a/bin/darkflare-client-darwin-arm64 b/bin/darkflare-client-darwin-arm64
diff --git a/bin/darkflare-client-linux-amd64 b/bin/darkflare-client-linux-amd64
diff --git a/bin/darkflare-client-linux-arm64 b/bin/darkflare-client-linux-arm64
diff --git a/bin/darkflare-client-windows-amd64.exe b/bin/darkflare-client-windows-amd64.exe
diff --git a/bin/darkflare-server-darwin-amd64 b/bin/darkflare-server-darwin-amd64
diff --git a/bin/darkflare-server-darwin-arm64 b/bin/darkflare-server-darwin-arm64
diff --git a/bin/darkflare-server-linux-amd64 b/bin/darkflare-server-linux-amd64
diff --git a/bin/darkflare-server-linux-arm64 b/bin/darkflare-server-linux-arm64
diff --git a/bin/darkflare-server-windows-amd64.exe b/bin/darkflare-server-windows-amd64.exe
diff --git a/client/main.go b/client/main.go
@@ -21,6 +21,8 @@ import (
 	"sync"
 	"time"
 
+	"crypto/x509"
+
 	"golang.org/x/time/rate"
 )
 
@@ -91,33 +93,46 @@ func NewClient(cloudflareHost string, destPort int, scheme string, destAddr stri
 		batchSize: 64 * 1024, // 64KB batch size
 	}
 
+	// Load system root CAs
+	rootCAs, err := x509.SystemCertPool()
+	if err != nil {
+		log.Printf("Warning: failed to load system cert pool: %v", err)
+		rootCAs = x509.NewCertPool()
+		if rootCAs == nil {
+			log.Fatal("Failed to create cert pool")
+		}
+	}
+
 	transport := &http.Transport{
 		TLSClientConfig: &tls.Config{
+			RootCAs:    rootCAs,
 			MinVersion: tls.VersionTLS12,
-			MaxVersion: tls.VersionTLS13,
 			CurvePreferences: []tls.CurveID{
 				tls.X25519,
 				tls.CurveP256,
+				tls.CurveP384,
 			},
 			CipherSuites: []uint16{
 				tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
 				tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+				tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+				tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+				tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+				tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
 			},
-			PreferServerCipherSuites: true,
+			PreferServerCipherSuites: false,
 			SessionTicketsDisabled:   false,
 			InsecureSkipVerify:       false,
-			Renegotiation:            tls.RenegotiateNever,
+			NextProtos:               []string{"http/1.1"}, // Force HTTP/1.1
 		},
-		MaxIdleConns:          100,
-		IdleConnTimeout:       90 * time.Second,
-		DisableCompression:    true,
-		ForceAttemptHTTP2:     !client.isDirectMode(),
-		MaxIdleConnsPerHost:   100,
-		MaxConnsPerHost:       100,
-		WriteBufferSize:       64 * 1024,
-		ReadBufferSize:        64 * 1024,
-		ResponseHeaderTimeout: 30 * time.Second,
-		ExpectContinueTimeout: 1 * time.Second,
+		MaxIdleConns:        100,
+		IdleConnTimeout:     90 * time.Second,
+		DisableCompression:  true,
+		ForceAttemptHTTP2:   false, // Disable HTTP/2
+		MaxIdleConnsPerHost: 100,
+		MaxConnsPerHost:     100,
+		WriteBufferSize:     64 * 1024,
+		ReadBufferSize:      64 * 1024,
 	}
 
 	client.httpClient = &http.Client{