From c71e128fec97a055ef9cc8a192fd48fcc1b6928a Mon Sep 17 00:00:00 2001 From: ginuerzh Date: Thu, 4 Jul 2024 23:09:05 +0800 Subject: [PATCH] bump deps --- .github/workflows/trigger-nightly.yml | 2 +- cmd/gost/cmd.go | 41 ++++++++++++++++----------- go.mod | 6 ++-- go.sum | 8 ++++++ 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index 360b570..0b7a6d3 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -3,7 +3,7 @@ name: Trigger nightly build on: schedule: # * is a special character in YAML, so you have to quote this string - - cron: '00 15 * * *' + - cron: '30 15 * * *' workflow_dispatch: jobs: diff --git a/cmd/gost/cmd.go b/cmd/gost/cmd.go index 5b5c040..73f53d5 100644 --- a/cmd/gost/cmd.go +++ b/cmd/gost/cmd.go @@ -69,18 +69,17 @@ func buildConfigFromCmd(services, nodes stringList) (*config.Config, error) { nodes = append(nodes, nodeCfg) } - mc := nodeConfig.Connector.Metadata - md := mdx.NewMetadata(mc) - m := map[string]any{} for k, v := range url.Query() { if len(v) > 0 { m[k] = v[0] } } + md := mdx.NewMetadata(m) + hopConfig := &config.HopConfig{ Name: fmt.Sprintf("%shop-%d", namePrefix, i), - Selector: parseSelector(mc), + Selector: parseSelector(m), Nodes: nodes, Metadata: m, } @@ -101,7 +100,7 @@ func buildConfigFromCmd(services, nodes stringList) (*config.Config, error) { } hopConfig.Bypass = bypassCfg.Name cfg.Bypasses = append(cfg.Bypasses, bypassCfg) - delete(mc, "bypass") + delete(m, "bypass") } if v := mdutil.GetString(md, "resolver"); v != "" { resolverCfg := &config.ResolverConfig{ @@ -120,7 +119,7 @@ func buildConfigFromCmd(services, nodes stringList) (*config.Config, error) { } hopConfig.Resolver = resolverCfg.Name cfg.Resolvers = append(cfg.Resolvers, resolverCfg) - delete(mc, "resolver") + delete(m, "resolver") } if v := mdutil.GetString(md, "hosts"); v != "" { hostsCfg := &config.HostsConfig{ @@ -141,18 +140,18 @@ func buildConfigFromCmd(services, nodes stringList) (*config.Config, error) { } hopConfig.Hosts = hostsCfg.Name cfg.Hosts = append(cfg.Hosts, hostsCfg) - delete(mc, "hosts") + delete(m, "hosts") } if v := mdutil.GetString(md, "interface"); v != "" { hopConfig.Interface = v - delete(mc, "interface") + delete(m, "interface") } if v := mdutil.GetInt(md, "so_mark"); v > 0 { hopConfig.SockOpts = &config.SockOptsConfig{ Mark: v, } - delete(mc, "so_mark") + delete(m, "so_mark") } chain.Hops = append(chain.Hops, hopConfig) @@ -392,15 +391,18 @@ func buildServiceConfig(url *url.URL) (*config.ServiceConfig, error) { delete(m, "auth") tlsConfig := &config.TLSConfig{ - CertFile: mdutil.GetString(md, "certFile", "cert"), - KeyFile: mdutil.GetString(md, "keyFile", "key"), - CAFile: mdutil.GetString(md, "caFile", "ca"), + CertFile: mdutil.GetString(md, "tls.certFile", "certFile", "cert"), + KeyFile: mdutil.GetString(md, "tls.keyFile", "keyFile", "key"), + CAFile: mdutil.GetString(md, "tls.caFile", "caFile", "ca"), } + delete(m, "tls.certFile") delete(m, "certFile") delete(m, "cert") + delete(m, "tls.keyFile") delete(m, "keyFile") delete(m, "key") + delete(m, "tls.caFile") delete(m, "caFile") delete(m, "ca") @@ -490,23 +492,28 @@ func buildNodeConfig(url *url.URL) (*config.NodeConfig, error) { delete(m, "auth") tlsConfig := &config.TLSConfig{ - 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"), + CertFile: mdutil.GetString(md, "tls.certFile", "certFile", "cert"), + KeyFile: mdutil.GetString(md, "tls.keyFile", "keyFile", "key"), + CAFile: mdutil.GetString(md, "tls.caFile", "caFile", "ca"), + Secure: mdutil.GetBool(md, "tls.secure", "secure"), + ServerName: mdutil.GetString(md, "tls.servername", "servername"), } if tlsConfig.ServerName == "" { tlsConfig.ServerName = url.Hostname() } + delete(m, "tls.certFile") delete(m, "certFile") delete(m, "cert") + delete(m, "tls.keyFile") delete(m, "keyFile") delete(m, "key") + delete(m, "tls.caFile") delete(m, "caFile") delete(m, "ca") + delete(m, "tls.secure") delete(m, "secure") + delete(m, "tls.servername") delete(m, "serverName") if !tlsConfig.Secure && tlsConfig.CertFile == "" && tlsConfig.CAFile == "" && tlsConfig.ServerName == "" { diff --git a/go.mod b/go.mod index d28baf1..5d7fc00 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.22 toolchain go1.22.2 require ( - github.com/go-gost/core v0.0.0-20240625123708-4e831b95e8cc - github.com/go-gost/x v0.0.0-20240625140900-74dc03bd66b8 + github.com/go-gost/core v0.0.0-20240704150322-30cc92870515 + github.com/go-gost/x v0.0.0-20240704150535-22537ff0d294 github.com/judwhite/go-svc v1.2.1 ) @@ -29,7 +29,7 @@ require ( github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-gonic/gin v1.9.1 // indirect github.com/go-gost/gosocks4 v0.0.1 // indirect - github.com/go-gost/gosocks5 v0.4.0 // indirect + github.com/go-gost/gosocks5 v0.4.2 // indirect github.com/go-gost/plugin v0.0.0-20240103125338-9c84e29cb81a // indirect github.com/go-gost/relay v0.5.0 // indirect github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451 // indirect diff --git a/go.sum b/go.sum index 0ccf235..ac8ebe6 100644 --- a/go.sum +++ b/go.sum @@ -55,10 +55,14 @@ github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= github.com/go-gost/core v0.0.0-20240625123708-4e831b95e8cc h1:aj0FZ3RYZPqlDko/pKPPAAve1/73g+uIq/sVEGtarss= github.com/go-gost/core v0.0.0-20240625123708-4e831b95e8cc/go.mod h1:aTPFucvJyqc/o5h5/ZtyHJ0xgFIq5Ip+cMlhazm+TaI= +github.com/go-gost/core v0.0.0-20240704150322-30cc92870515 h1:i/zcDZtz00hcmRosvJgXmgJsdc4bC32PAvt2+8MUOEg= +github.com/go-gost/core v0.0.0-20240704150322-30cc92870515/go.mod h1:QmVAZIXIYBsX44Vehwug5RFnG2K3/Hz/uu/Y4QVhAY0= github.com/go-gost/gosocks4 v0.0.1 h1:+k1sec8HlELuQV7rWftIkmy8UijzUt2I6t+iMPlGB2s= github.com/go-gost/gosocks4 v0.0.1/go.mod h1:3B6L47HbU/qugDg4JnoFPHgJXE43Inz8Bah1QaN9qCc= github.com/go-gost/gosocks5 v0.4.0 h1:EIrOEkpJez4gwHrMa33frA+hHXJyevjp47thpMQsJzI= github.com/go-gost/gosocks5 v0.4.0/go.mod h1:1G6I7HP7VFVxveGkoK8mnprnJqSqJjdcASKsdUn4Pp4= +github.com/go-gost/gosocks5 v0.4.1/go.mod h1:1G6I7HP7VFVxveGkoK8mnprnJqSqJjdcASKsdUn4Pp4= +github.com/go-gost/gosocks5 v0.4.2/go.mod h1:1G6I7HP7VFVxveGkoK8mnprnJqSqJjdcASKsdUn4Pp4= github.com/go-gost/plugin v0.0.0-20240103125338-9c84e29cb81a h1:ME7P1Brcg4C640DSPqlvQr7JuvvQfJ8QpmS3yCFlK3A= github.com/go-gost/plugin v0.0.0-20240103125338-9c84e29cb81a/go.mod h1:qXr2Zm9Ex2ATqnWuNUzVZqySPMnuIihvblYZt4MlZLw= github.com/go-gost/relay v0.5.0 h1:JG1tgy/KWiVXS0ukuVXvbM0kbYuJTWxYpJ5JwzsCf/c= @@ -67,6 +71,10 @@ github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451 h1:xj8gUZG github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451/go.mod h1:/9QfdewqmHdaE362Hv5nDaSWLx3pCmtD870d6GaquXs= github.com/go-gost/x v0.0.0-20240625140900-74dc03bd66b8 h1:1kK+XtTFNo6z2/riWMnPmgNtAWF4UwpTS3AJVYKsDOY= github.com/go-gost/x v0.0.0-20240625140900-74dc03bd66b8/go.mod h1:HcCaxktAkPxu23Ii0MBYXrfxlsk1kwSZYiF6fMcLKEU= +github.com/go-gost/x v0.0.0-20240704013435-b583e29a5646 h1:C48MGoJ0PLOIT6AqWMFcQKq9YIp3VxgtLPPw1AYIGPQ= +github.com/go-gost/x v0.0.0-20240704013435-b583e29a5646/go.mod h1:mD1F3T0Hv16MfT2crZRo2kFXRv7OhfbvUhxXIVFa4jg= +github.com/go-gost/x v0.0.0-20240704150535-22537ff0d294 h1:sXmgKm9UBPMnAbYcMgvf/NUCEbkkFbdRqlTcRZzXPOc= +github.com/go-gost/x v0.0.0-20240704150535-22537ff0d294/go.mod h1:8+dJVV3BEdCciVvmAoqNBZ9+2asPr7ZIcBJGCc9yTfA= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=