diff --git a/parser/shadowsocks.go b/parser/shadowsocks.go index bec376a..97f3aa7 100644 --- a/parser/shadowsocks.go +++ b/parser/shadowsocks.go @@ -13,7 +13,24 @@ func ParseShadowsocks(proxy string) (model.Proxy, error) { if !strings.HasPrefix(proxy, constant.ShadowsocksPrefix) { return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy} } - + needDecode := true + if !strings.Contains(proxy, "@") { + s := strings.SplitN(proxy, "#", 2) + d, err := DecodeBase64(strings.TrimPrefix(s[0], "ss://")) + if err != nil { + return model.Proxy{}, &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) if err != nil { return model.Proxy{}, &ParseError{ @@ -48,32 +65,38 @@ func ParseShadowsocks(proxy string) (model.Proxy, error) { } } - user, err := DecodeBase64(link.User.Username()) - if err != nil { - return model.Proxy{}, &ParseError{ - Type: ErrInvalidStruct, - Message: "missing method and password", - Raw: proxy, + method := "" + password := "" + if needDecode { + user, err := DecodeBase64(link.User.Username()) + if err != nil { + return model.Proxy{}, &ParseError{ + Type: ErrInvalidStruct, + Message: "missing method and password", + Raw: proxy, + } } - } - - if user == "" { - return model.Proxy{}, &ParseError{ - Type: ErrInvalidStruct, - Message: "missing method and password", - Raw: proxy, + if user == "" { + return model.Proxy{}, &ParseError{ + Type: ErrInvalidStruct, + Message: "missing method and password", + Raw: proxy, + } } - } - methodAndPass := strings.SplitN(user, ":", 2) - if len(methodAndPass) != 2 { - return model.Proxy{}, &ParseError{ - Type: ErrInvalidStruct, - Message: "missing method and password", - Raw: proxy, + methodAndPass := strings.SplitN(user, ":", 2) + if len(methodAndPass) != 2 { + return model.Proxy{}, &ParseError{ + Type: ErrInvalidStruct, + Message: "missing method and password", + Raw: proxy, + } } + method = methodAndPass[0] + password = methodAndPass[1] + } else { + method = link.User.Username() + password, _ = link.User.Password() } - method := methodAndPass[0] - password := methodAndPass[1] remarks := link.Fragment if remarks == "" {