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

case-insensitive metadata key

Browse Source
This commit is contained in:
ginuerzh
2023-01-11 22:28:43 +08:00
parent 44fca4e04c
commit c351b849e6
3 changed files with 11 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cmd/gost/cmd.go
View File

@ -384,18 +384,9 @@ func buildServiceConfig(url *url.URL) (*config.ServiceConfig, error) {
delete(m, "auth") delete(m, "auth")
tlsConfig := &config.TLSConfig{ tlsConfig := &config.TLSConfig{
CertFile: mdutil.GetString(md, "certFile"), CertFile: mdutil.GetString(md, "certFile", "cert"),
KeyFile: mdutil.GetString(md, "keyFile"), KeyFile: mdutil.GetString(md, "keyFile", "key"),
CAFile: mdutil.GetString(md, "caFile"), CAFile: mdutil.GetString(md, "caFile", "ca"),
}
if tlsConfig.CertFile == "" {
tlsConfig.CertFile = mdutil.GetString(md, "cert")
}
if tlsConfig.KeyFile == "" {
tlsConfig.KeyFile = mdutil.GetString(md, "key")
}
if tlsConfig.CAFile == "" {
tlsConfig.CAFile = mdutil.GetString(md, "ca")
} }
delete(m, "certFile") delete(m, "certFile")
@ -490,24 +481,15 @@ func buildNodeConfig(url *url.URL) (*config.NodeConfig, error) {
delete(m, "auth") delete(m, "auth")
tlsConfig := &config.TLSConfig{ tlsConfig := &config.TLSConfig{
CertFile: mdutil.GetString(md, "certFile"), CertFile: mdutil.GetString(md, "certFile", "cert"),
KeyFile: mdutil.GetString(md, "keyFile"), KeyFile: mdutil.GetString(md, "keyFile", "key"),
CAFile: mdutil.GetString(md, "caFile"), CAFile: mdutil.GetString(md, "caFile", "ca"),
Secure: mdutil.GetBool(md, "secure"), Secure: mdutil.GetBool(md, "secure"),
ServerName: mdutil.GetString(md, "serverName"), ServerName: mdutil.GetString(md, "serverName"),
} }
if tlsConfig.ServerName == "" { if tlsConfig.ServerName == "" {
tlsConfig.ServerName = url.Hostname() tlsConfig.ServerName = url.Hostname()
} }
if tlsConfig.CertFile == "" {
tlsConfig.CertFile = mdutil.GetString(md, "cert")
}
if tlsConfig.KeyFile == "" {
tlsConfig.KeyFile = mdutil.GetString(md, "key")
}
if tlsConfig.CAFile == "" {
tlsConfig.CAFile = mdutil.GetString(md, "ca")
}
delete(m, "certFile") delete(m, "certFile")
delete(m, "cert") delete(m, "cert")
@ -584,14 +566,8 @@ func parseAuthFromCmd(sa string) (*config.AuthConfig, error) {
func parseSelector(m map[string]any) *config.SelectorConfig { func parseSelector(m map[string]any) *config.SelectorConfig {
md := mdx.NewMetadata(m) md := mdx.NewMetadata(m)
strategy := mdutil.GetString(md, "strategy") strategy := mdutil.GetString(md, "strategy")
maxFails := mdutil.GetInt(md, "maxFails") maxFails := mdutil.GetInt(md, "maxFails", "max_fails")
if maxFails == 0 { failTimeout := mdutil.GetDuration(md, "failTimeout", "fail_timeout")
maxFails = mdutil.GetInt(md, "max_fails")
}
failTimeout := mdutil.GetDuration(md, "failTimeout")
if failTimeout == 0 {
failTimeout = mdutil.GetDuration(md, "fail_timeout")
}
if strategy == "" && maxFails <= 0 && failTimeout <= 0 { if strategy == "" && maxFails <= 0 && failTimeout <= 0 {
return nil return nil
} }

2
go.mod
View File

@ -6,7 +6,7 @@ replace github.com/templexxx/cpu v0.0.7 => github.com/templexxx/cpu v0.0.10-0.20
require ( require (
github.com/go-gost/core v0.0.0-20221221101823-36ed0eae2dec github.com/go-gost/core v0.0.0-20221221101823-36ed0eae2dec
github.com/go-gost/x v0.0.0-20221230113448-3b245ec38190 github.com/go-gost/x v0.0.0-20230111142558-9b128534a080
gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0
) )

4
go.sum
View File

@ -102,8 +102,8 @@ github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7 h1:itaaJhQJ19kUXEB
github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7/go.mod h1:lcX+23LCQ3khIeASBo+tJ/WbwXFO32/N5YN6ucuYTG8= github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7/go.mod h1:lcX+23LCQ3khIeASBo+tJ/WbwXFO32/N5YN6ucuYTG8=
github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451 h1:xj8gUZGYO3nb5+6Bjw9+tsFkA9sYynrOvDvvC4uDV2I= github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451 h1:xj8gUZGYO3nb5+6Bjw9+tsFkA9sYynrOvDvvC4uDV2I=
github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451/go.mod h1:/9QfdewqmHdaE362Hv5nDaSWLx3pCmtD870d6GaquXs= github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451/go.mod h1:/9QfdewqmHdaE362Hv5nDaSWLx3pCmtD870d6GaquXs=
github.com/go-gost/x v0.0.0-20221230113448-3b245ec38190 h1:NVxq4COYJr8qO1cDCqC72dsg5RKZwxA8lBD25onq2vA= github.com/go-gost/x v0.0.0-20230111142558-9b128534a080 h1:rLhZOdPmNJ6kBPoC+gJnQSITn4LfzRN4pgp92opLRHU=
github.com/go-gost/x v0.0.0-20221230113448-3b245ec38190/go.mod h1:1W+Fad4cN70GbNbmFAoeCsarSA8ld1AfEZ9CL74pXyg= github.com/go-gost/x v0.0.0-20230111142558-9b128534a080/go.mod h1:yXOgzKYFQK/nlc0Ngd3GZHjNA3x3BncyVaagr6W5WvA=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=