mirror/mihomo
1
1
Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2025-12-19 16:30:07 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

chore: proxy's ech should fetch from proxy-nameserver
Some checks failed
Test / test (1.20, ubuntu-latest) (push) Failing after 1s
Details
Test / test (1.21, ubuntu-latest) (push) Failing after 1s
Details
Test / test (1.22, ubuntu-latest) (push) Failing after 1s
Details
Test / test (1.23, ubuntu-latest) (push) Failing after 0s
Details
Test / test (1.24, ubuntu-latest) (push) Failing after 1s
Details
Trigger CMFA Update / trigger-CMFA-update (push) Failing after 1s
Details
Test / test (1.20, macos-13) (push) Has been cancelled
Details
Test / test (1.20, macos-latest) (push) Has been cancelled
Details
Test / test (1.20, ubuntu-24.04-arm) (push) Has been cancelled
Details
Test / test (1.20, windows-latest) (push) Has been cancelled
Details
Test / test (1.21, macos-13) (push) Has been cancelled
Details
Test / test (1.21, macos-latest) (push) Has been cancelled
Details
Test / test (1.21, ubuntu-24.04-arm) (push) Has been cancelled
Details
Test / test (1.21, windows-latest) (push) Has been cancelled
Details
Test / test (1.22, macos-13) (push) Has been cancelled
Details
Test / test (1.22, macos-latest) (push) Has been cancelled
Details
Test / test (1.22, ubuntu-24.04-arm) (push) Has been cancelled
Details
Test / test (1.22, windows-latest) (push) Has been cancelled
Details
Test / test (1.23, macos-13) (push) Has been cancelled
Details
Test / test (1.23, macos-latest) (push) Has been cancelled
Details
Test / test (1.23, ubuntu-24.04-arm) (push) Has been cancelled
Details
Test / test (1.23, windows-latest) (push) Has been cancelled
Details
Test / test (1.24, macos-13) (push) Has been cancelled
Details
Test / test (1.24, macos-latest) (push) Has been cancelled
Details
Test / test (1.24, ubuntu-24.04-arm) (push) Has been cancelled
Details
Test / test (1.24, windows-latest) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
wwqgtxx 2025-05-22 17:42:40 +08:00
parent 5a21bf3642
commit b1d12a15db
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
adapter/outbound/ech.go
View File

@ -1,10 +1,12 @@
package outbound package outbound
import ( import (
"context"
"encoding/base64" "encoding/base64"
"fmt" "fmt"
"github.com/metacubex/mihomo/component/ech" "github.com/metacubex/mihomo/component/ech"
"github.com/metacubex/mihomo/component/resolver"
) )
type ECHOptions struct { type ECHOptions struct {
@ -22,7 +24,13 @@ func (o ECHOptions) Parse() (*ech.Config, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("base64 decode ech config string failed: %v", err) return nil, fmt.Errorf("base64 decode ech config string failed: %v", err)
} }
echConfig.EncryptedClientHelloConfigList = list echConfig.GetEncryptedClientHelloConfigList = func(ctx context.Context, serverName string) ([]byte, error) {
return list, nil
}
} else {
echConfig.GetEncryptedClientHelloConfigList = func(ctx context.Context, serverName string) ([]byte, error) {
return resolver.ResolveECHWithResolver(ctx, serverName, resolver.ProxyServerHostResolver)
}
} }
return echConfig, nil return echConfig, nil
} }

8
component/ech/ech.go
View File

@ -4,25 +4,21 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/metacubex/mihomo/component/resolver"
tlsC "github.com/metacubex/mihomo/component/tls" tlsC "github.com/metacubex/mihomo/component/tls"
) )
type Config struct { type Config struct {
EncryptedClientHelloConfigList []byte GetEncryptedClientHelloConfigList func(ctx context.Context, serverName string) ([]byte, error)
} }
func (cfg *Config) ClientHandle(ctx context.Context, tlsConfig *tlsC.Config) (err error) { func (cfg *Config) ClientHandle(ctx context.Context, tlsConfig *tlsC.Config) (err error) {
if cfg == nil { if cfg == nil {
return nil return nil
} }
echConfigList := cfg.EncryptedClientHelloConfigList echConfigList, err := cfg.GetEncryptedClientHelloConfigList(ctx, tlsConfig.ServerName)
if len(echConfigList) == 0 {
echConfigList, err = resolver.ResolveECH(ctx, tlsConfig.ServerName)
if err != nil { if err != nil {
return fmt.Errorf("resolve ECH config error: %w", err) return fmt.Errorf("resolve ECH config error: %w", err)
} }
}
tlsConfig.EncryptedClientHelloConfigList = echConfigList tlsConfig.EncryptedClientHelloConfigList = echConfigList
if tlsConfig.MinVersion != 0 && tlsConfig.MinVersion < tlsC.VersionTLS13 { if tlsConfig.MinVersion != 0 && tlsConfig.MinVersion < tlsC.VersionTLS13 {