fix JudgePort Function

1: fix portAllowed judge
2: fix domainAllowed judge
3: fix subdomainAllowed judge
This commit is contained in:
zhumouren
2023-10-07 14:46:27 +08:00
parent 245f4fa32f
commit 8d54567c0f

View File

@@ -115,6 +115,10 @@ func (c *HandleController) JudgePort(content *plugin.NewProxyContent) plugin.Res
break break
} }
} else { } else {
if str == "" {
portAllowed = true
break
}
allowed, err := strconv.Atoi(str) allowed, err := strconv.Atoi(str)
if err != nil { if err != nil {
portErr = fmt.Errorf("user [%v] allowed port [%v] is not a number", user, port) portErr = fmt.Errorf("user [%v] allowed port [%v] is not a number", user, port)
@@ -148,13 +152,17 @@ func (c *HandleController) JudgePort(content *plugin.NewProxyContent) plugin.Res
if proxyType == "http" || proxyType == "https" || proxyType == "tcpmux" { if proxyType == "http" || proxyType == "https" || proxyType == "tcpmux" {
if portAllowed { if portAllowed {
if token, exist := c.Tokens[user]; exist { if token, exist := c.Tokens[user]; exist {
if stringContains("", token.Domains) {
domainAllowed = true
} else {
for _, userDomain := range userDomains { for _, userDomain := range userDomains {
if stringContains(userDomain, token.Domains) { if !stringContains(userDomain, token.Domains) {
domainAllowed = false domainAllowed = false
break break
} }
} }
} }
}
if !domainAllowed { if !domainAllowed {
portErr = fmt.Errorf("user [%v] domain [%v] is not allowed", user, strings.Join(userDomains, ",")) portErr = fmt.Errorf("user [%v] domain [%v] is not allowed", user, strings.Join(userDomains, ","))
reject = true reject = true
@@ -167,12 +175,16 @@ func (c *HandleController) JudgePort(content *plugin.NewProxyContent) plugin.Res
subdomainAllowed = false subdomainAllowed = false
if portAllowed && domainAllowed { if portAllowed && domainAllowed {
if token, exist := c.Tokens[user]; exist { if token, exist := c.Tokens[user]; exist {
if stringContains("", token.Subdomains) {
subdomainAllowed = true
} else {
for _, subdomain := range token.Subdomains { for _, subdomain := range token.Subdomains {
if subdomain == userSubdomain { if subdomain == userSubdomain {
subdomainAllowed = true subdomainAllowed = true
break break
} }
} }
}
} else { } else {
subdomainAllowed = true subdomainAllowed = true
} }