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

fix auther option for socks5 handler

Browse Source
This commit is contained in:
ginuerzh 2022-09-03 17:29:10 +08:00
parent 00e4ece170
commit ba4b0b8e0f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/parsing/service.go
View File

@ -61,12 +61,16 @@ func ParseService(cfg *config.ServiceConfig) (service.Service, error) {
authers = append(authers, auther) authers = append(authers, auther)
} }
} }
var auther auth.Authenticator
if len(authers) > 0 {
auther = auth.AuthenticatorGroup(authers...)
}
admissions := admissionList(cfg.Admission, cfg.Admissions...) admissions := admissionList(cfg.Admission, cfg.Admissions...)
ln := registry.ListenerRegistry().Get(cfg.Listener.Type)( ln := registry.ListenerRegistry().Get(cfg.Listener.Type)(
listener.AddrOption(cfg.Addr), listener.AddrOption(cfg.Addr),
listener.AutherOption(auth.AuthenticatorGroup(authers...)), listener.AutherOption(auther),
listener.AuthOption(parseAuth(cfg.Listener.Auth)), listener.AuthOption(parseAuth(cfg.Listener.Auth)),
listener.TLSConfigOption(tlsConfig), listener.TLSConfigOption(tlsConfig),
listener.AdmissionOption(admission.AdmissionGroup(admissions...)), listener.AdmissionOption(admission.AdmissionGroup(admissions...)),
@ -108,6 +112,11 @@ func ParseService(cfg *config.ServiceConfig) (service.Service, error) {
} }
} }
auther = nil
if len(authers) > 0 {
auther = auth.AuthenticatorGroup(authers...)
}
var sockOpts *chain.SockOpts var sockOpts *chain.SockOpts
if cfg.SockOpts != nil { if cfg.SockOpts != nil {
sockOpts = &chain.SockOpts{ sockOpts = &chain.SockOpts{
@ -135,7 +144,7 @@ func ParseService(cfg *config.ServiceConfig) (service.Service, error) {
h := registry.HandlerRegistry().Get(cfg.Handler.Type)( h := registry.HandlerRegistry().Get(cfg.Handler.Type)(
handler.RouterOption(router), handler.RouterOption(router),
handler.AutherOption(auth.AuthenticatorGroup(authers...)), handler.AutherOption(auther),
handler.AuthOption(parseAuth(cfg.Handler.Auth)), handler.AuthOption(parseAuth(cfg.Handler.Auth)),
handler.BypassOption(bypass.BypassGroup(bypassList(cfg.Bypass, cfg.Bypasses...)...)), handler.BypassOption(bypass.BypassGroup(bypassList(cfg.Bypass, cfg.Bypasses...)...)),
handler.TLSConfigOption(tlsConfig), handler.TLSConfigOption(tlsConfig),