新增ECH客户端支持 #3162
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| //go:build go1.23 | ||
| // +build go1.23 | ||
|
|
||
| package tls | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "crypto/tls" | ||
| "io" | ||
| "net/http" | ||
| "sync" | ||
| "time" | ||
|
|
||
| "github.com/miekg/dns" | ||
| "github.com/v2fly/v2ray-core/v5/common/net" | ||
| "github.com/v2fly/v2ray-core/v5/transport/internet" | ||
| ) | ||
|
|
||
| func ApplyECH(c *Config, config *tls.Config) error { | ||
| var ECHConfig []byte | ||
| var err error | ||
|
|
||
| if len(c.EchConfig) > 0 { | ||
| ECHConfig = c.EchConfig | ||
| } else { // ECH config > DOH lookup | ||
| if config.ServerName == "" { | ||
| return newError("Using DOH for ECH needs serverName") | ||
| } | ||
| ECHConfig, err = QueryRecord(c.ServerName, c.Ech_DOHserver) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| config.EncryptedClientHelloConfigList = ECHConfig | ||
| return nil | ||
| } | ||
|
|
||
| type record struct { | ||
| record []byte | ||
| expire time.Time | ||
| } | ||
|
|
||
| var ( | ||
| dnsCache = make(map[string]record) | ||
| mutex sync.RWMutex | ||
| ) | ||
|
|
||
| func QueryRecord(domain string, server string) ([]byte, error) { | ||
| mutex.Lock() | ||
| rec, found := dnsCache[domain] | ||
| if found && rec.expire.After(time.Now()) { | ||
| mutex.Unlock() | ||
| return rec.record, nil | ||
| } | ||
| mutex.Unlock() | ||
|
|
||
| newError("Trying to query ECH config for domain: ", domain, " with ECH server: ", server).AtDebug().WriteToLog() | ||
| record, ttl, err := dohQuery(server, domain) | ||
| if err != nil { | ||
| return []byte{}, err | ||
| } | ||
|
|
||
| if ttl < 600 { | ||
| ttl = 600 | ||
| } | ||
|
|
||
| mutex.Lock() | ||
| defer mutex.Unlock() | ||
| rec.record = record | ||
| rec.expire = time.Now().Add(time.Second * time.Duration(ttl)) | ||
| dnsCache[domain] = rec | ||
| return record, nil | ||
| } | ||
|
|
||
| func dohQuery(server string, domain string) ([]byte, uint32, error) { | ||
| m := new(dns.Msg) | ||
| m.SetQuestion(dns.Fqdn(domain), dns.TypeHTTPS) | ||
| m.Id = 0 | ||
| msg, err := m.Pack() | ||
| if err != nil { | ||
| return []byte{}, 0, err | ||
| } | ||
| tr := &http.Transport{ | ||
| IdleConnTimeout: 90 * time.Second, | ||
| ForceAttemptHTTP2: true, | ||
| DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) { | ||
| dest, err := net.ParseDestination(network + ":" + addr) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| conn, err := internet.DialSystem(ctx, dest, nil) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return conn, nil | ||
| }, | ||
| } | ||
| client := &http.Client{ | ||
| Timeout: 5 * time.Second, | ||
| Transport: tr, | ||
| } | ||
| req, err := http.NewRequest("POST", server, bytes.NewReader(msg)) | ||
| if err != nil { | ||
| return []byte{}, 0, err | ||
| } | ||
| req.Header.Set("Content-Type", "application/dns-message") | ||
| resp, err := client.Do(req) | ||
| if err != nil { | ||
| return []byte{}, 0, err | ||
| } | ||
| defer resp.Body.Close() | ||
| respBody, err := io.ReadAll(resp.Body) | ||
| if err != nil { | ||
| return []byte{}, 0, err | ||
| } | ||
| if resp.StatusCode != http.StatusOK { | ||
| return []byte{}, 0, newError("query failed with response code:", resp.StatusCode) | ||
| } | ||
| respMsg := new(dns.Msg) | ||
| err = respMsg.Unpack(respBody) | ||
| if err != nil { | ||
| return []byte{}, 0, err | ||
| } | ||
| if len(respMsg.Answer) > 0 { | ||
| for _, answer := range respMsg.Answer { | ||
| if https, ok := answer.(*dns.HTTPS); ok && https.Hdr.Name == dns.Fqdn(domain) { | ||
| for _, v := range https.Value { | ||
| if echConfig, ok := v.(*dns.SVCBECHConfig); ok { | ||
| newError(context.Background(), "Get ECH config:", echConfig.String(), " TTL:", respMsg.Answer[0].Header().Ttl).AtDebug().WriteToLog() | ||
| return echConfig.ECH, answer.Header().Ttl, nil | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return []byte{}, 0, newError("no ech record found") | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| //go:build !go1.23 | ||
| // +build !go1.23 | ||
|
|
||
| package tls | ||
|
|
||
| import ( | ||
| "crypto/tls" | ||
| ) | ||
|
|
||
| func ApplyECH(c *Config, config *tls.Config) error { | ||
| return newError("using ECH require go 1.23 or higher") | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
consider the situation that server address will be filled into
config.ServerNameif noc.ServerNamespecified and server address is a domain name, should useECHConfig, err = QueryRecord(config.ServerName, c.Ech_DOHserver)here.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Fangliding Now that #3176 and #3177 will be merged, I think you can also make a fix for this too?