From c351b849e62d9c5269150bf5415521910f8b3cd8 Mon Sep 17 00:00:00 2001
From: ginuerzh <ginuerzh@gmail.com>
Date: Wed, 11 Jan 2023 22:28:43 +0800
Subject: [PATCH] case-insensitive metadata key

---
 cmd/gost/cmd.go | 40 ++++++++--------------------------------
 go.mod          |  2 +-
 go.sum          |  4 ++--
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/cmd/gost/cmd.go b/cmd/gost/cmd.go
index 37a1e3b..d51cff0 100644
--- a/cmd/gost/cmd.go
+++ b/cmd/gost/cmd.go
@@ -384,18 +384,9 @@ func buildServiceConfig(url *url.URL) (*config.ServiceConfig, error) {
 	delete(m, "auth")
 
 	tlsConfig := &config.TLSConfig{
-		CertFile: mdutil.GetString(md, "certFile"),
-		KeyFile:  mdutil.GetString(md, "keyFile"),
-		CAFile:   mdutil.GetString(md, "caFile"),
-	}
-	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")
+		CertFile: mdutil.GetString(md, "certFile", "cert"),
+		KeyFile:  mdutil.GetString(md, "keyFile", "key"),
+		CAFile:   mdutil.GetString(md, "caFile", "ca"),
 	}
 
 	delete(m, "certFile")
@@ -490,24 +481,15 @@ func buildNodeConfig(url *url.URL) (*config.NodeConfig, error) {
 	delete(m, "auth")
 
 	tlsConfig := &config.TLSConfig{
-		CertFile:   mdutil.GetString(md, "certFile"),
-		KeyFile:    mdutil.GetString(md, "keyFile"),
-		CAFile:     mdutil.GetString(md, "caFile"),
+		CertFile:   mdutil.GetString(md, "certFile", "cert"),
+		KeyFile:    mdutil.GetString(md, "keyFile", "key"),
+		CAFile:     mdutil.GetString(md, "caFile", "ca"),
 		Secure:     mdutil.GetBool(md, "secure"),
 		ServerName: mdutil.GetString(md, "serverName"),
 	}
 	if tlsConfig.ServerName == "" {
 		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, "cert")
@@ -584,14 +566,8 @@ func parseAuthFromCmd(sa string) (*config.AuthConfig, error) {
 func parseSelector(m map[string]any) *config.SelectorConfig {
 	md := mdx.NewMetadata(m)
 	strategy := mdutil.GetString(md, "strategy")
-	maxFails := mdutil.GetInt(md, "maxFails")
-	if maxFails == 0 {
-		maxFails = mdutil.GetInt(md, "max_fails")
-	}
-	failTimeout := mdutil.GetDuration(md, "failTimeout")
-	if failTimeout == 0 {
-		failTimeout = mdutil.GetDuration(md, "fail_timeout")
-	}
+	maxFails := mdutil.GetInt(md, "maxFails", "max_fails")
+	failTimeout := mdutil.GetDuration(md, "failTimeout", "fail_timeout")
 	if strategy == "" && maxFails <= 0 && failTimeout <= 0 {
 		return nil
 	}
diff --git a/go.mod b/go.mod
index c5f0aec..062d6dd 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ replace github.com/templexxx/cpu v0.0.7 => github.com/templexxx/cpu v0.0.10-0.20
 
 require (
 	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
 )
 
diff --git a/go.sum b/go.sum
index 1ad1455..d4dffc8 100644
--- a/go.sum
+++ b/go.sum
@@ -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/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/x v0.0.0-20221230113448-3b245ec38190 h1:NVxq4COYJr8qO1cDCqC72dsg5RKZwxA8lBD25onq2vA=
-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 h1:rLhZOdPmNJ6kBPoC+gJnQSITn4LfzRN4pgp92opLRHU=
+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.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=