lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-09-27 22:36:12 -04:00
Code Issues Releases Wiki Activity

Alias for ext: to reduce ambiguous ext: used without context

Browse Source
This commit is contained in:
Shelikhoo 2020-07-11 09:24:03 +08:00
parent ff42cc8c86
commit d2266bb52c
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
infra/conf/router.go
View File

@ -260,9 +260,19 @@ func parseDomainRule(domain string) ([]*router.Domain, error) {
}
return domains, nil
}
if strings.HasPrefix(domain, "ext:") {
kv := strings.Split(domain[4:], ":")
var isExtDatFile = 0
{
const prefix = "ext:"
if strings.HasPrefix(domain, prefix) {
isExtDatFile = len(prefix)
}
const prefixQualified = "ext-domain:"
if strings.HasPrefix(domain, prefixQualified) {
isExtDatFile = len(prefixQualified)
}
}
if isExtDatFile != 0 {
kv := strings.Split(domain[isExtDatFile:], ":")
if len(kv) != 2 {
return nil, newError("invalid external resource: ", domain)
}
@ -314,9 +324,19 @@ func toCidrList(ips StringList) ([]*router.GeoIP, error) {
})
continue
}
if strings.HasPrefix(ip, "ext:") {
kv := strings.Split(ip[4:], ":")
var isExtDatFile = 0
{
const prefix = "ext:"
if strings.HasPrefix(ip, prefix) {
isExtDatFile = len(prefix)
}
const prefixQualified = "ext-ip:"
if strings.HasPrefix(ip, prefixQualified) {
isExtDatFile = len(prefixQualified)
}
}
if isExtDatFile != 0 {
kv := strings.Split(ip[isExtDatFile:], ":")
if len(kv) != 2 {
return nil, newError("invalid external resource: ", ip)
}