nite/sub2clash
1
Fork 0
mirror of https://github.com/bestnite/sub2clash.git synced 2025-06-17 20:53:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Shadowsocks and Socks parsers to improve username and password handling

Browse Source
This commit is contained in:
nite
2025-06-12 15:41:56 +10:00
parent f88ae52a29
commit 6a780a5e27
4 changed files with 280 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
parser/shadowsocks.go
View File

@ -92,19 +92,35 @@ func (p *ShadowsocksParser) Parse(proxy string) (P.Proxy, error) {
}
method := link.User.Username()
password, _ := link.User.Password()
password, hasPassword := link.User.Password()
if password == "" {
user, err := DecodeBase64(method)
if !hasPassword && isLikelyBase64(method) {
decodedStr, err := DecodeBase64(method)
if err == nil {
methodAndPass := strings.SplitN(user, ":", 2)
methodAndPass := strings.SplitN(decodedStr, ":", 2)
if len(methodAndPass) == 2 {
method = methodAndPass[0]
password = methodAndPass[1]
method, err = url.QueryUnescape(methodAndPass[0])
if err != nil {
return P.Proxy{}, &ParseError{
Type: ErrInvalidStruct,
Message: "invalid method",
Raw: proxy,
}
}
password, err = url.QueryUnescape(methodAndPass[1])
if err != nil {
return P.Proxy{}, &ParseError{
Type: ErrInvalidStruct,
Message: "invalid password",
Raw: proxy,
}
}
} else {
method = decodedStr
}
}
}
if isLikelyBase64(password) {
if password != "" && isLikelyBase64(password) {
password, err = DecodeBase64(password)
if err != nil {
return P.Proxy{}, &ParseError{

49
parser/socks.go
View File

@ -68,23 +68,45 @@ func (p *SocksParser) Parse(proxy string) (P.Proxy, error) {
}
remarks = strings.TrimSpace(remarks)
encodeStr := link.User.Username()
var username, password string
if encodeStr != "" {
decodeStr, err := DecodeBase64(encodeStr)
splitStr := strings.Split(decodeStr, ":")
if err != nil {
return P.Proxy{}, &ParseError{
Type: ErrInvalidStruct,
Message: "url parse error",
Raw: proxy,
username = link.User.Username()
password, hasPassword := link.User.Password()
if !hasPassword && isLikelyBase64(username) {
decodedStr, err := DecodeBase64(username)
if err == nil {
usernameAndPassword := strings.SplitN(decodedStr, ":", 2)
if len(usernameAndPassword) == 2 {
username, err = url.QueryUnescape(usernameAndPassword[0])
if err != nil {
return P.Proxy{}, &ParseError{
Type: ErrInvalidStruct,
Message: "invalid username",
Raw: proxy,
}
}
password, err = url.QueryUnescape(usernameAndPassword[1])
if err != nil {
return P.Proxy{}, &ParseError{
Type: ErrInvalidStruct,
Message: "invalid password",
Raw: proxy,
}
}
} else {
username, err = url.QueryUnescape(decodedStr)
if err != nil {
return P.Proxy{}, &ParseError{
Type: ErrInvalidStruct,
Message: "invalid username",
Raw: proxy,
}
}
}
}
username = splitStr[0]
if len(splitStr) == 2 {
password = splitStr[1]
}
}
return P.Proxy{
Type: p.GetType(),
Name: remarks,
@ -95,7 +117,6 @@ func (p *SocksParser) Parse(proxy string) (P.Proxy, error) {
Password: password,
},
}, nil
}
func init() {