go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add default server name for tls client config

Browse Source
This commit is contained in:
ginuerzh 2023-02-24 20:20:10 +08:00
parent 09ee29091b
commit a0765edd40
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/parsing/chain.go
View File

@ -2,6 +2,7 @@ package parsing
import ( import (
"fmt" "fmt"
"net"
"strings" "strings"
"time" "time"
@ -94,10 +95,18 @@ func ParseHop(cfg *config.HopConfig) (chain.Hop, error) {
"dialer": v.Dialer.Type, "dialer": v.Dialer.Type,
}) })
serverName, _, _ := net.SplitHostPort(v.Addr)
if serverName == "" {
serverName = "localhost"
}
tlsCfg := v.Connector.TLS tlsCfg := v.Connector.TLS
if tlsCfg == nil { if tlsCfg == nil {
tlsCfg = &config.TLSConfig{} tlsCfg = &config.TLSConfig{}
} }
if tlsCfg.ServerName == "" {
tlsCfg.ServerName = serverName
}
tlsConfig, err := tls_util.LoadClientConfig( tlsConfig, err := tls_util.LoadClientConfig(
tlsCfg.CertFile, tlsCfg.KeyFile, tlsCfg.CAFile, tlsCfg.CertFile, tlsCfg.KeyFile, tlsCfg.CAFile,
tlsCfg.Secure, tlsCfg.ServerName) tlsCfg.Secure, tlsCfg.ServerName)
@ -137,6 +146,9 @@ func ParseHop(cfg *config.HopConfig) (chain.Hop, error) {
if tlsCfg == nil { if tlsCfg == nil {
tlsCfg = &config.TLSConfig{} tlsCfg = &config.TLSConfig{}
} }
if tlsCfg.ServerName == "" {
tlsCfg.ServerName = serverName
}
tlsConfig, err = tls_util.LoadClientConfig( tlsConfig, err = tls_util.LoadClientConfig(
tlsCfg.CertFile, tlsCfg.KeyFile, tlsCfg.CAFile, tlsCfg.CertFile, tlsCfg.KeyFile, tlsCfg.CAFile,
tlsCfg.Secure, tlsCfg.ServerName) tlsCfg.Secure, tlsCfg.ServerName)