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

fix tls config

Browse Source
This commit is contained in:
ginuerzh 2022-02-04 21:16:39 +08:00
parent e50e1adeb1
commit 0983ecc52f
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ NAME=gost
BINDIR=bin BINDIR=bin
VERSION=$(shell cat cmd/gost/version.go | grep 'version =' | sed 's/.*\"\(.*\)\".*/\1/g') VERSION=$(shell cat cmd/gost/version.go | grep 'version =' | sed 's/.*\"\(.*\)\".*/\1/g')
GOBUILD=CGO_ENABLED=0 go build --ldflags="-s -w" -v -x -a GOBUILD=CGO_ENABLED=0 go build --ldflags="-s -w" -v -x -a
GOFILES=cmd/gost/* GOFILES=cmd/gost/*.go
PLATFORM_LIST = \ PLATFORM_LIST = \
darwin-amd64 \ darwin-amd64 \

6
cmd/gost/cmd.go
View File

@ -389,6 +389,8 @@ func buildNodeConfig(url *url.URL) (*config.NodeConfig, error) {
md.Del("auth") md.Del("auth")
tlsConfig := &config.TLSConfig{ tlsConfig := &config.TLSConfig{
CertFile: metadata.GetString(md, "certFile"),
KeyFile: metadata.GetString(md, "keyFile"),
CAFile: metadata.GetString(md, "caFile"), CAFile: metadata.GetString(md, "caFile"),
Secure: metadata.GetBool(md, "secure"), Secure: metadata.GetBool(md, "secure"),
ServerName: metadata.GetString(md, "serverName"), ServerName: metadata.GetString(md, "serverName"),
@ -396,11 +398,13 @@ func buildNodeConfig(url *url.URL) (*config.NodeConfig, error) {
if tlsConfig.ServerName == "" { if tlsConfig.ServerName == "" {
tlsConfig.ServerName = url.Hostname() tlsConfig.ServerName = url.Hostname()
} }
md.Del("certFile")
md.Del("keyFile")
md.Del("caFile") md.Del("caFile")
md.Del("secure") md.Del("secure")
md.Del("serverName") md.Del("serverName")
if !tlsConfig.Secure && tlsConfig.CAFile == "" { if !tlsConfig.Secure && tlsConfig.CertFile == "" && tlsConfig.CAFile == "" {
tlsConfig = nil tlsConfig = nil
} }

2
cmd/gost/version.go
View File

@ -1,5 +1,5 @@
package main package main
const ( const (
version = "3.0.0-alpha.1" version = "3.0.0-alpha.2"
) )