mirror of
https://github.com/nitezs/sub2sing-box.git
synced 2024-12-23 21:54:42 -05:00
🐛 Fix cannot parse shadowsocks with base64 encoded
This commit is contained in:
parent
5a7bce6fda
commit
15a6f586a5
@ -15,7 +15,24 @@ func ParseShadowsocks(proxy string) (model.Outbound, error) {
|
|||||||
if !strings.HasPrefix(proxy, constant.ShadowsocksPrefix) {
|
if !strings.HasPrefix(proxy, constant.ShadowsocksPrefix) {
|
||||||
return model.Outbound{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
|
return model.Outbound{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
|
||||||
}
|
}
|
||||||
|
needDecode := true
|
||||||
|
if !strings.Contains(proxy, "@") {
|
||||||
|
s := strings.SplitN(proxy, "#", 2)
|
||||||
|
d, err := util.DecodeBase64(strings.TrimPrefix(s[0], "ss://"))
|
||||||
|
if err != nil {
|
||||||
|
return model.Outbound{}, &ParseError{
|
||||||
|
Type: ErrInvalidStruct,
|
||||||
|
Message: "url parse error",
|
||||||
|
Raw: proxy,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(s) == 2 {
|
||||||
|
proxy = "ss://" + d + "#" + s[1]
|
||||||
|
} else {
|
||||||
|
proxy = "ss://" + d
|
||||||
|
}
|
||||||
|
needDecode = false
|
||||||
|
}
|
||||||
link, err := url.Parse(proxy)
|
link, err := url.Parse(proxy)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return model.Outbound{}, &ParseError{
|
return model.Outbound{}, &ParseError{
|
||||||
@ -50,32 +67,38 @@ func ParseShadowsocks(proxy string) (model.Outbound, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
user, err := util.DecodeBase64(link.User.Username())
|
method := ""
|
||||||
if err != nil {
|
password := ""
|
||||||
return model.Outbound{}, &ParseError{
|
if needDecode {
|
||||||
Type: ErrInvalidStruct,
|
user, err := util.DecodeBase64(link.User.Username())
|
||||||
Message: "missing method and password",
|
if err != nil {
|
||||||
Raw: proxy,
|
return model.Outbound{}, &ParseError{
|
||||||
|
Type: ErrInvalidStruct,
|
||||||
|
Message: "missing method and password",
|
||||||
|
Raw: proxy,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
if user == "" {
|
||||||
|
return model.Outbound{}, &ParseError{
|
||||||
if user == "" {
|
Type: ErrInvalidStruct,
|
||||||
return model.Outbound{}, &ParseError{
|
Message: "missing method and password",
|
||||||
Type: ErrInvalidStruct,
|
Raw: proxy,
|
||||||
Message: "missing method and password",
|
}
|
||||||
Raw: proxy,
|
|
||||||
}
|
}
|
||||||
}
|
methodAndPass := strings.SplitN(user, ":", 2)
|
||||||
methodAndPass := strings.SplitN(user, ":", 2)
|
if len(methodAndPass) != 2 {
|
||||||
if len(methodAndPass) != 2 {
|
return model.Outbound{}, &ParseError{
|
||||||
return model.Outbound{}, &ParseError{
|
Type: ErrInvalidStruct,
|
||||||
Type: ErrInvalidStruct,
|
Message: "missing method and password",
|
||||||
Message: "missing method and password",
|
Raw: proxy,
|
||||||
Raw: proxy,
|
}
|
||||||
}
|
}
|
||||||
|
method = methodAndPass[0]
|
||||||
|
password = methodAndPass[1]
|
||||||
|
} else {
|
||||||
|
method = link.User.Username()
|
||||||
|
password, _ = link.User.Password()
|
||||||
}
|
}
|
||||||
method := methodAndPass[0]
|
|
||||||
password := methodAndPass[1]
|
|
||||||
|
|
||||||
query := link.Query()
|
query := link.Query()
|
||||||
pluginStr := query.Get("plugin")
|
pluginStr := query.Get("plugin")
|
||||||
|
Loading…
Reference in New Issue
Block a user