chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add ech_config options

Browse Source
This commit is contained in:
Safa Safari 2023-05-06 22:47:13 +03:30
parent e02317a348
commit 314edaa170
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/tls/ech_client.go
View File

@ -14,7 +14,7 @@ import (
cftls "github.com/sagernet/cloudflare-tls" cftls "github.com/sagernet/cloudflare-tls"
"github.com/sagernet/sing-box/adapter" "github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/option" "github.com/sagernet/sing-box/option"
"github.com/sagernet/sing-dns" dns "github.com/sagernet/sing-dns"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
mDNS "github.com/miekg/dns" mDNS "github.com/miekg/dns"
@ -179,13 +179,16 @@ func NewECHClient(router adapter.Router, serverAddress string, options option.Ou
} }
tlsConfig.ClientECHConfigs = clientConfig tlsConfig.ClientECHConfigs = clientConfig
} else { } else {
tlsConfig.GetClientECHConfigs = fetchECHClientConfig(router) tlsConfig.GetClientECHConfigs = fetchECHClientConfig(router, options.ECH.EchDomain)
} }
return &ECHClientConfig{&tlsConfig}, nil return &ECHClientConfig{&tlsConfig}, nil
} }
func fetchECHClientConfig(router adapter.Router) func(ctx context.Context, serverName string) ([]cftls.ECHConfig, error) { func fetchECHClientConfig(router adapter.Router, EchDomain string) func(ctx context.Context, serverName string) ([]cftls.ECHConfig, error) {
return func(ctx context.Context, serverName string) ([]cftls.ECHConfig, error) { return func(ctx context.Context, serverName string) ([]cftls.ECHConfig, error) {
if EchDomain != "" {
serverName = EchDomain
}
message := &mDNS.Msg{ message := &mDNS.Msg{
MsgHdr: mDNS.MsgHdr{ MsgHdr: mDNS.MsgHdr{
RecursionDesired: true, RecursionDesired: true,

3
docs/configuration/shared/tls.md
View File

@ -62,7 +62,8 @@
"enabled": false, "enabled": false,
"pq_signature_schemes_enabled": false, "pq_signature_schemes_enabled": false,
"dynamic_record_sizing_disabled": false, "dynamic_record_sizing_disabled": false,
"config": "" "config": "",
"ech_domain": ""
}, },
"utls": { "utls": {
"enabled": false, "enabled": false,

3
docs/configuration/shared/tls.zh.md
View File

@ -62,7 +62,8 @@
"enabled": false, "enabled": false,
"pq_signature_schemes_enabled": false, "pq_signature_schemes_enabled": false,
"dynamic_record_sizing_disabled": false, "dynamic_record_sizing_disabled": false,
"config": "" "config": "",
"ech_domain": ""
}, },
"utls": { "utls": {
"enabled": false, "enabled": false,

1
option/tls.go
View File

@ -50,6 +50,7 @@ type OutboundECHOptions struct {
PQSignatureSchemesEnabled bool `json:"pq_signature_schemes_enabled,omitempty"` PQSignatureSchemesEnabled bool `json:"pq_signature_schemes_enabled,omitempty"`
DynamicRecordSizingDisabled bool `json:"dynamic_record_sizing_disabled,omitempty"` DynamicRecordSizingDisabled bool `json:"dynamic_record_sizing_disabled,omitempty"`
Config string `json:"config,omitempty"` Config string `json:"config,omitempty"`
EchDomain string `json:"ech_domain,omitempty"`
} }
type OutboundUTLSOptions struct { type OutboundUTLSOptions struct {