fix: CDN优选IP支持IPv6、格式校验及错误降级
- replaceHost() 自动为裸 IPv6 地址包裹方括号,修复 IPv6 URL 畸形问题 - 新增 ValidateServerIPs() 校验 IP 格式,保存配置时拦截非法输入 - GetServerIPList() 运行时自动过滤非法 IP 条目 - CDN IP 尝试时 TLS/认证错误降级为非致命,跳过该 IP 继续故障转移 而非终止整个连接循环(仅原始域名 ipIndex==0 时才判为致命) - 占位符提示支持 IPv4/IPv6
This commit is contained in:
+21
-9
@@ -4,6 +4,7 @@ package model
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
@@ -85,20 +86,31 @@ func (p *ServerProfile) BuildServerURL(ip ...string) string {
|
||||
return fmt.Sprintf("%s://%s:%d%s", protocol, host, port, path)
|
||||
}
|
||||
|
||||
// GetServerIPList parses ServerIPs into a string slice.
|
||||
func (p *ServerProfile) GetServerIPList() []string {
|
||||
// ValidateServerIPs parses ServerIPs, returning valid IP addresses
|
||||
// and any invalid entries (for UI error reporting).
|
||||
func (p *ServerProfile) ValidateServerIPs() (valid []string, invalid []string) {
|
||||
if p.ServerIPs == "" {
|
||||
return nil
|
||||
return nil, nil
|
||||
}
|
||||
parts := strings.Split(p.ServerIPs, ",")
|
||||
var out []string
|
||||
for _, part := range parts {
|
||||
for _, part := range strings.Split(p.ServerIPs, ",") {
|
||||
s := strings.TrimSpace(part)
|
||||
if s != "" {
|
||||
out = append(out, s)
|
||||
if s == "" {
|
||||
continue
|
||||
}
|
||||
if net.ParseIP(s) != nil {
|
||||
valid = append(valid, s)
|
||||
} else {
|
||||
invalid = append(invalid, s)
|
||||
}
|
||||
}
|
||||
return out
|
||||
return
|
||||
}
|
||||
|
||||
// GetServerIPList returns only valid IP addresses from ServerIPs,
|
||||
// silently filtering out any malformed entries.
|
||||
func (p *ServerProfile) GetServerIPList() []string {
|
||||
valid, _ := p.ValidateServerIPs()
|
||||
return valid
|
||||
}
|
||||
|
||||
// ConnectionStatus records the outcome of a connection attempt.
|
||||
|
||||
Reference in New Issue
Block a user