xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: weak type proxy name

Browse source
This commit is contained in:
gVisor bot 2018-10-27 12:57:56 +08:00
parent 5601df6964
commit 009b985c49
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
config/config.go
View file

@ -250,14 +250,10 @@ func (c *Config) parseProxies(cfg *RawConfig) error {
// parse proxy // parse proxy
for idx, mapping := range proxiesConfig { for idx, mapping := range proxiesConfig {
proxyType, existType := mapping["type"].(string) proxyType, existType := mapping["type"].(string)
proxyName, existName := mapping["name"].(string) if !existType {
if !existType && existName { return fmt.Errorf("Proxy %d missing type", idx)
return fmt.Errorf("Proxy %d missing type or name", idx)
} }
if _, exist := proxies[proxyName]; exist {
return fmt.Errorf("Proxy %s is the duplicate name", proxyName)
}
var proxy C.Proxy var proxy C.Proxy
var err error var err error
switch proxyType { switch proxyType {
@ -285,10 +281,15 @@ func (c *Config) parseProxies(cfg *RawConfig) error {
default: default:
return fmt.Errorf("Unsupport proxy type: %s", proxyType) return fmt.Errorf("Unsupport proxy type: %s", proxyType)
} }
if err != nil { if err != nil {
return fmt.Errorf("Proxy %s: %s", proxyName, err.Error()) return fmt.Errorf("Proxy [%d]: %s", idx, err.Error())
} }
proxies[proxyName] = proxy
if _, exist := proxies[proxy.Name()]; exist {
return fmt.Errorf("Proxy %s is the duplicate name", proxy.Name())
}
proxies[proxy.Name()] = proxy
} }
// parse proxy group // parse proxy group