nite/sub2sing-box
1
0
Fork 0
mirror of https://github.com/nitezs/sub2sing-box.git synced 2024-12-23 15:14:43 -05:00
Code Projects Activity

🐛 修复ss解析时ipv6地址解析错误 (#7)

Browse Source
This commit is contained in:
Lael 2024-07-10 11:33:43 +08:00 committed by GitHub
parent 8f6e39b634
commit 9e50b30af6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
parser/shadowsocks.go
View File

@ -23,7 +23,6 @@ func ParseShadowsocks(proxy string) (model.Outbound, error) {
} }
} }
var serverAndPort []string
if !strings.Contains(urlParts[0], ":") { if !strings.Contains(urlParts[0], ":") {
decoded, err := util.DecodeBase64(urlParts[0]) decoded, err := util.DecodeBase64(urlParts[0])
if err != nil { if err != nil {
@ -45,16 +44,21 @@ func ParseShadowsocks(proxy string) (model.Outbound, error) {
} }
method, password := credentials[0], credentials[1] method, password := credentials[0], credentials[1]
serverInfo := strings.SplitN(urlParts[1], "#", 2) serverInfoAndTag := strings.SplitN(urlParts[1], "#", 2)
serverAndPort = strings.SplitN(serverInfo[0], ":", 2) serverAndPort := serverInfoAndTag[0]
server, portStr := serverAndPort[0], serverAndPort[1]
if len(serverInfo) != 2 { lastColonIndex := strings.LastIndex(serverAndPort, ":")
if lastColonIndex == -1 {
return model.Outbound{}, &ParseError{ return model.Outbound{}, &ParseError{
Type: ErrInvalidStruct, Type: ErrInvalidStruct,
Message: "missing server host or port", Message: "missing port in address",
Raw: proxy, Raw: proxy,
} }
} }
server := serverAndPort[:lastColonIndex]
portStr := serverAndPort[lastColonIndex+1:]
port, err := ParsePort(portStr) port, err := ParsePort(portStr)
if err != nil { if err != nil {
return model.Outbound{}, &ParseError{ return model.Outbound{}, &ParseError{
@ -65,8 +69,8 @@ func ParseShadowsocks(proxy string) (model.Outbound, error) {
} }
var remarks string var remarks string
if len(serverInfo) == 2 { if len(serverInfoAndTag) == 2 {
unescape, err := url.QueryUnescape(serverInfo[1]) unescape, err := url.QueryUnescape(serverInfoAndTag[1])
if err != nil { if err != nil {
return model.Outbound{}, &ParseError{ return model.Outbound{}, &ParseError{
Type: ErrInvalidStruct, Type: ErrInvalidStruct,