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

add auther config

Browse Source
This commit is contained in:
ginuerzh
2022-02-12 00:33:20 +08:00
parent c1bf501734
commit a8a6bbc3a3
37 changed files with 261 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/gost/cmd.go
View File

@ -107,7 +107,7 @@ func buildConfigFromCmd(services, nodes stringList) (*config.Config, error) {
}
resolverCfg.Nameservers = append(
resolverCfg.Nameservers,
config.NameserverConfig{
&config.NameserverConfig{
Addr: rs,
},
)
@ -127,7 +127,7 @@ func buildConfigFromCmd(services, nodes stringList) (*config.Config, error) {
}
hostsCfg.Mappings = append(
hostsCfg.Mappings,
config.HostMappingConfig{
&config.HostMappingConfig{
Hostname: ss[0],
IP: ss[1],
},
@ -194,7 +194,7 @@ func buildConfigFromCmd(services, nodes stringList) (*config.Config, error) {
}
resolverCfg.Nameservers = append(
resolverCfg.Nameservers,
config.NameserverConfig{
&config.NameserverConfig{
Addr: rs,
},
)
@ -214,7 +214,7 @@ func buildConfigFromCmd(services, nodes stringList) (*config.Config, error) {
}
hostsCfg.Mappings = append(
hostsCfg.Mappings,
config.HostMappingConfig{
&config.HostMappingConfig{
Hostname: ss[0],
IP: ss[1],
},
@ -271,13 +271,12 @@ func buildServiceConfig(url *url.URL) (*config.ServiceConfig, error) {
}
}
var auths []*config.AuthConfig
var auth *config.AuthConfig
if url.User != nil {
auth := &config.AuthConfig{
auth = &config.AuthConfig{
Username: url.User.Username(),
}
auth.Password, _ = url.User.Password()
auths = append(auths, auth)
}
md := metadata.MapMetadata{}
@ -292,7 +291,7 @@ func buildServiceConfig(url *url.URL) (*config.ServiceConfig, error) {
if err != nil {
return nil, err
}
auths = append(auths, au)
auth = au
}
md.Del("auth")
@ -319,7 +318,7 @@ func buildServiceConfig(url *url.URL) (*config.ServiceConfig, error) {
svc.Handler = &config.HandlerConfig{
Type: handler,
Auths: auths,
Auth: auth,
Metadata: md,
}
svc.Listener = &config.ListenerConfig{
@ -329,10 +328,10 @@ func buildServiceConfig(url *url.URL) (*config.ServiceConfig, error) {
}
if svc.Handler.Type == "sshd" {
svc.Handler.Auths = nil
svc.Handler.Auth = nil
}
if svc.Listener.Type == "sshd" {
svc.Listener.Auths = auths
svc.Listener.Auth = auth
}
return svc, nil

8
cmd/gost/config.go
View File

@ -16,6 +16,14 @@ func buildService(cfg *config.Config) (services []*service.Service) {
return
}
for _, autherCfg := range cfg.Authers {
if auther := parsing.ParseAuther(autherCfg); auther != nil {
if err := registry.Auther().Register(autherCfg.Name, auther); err != nil {
log.Fatal(err)
}
}
}
for _, bypassCfg := range cfg.Bypasses {
if bp := parsing.ParseBypass(bypassCfg); bp != nil {
if err := registry.Bypass().Register(bypassCfg.Name, bp); err != nil {