chore: sync sudoku with mihomo log (#2402)

adapter/outbound/sudoku.go

@@ -11,6 +11,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/metacubex/mihomo/log"
+
 	"github.com/saba-futai/sudoku/apis"
 	"github.com/saba-futai/sudoku/pkg/crypto"
 	"github.com/saba-futai/sudoku/pkg/obfs/httpmask"
@@ -38,8 +40,8 @@ type SudokuOption struct {
 	AEADMethod string `proxy:"aead-method,omitempty"`
 	PaddingMin *int   `proxy:"padding-min,omitempty"`
 	PaddingMax *int   `proxy:"padding-max,omitempty"`
-	Seed       string `proxy:"seed,omitempty"`
 	TableType  string `proxy:"table-type,omitempty"` // "prefer_ascii" or "prefer_entropy"
+	HTTPMask   bool   `proxy:"http-mask,omitempty"`
 }
 
 // DialContext implements C.ProxyAdapter
@@ -120,8 +122,10 @@ func (s *Sudoku) buildConfig(metadata *C.Metadata) (*apis.ProtocolConfig, error)
 }
 
 func (s *Sudoku) streamConn(rawConn net.Conn, cfg *apis.ProtocolConfig) (_ net.Conn, err error) {
-	if err = httpmask.WriteRandomRequestHeader(rawConn, cfg.ServerAddress); err != nil {
-		return nil, fmt.Errorf("write http mask failed: %w", err)
+	if !cfg.DisableHTTPMask {
+		if err = httpmask.WriteRandomRequestHeader(rawConn, cfg.ServerAddress); err != nil {
+			return nil, fmt.Errorf("write http mask failed: %w", err)
+		}
 	}
 
 	obfsConn := sudoku.NewConn(rawConn, cfg.Table, cfg.PaddingMin, cfg.PaddingMax, false)
@@ -163,12 +167,14 @@ func NewSudoku(option SudokuOption) (*Sudoku, error) {
 		return nil, fmt.Errorf("table-type must be prefer_ascii or prefer_entropy")
 	}
 
-	seed := option.Seed
-	if seed == "" {
-		seed = option.Key
+	seed := option.Key
+	if recoveredFromKey, err := crypto.RecoverPublicKey(option.Key); err == nil {
+		seed = crypto.EncodePoint(recoveredFromKey)
 	}
 
+	start := time.Now()
 	table := sudoku.NewTable(seed, tableType)
+	log.Infoln("[Sudoku] Tables initialized (%s) in %v", tableType, time.Since(start))
 
 	defaultConf := apis.DefaultConfig()
 	paddingMin := defaultConf.PaddingMin
@@ -194,6 +200,7 @@ func NewSudoku(option SudokuOption) (*Sudoku, error) {
 		PaddingMin:              paddingMin,
 		PaddingMax:              paddingMax,
 		HandshakeTimeoutSeconds: defaultConf.HandshakeTimeoutSeconds,
+		DisableHTTPMask:         !option.HTTPMask,
 	}
 	if option.AEADMethod != "" {
 		baseConf.AEADMethod = option.AEADMethod

docs/config.yaml

@@ -1047,8 +1047,8 @@ proxies: # socks5
     aead-method: chacha20-poly1305 # 可选值：chacha20-poly1305、aes-128-gcm、none 我们保证在none的情况下sudoku混淆层仍然确保安全
     padding-min: 2 # 最小填充字节数
     padding-max: 7 # 最大填充字节数
-    seed: "<seed-or-key>" # 如果使用sudoku生成的ED25519密钥对，请填写密钥对中的公钥（如果你有安全焦虑，填入私钥也可以，只是私钥长度比较长不好看而已），否则填入和服务端相同的uuid
     table-type: prefer_ascii    # 可选值：prefer_ascii、prefer_entropy 前者全ascii映射，后者保证熵值（汉明1）低于3
+    http-mask: true # 是否启用http掩码
 
   # anytls
   - name: anytls
@@ -1587,7 +1587,7 @@ listeners:
     aead-method: chacha20-poly1305 # 支持chacha20-poly1305或者aes-128-gcm以及none，sudoku的混淆层可以确保none情况下数据安全
     padding-min: 1 # 填充最小长度
     padding-max: 15 # 填充最大长度，均不建议过大
-    seed: "<seed-or-key>" # 如果你不使用ED25519密钥对，就请填入客户端的key，否则仍然是公钥
+    seed: "<seed-or-key>" # 如果你不使用ED25519密钥对，就请填入uuid，否则仍然是公钥
     table-type: prefer_ascii # 可选值：prefer_ascii、prefer_entropy 前者全ascii映射，后者保证熵值（汉明1）低于3
     handshake-timeout: 5   # optional
 

go.mod

@@ -43,7 +43,7 @@ require (
 	github.com/mroth/weightedrand/v2 v2.1.0
 	github.com/openacid/low v0.1.21
 	github.com/oschwald/maxminddb-golang v1.12.0 // lastest version compatible with golang1.20
-	github.com/saba-futai/sudoku v0.0.1-e
+	github.com/saba-futai/sudoku v0.0.1-g
 	github.com/sagernet/cors v1.2.1
 	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a
 	github.com/samber/lo v1.52.0

go.sum

@@ -171,8 +171,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
-github.com/saba-futai/sudoku v0.0.1-e h1:PetJcOdoybBWGT1k65puNv+kt6Cmger6i/TSfuu6CdM=
-github.com/saba-futai/sudoku v0.0.1-e/go.mod h1:2ZRzRwz93cS2K/o2yOG4CPJEltcvk5y6vbvUmjftGU0=
+github.com/saba-futai/sudoku v0.0.1-g h1:4q6OuAA6COaRW+CgoQtdim5AUPzzm0uOkvbYpJnOaBE=
+github.com/saba-futai/sudoku v0.0.1-g/go.mod h1:2ZRzRwz93cS2K/o2yOG4CPJEltcvk5y6vbvUmjftGU0=
 github.com/sagernet/cors v1.2.1 h1:Cv5Z8y9YSD6Gm+qSpNrL3LO4lD3eQVvbFYJSG7JCMHQ=
 github.com/sagernet/cors v1.2.1/go.mod h1:O64VyOjjhrkLmQIjF4KGRrJO/5dVXFdpEmCW/eISRAI=
 github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=