From b36bfa84a618c564189b4ab927337625e5701e1a Mon Sep 17 00:00:00 2001 From: nite07 Date: Wed, 6 Nov 2024 18:38:59 +0800 Subject: [PATCH] try to fix ss parser --- .gitattributes | 1 + .github/workflows/docker.yml | 0 .github/workflows/release.yml | 0 .gitignore | 0 .goreleaser.yaml | 0 .vscode/tasks.json | 0 Dockerfile | 0 LICENSE | 0 README.md | 0 api/handler/convert.go | 0 api/server.go | 0 api/static/index.html | 0 cmd/convert.go | 0 cmd/root.go | 0 cmd/server.go | 0 cmd/version.go | 0 common/convert.go | 0 constant/placeholder.go | 0 constant/prefix.go | 0 constant/proxy.go | 0 constant/version.go | 0 docker-compose.yaml | 0 go.mod | 0 go.sum | 0 main.go | 0 model/convert.go | 0 model/country_code_map.go | 0 model/option.go | 0 model/outbound.go | 0 model/sort.go | 0 model/vmess.go | 0 parser/error.go | 0 parser/hysteria.go | 0 parser/hysteria2.go | 0 parser/parsers_map.go | 0 parser/port.go | 0 parser/shadowsocks.go | 57 ++++++++++++++------------- parser/trojan.go | 0 parser/vless.go | 0 parser/vmess.go | 0 templates/android/dns.json | 0 templates/android/experimental.json | 0 templates/android/inbounds.json | 0 templates/android/log.json | 0 templates/android/ntp.json | 0 templates/android/outbounds.json | 0 templates/android/route.json | 0 templates/android/route_rule_set.json | 0 templates/example-android.json | 0 templates/example-linux.json | 0 templates/example-windows.json | 0 templates/linux/dns.json | 0 templates/linux/experimental.json | 0 templates/linux/inbounds.json | 0 templates/linux/log.json | 0 templates/linux/ntp.json | 0 templates/linux/outbounds.json | 0 templates/linux/route.json | 0 templates/linux/route_rule_set.json | 0 templates/windows/dns.json | 0 templates/windows/experimental.json | 0 templates/windows/inbounds.json | 0 templates/windows/log.json | 0 templates/windows/ntp.json | 0 templates/windows/outbounds.json | 0 templates/windows/route.json | 0 templates/windows/route_rule_set.json | 0 util/base64.go | 0 util/fetch.go | 0 69 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 .gitattributes mode change 100644 => 100755 .github/workflows/docker.yml mode change 100644 => 100755 .github/workflows/release.yml mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .goreleaser.yaml mode change 100644 => 100755 .vscode/tasks.json mode change 100644 => 100755 Dockerfile mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md mode change 100644 => 100755 api/handler/convert.go mode change 100644 => 100755 api/server.go mode change 100644 => 100755 api/static/index.html mode change 100644 => 100755 cmd/convert.go mode change 100644 => 100755 cmd/root.go mode change 100644 => 100755 cmd/server.go mode change 100644 => 100755 cmd/version.go mode change 100644 => 100755 common/convert.go mode change 100644 => 100755 constant/placeholder.go mode change 100644 => 100755 constant/prefix.go mode change 100644 => 100755 constant/proxy.go mode change 100644 => 100755 constant/version.go mode change 100644 => 100755 docker-compose.yaml mode change 100644 => 100755 go.mod mode change 100644 => 100755 go.sum mode change 100644 => 100755 main.go mode change 100644 => 100755 model/convert.go mode change 100644 => 100755 model/country_code_map.go mode change 100644 => 100755 model/option.go mode change 100644 => 100755 model/outbound.go mode change 100644 => 100755 model/sort.go mode change 100644 => 100755 model/vmess.go mode change 100644 => 100755 parser/error.go mode change 100644 => 100755 parser/hysteria.go mode change 100644 => 100755 parser/hysteria2.go mode change 100644 => 100755 parser/parsers_map.go mode change 100644 => 100755 parser/port.go mode change 100644 => 100755 parser/shadowsocks.go mode change 100644 => 100755 parser/trojan.go mode change 100644 => 100755 parser/vless.go mode change 100644 => 100755 parser/vmess.go mode change 100644 => 100755 templates/android/dns.json mode change 100644 => 100755 templates/android/experimental.json mode change 100644 => 100755 templates/android/inbounds.json mode change 100644 => 100755 templates/android/log.json mode change 100644 => 100755 templates/android/ntp.json mode change 100644 => 100755 templates/android/outbounds.json mode change 100644 => 100755 templates/android/route.json mode change 100644 => 100755 templates/android/route_rule_set.json mode change 100644 => 100755 templates/example-android.json mode change 100644 => 100755 templates/example-linux.json mode change 100644 => 100755 templates/example-windows.json mode change 100644 => 100755 templates/linux/dns.json mode change 100644 => 100755 templates/linux/experimental.json mode change 100644 => 100755 templates/linux/inbounds.json mode change 100644 => 100755 templates/linux/log.json mode change 100644 => 100755 templates/linux/ntp.json mode change 100644 => 100755 templates/linux/outbounds.json mode change 100644 => 100755 templates/linux/route.json mode change 100644 => 100755 templates/linux/route_rule_set.json mode change 100644 => 100755 templates/windows/dns.json mode change 100644 => 100755 templates/windows/experimental.json mode change 100644 => 100755 templates/windows/inbounds.json mode change 100644 => 100755 templates/windows/log.json mode change 100644 => 100755 templates/windows/ntp.json mode change 100644 => 100755 templates/windows/outbounds.json mode change 100644 => 100755 templates/windows/route.json mode change 100644 => 100755 templates/windows/route_rule_set.json mode change 100644 => 100755 util/base64.go mode change 100644 => 100755 util/fetch.go diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..6313b56 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml old mode 100644 new mode 100755 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.goreleaser.yaml b/.goreleaser.yaml old mode 100644 new mode 100755 diff --git a/.vscode/tasks.json b/.vscode/tasks.json old mode 100644 new mode 100755 diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/api/handler/convert.go b/api/handler/convert.go old mode 100644 new mode 100755 diff --git a/api/server.go b/api/server.go old mode 100644 new mode 100755 diff --git a/api/static/index.html b/api/static/index.html old mode 100644 new mode 100755 diff --git a/cmd/convert.go b/cmd/convert.go old mode 100644 new mode 100755 diff --git a/cmd/root.go b/cmd/root.go old mode 100644 new mode 100755 diff --git a/cmd/server.go b/cmd/server.go old mode 100644 new mode 100755 diff --git a/cmd/version.go b/cmd/version.go old mode 100644 new mode 100755 diff --git a/common/convert.go b/common/convert.go old mode 100644 new mode 100755 diff --git a/constant/placeholder.go b/constant/placeholder.go old mode 100644 new mode 100755 diff --git a/constant/prefix.go b/constant/prefix.go old mode 100644 new mode 100755 diff --git a/constant/proxy.go b/constant/proxy.go old mode 100644 new mode 100755 diff --git a/constant/version.go b/constant/version.go old mode 100644 new mode 100755 diff --git a/docker-compose.yaml b/docker-compose.yaml old mode 100644 new mode 100755 diff --git a/go.mod b/go.mod old mode 100644 new mode 100755 diff --git a/go.sum b/go.sum old mode 100644 new mode 100755 diff --git a/main.go b/main.go old mode 100644 new mode 100755 diff --git a/model/convert.go b/model/convert.go old mode 100644 new mode 100755 diff --git a/model/country_code_map.go b/model/country_code_map.go old mode 100644 new mode 100755 diff --git a/model/option.go b/model/option.go old mode 100644 new mode 100755 diff --git a/model/outbound.go b/model/outbound.go old mode 100644 new mode 100755 diff --git a/model/sort.go b/model/sort.go old mode 100644 new mode 100755 diff --git a/model/vmess.go b/model/vmess.go old mode 100644 new mode 100755 diff --git a/parser/error.go b/parser/error.go old mode 100644 new mode 100755 diff --git a/parser/hysteria.go b/parser/hysteria.go old mode 100644 new mode 100755 diff --git a/parser/hysteria2.go b/parser/hysteria2.go old mode 100644 new mode 100755 diff --git a/parser/parsers_map.go b/parser/parsers_map.go old mode 100644 new mode 100755 diff --git a/parser/port.go b/parser/port.go old mode 100644 new mode 100755 diff --git a/parser/shadowsocks.go b/parser/shadowsocks.go old mode 100644 new mode 100755 index 09d3c91..824419c --- a/parser/shadowsocks.go +++ b/parser/shadowsocks.go @@ -15,7 +15,6 @@ func ParseShadowsocks(proxy string) (model.Outbound, error) { if !strings.HasPrefix(proxy, constant.ShadowsocksPrefix) { 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://")) @@ -31,7 +30,6 @@ func ParseShadowsocks(proxy string) (model.Outbound, error) { } else { proxy = "ss://" + d } - needDecode = false } link, err := url.Parse(proxy) if err != nil { @@ -67,37 +65,28 @@ func ParseShadowsocks(proxy string) (model.Outbound, error) { } } - method := "" - password := "" - if needDecode { - user, err := util.DecodeBase64(link.User.Username()) + method := link.User.Username() + password, _ := link.User.Password() + + if password == "" { + user, err := util.DecodeBase64(method) + if err == nil { + methodAndPass := strings.SplitN(user, ":", 2) + if len(methodAndPass) == 2 { + method = methodAndPass[0] + password = methodAndPass[1] + } + } + } + if isLikelyBase64(password) { + password, err = util.DecodeBase64(password) if err != nil { return model.Outbound{}, &ParseError{ Type: ErrInvalidStruct, - Message: "missing method and password", + Message: "password decode error", Raw: proxy, } } - if user == "" { - return model.Outbound{}, &ParseError{ - Type: ErrInvalidStruct, - Message: "missing method and password", - Raw: proxy, - } - } - methodAndPass := strings.SplitN(user, ":", 2) - if len(methodAndPass) != 2 { - return model.Outbound{}, &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() } query := link.Query() @@ -136,3 +125,17 @@ func ParseShadowsocks(proxy string) (model.Outbound, error) { } return result, nil } + +func isLikelyBase64(s string) bool { + if len(s)%4 == 0 && strings.HasSuffix(s, "=") && !strings.Contains(strings.TrimSuffix(s, "="), "=") { + s = strings.TrimSuffix(s, "=") + chars := "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" + for _, c := range s { + if !strings.ContainsRune(chars, c) { + return false + } + } + return true + } + return false +} diff --git a/parser/trojan.go b/parser/trojan.go old mode 100644 new mode 100755 diff --git a/parser/vless.go b/parser/vless.go old mode 100644 new mode 100755 diff --git a/parser/vmess.go b/parser/vmess.go old mode 100644 new mode 100755 diff --git a/templates/android/dns.json b/templates/android/dns.json old mode 100644 new mode 100755 diff --git a/templates/android/experimental.json b/templates/android/experimental.json old mode 100644 new mode 100755 diff --git a/templates/android/inbounds.json b/templates/android/inbounds.json old mode 100644 new mode 100755 diff --git a/templates/android/log.json b/templates/android/log.json old mode 100644 new mode 100755 diff --git a/templates/android/ntp.json b/templates/android/ntp.json old mode 100644 new mode 100755 diff --git a/templates/android/outbounds.json b/templates/android/outbounds.json old mode 100644 new mode 100755 diff --git a/templates/android/route.json b/templates/android/route.json old mode 100644 new mode 100755 diff --git a/templates/android/route_rule_set.json b/templates/android/route_rule_set.json old mode 100644 new mode 100755 diff --git a/templates/example-android.json b/templates/example-android.json old mode 100644 new mode 100755 diff --git a/templates/example-linux.json b/templates/example-linux.json old mode 100644 new mode 100755 diff --git a/templates/example-windows.json b/templates/example-windows.json old mode 100644 new mode 100755 diff --git a/templates/linux/dns.json b/templates/linux/dns.json old mode 100644 new mode 100755 diff --git a/templates/linux/experimental.json b/templates/linux/experimental.json old mode 100644 new mode 100755 diff --git a/templates/linux/inbounds.json b/templates/linux/inbounds.json old mode 100644 new mode 100755 diff --git a/templates/linux/log.json b/templates/linux/log.json old mode 100644 new mode 100755 diff --git a/templates/linux/ntp.json b/templates/linux/ntp.json old mode 100644 new mode 100755 diff --git a/templates/linux/outbounds.json b/templates/linux/outbounds.json old mode 100644 new mode 100755 diff --git a/templates/linux/route.json b/templates/linux/route.json old mode 100644 new mode 100755 diff --git a/templates/linux/route_rule_set.json b/templates/linux/route_rule_set.json old mode 100644 new mode 100755 diff --git a/templates/windows/dns.json b/templates/windows/dns.json old mode 100644 new mode 100755 diff --git a/templates/windows/experimental.json b/templates/windows/experimental.json old mode 100644 new mode 100755 diff --git a/templates/windows/inbounds.json b/templates/windows/inbounds.json old mode 100644 new mode 100755 diff --git a/templates/windows/log.json b/templates/windows/log.json old mode 100644 new mode 100755 diff --git a/templates/windows/ntp.json b/templates/windows/ntp.json old mode 100644 new mode 100755 diff --git a/templates/windows/outbounds.json b/templates/windows/outbounds.json old mode 100644 new mode 100755 diff --git a/templates/windows/route.json b/templates/windows/route.json old mode 100644 new mode 100755 diff --git a/templates/windows/route_rule_set.json b/templates/windows/route_rule_set.json old mode 100644 new mode 100755 diff --git a/util/base64.go b/util/base64.go old mode 100644 new mode 100755 diff --git a/util/fetch.go b/util/fetch.go old mode 100644 new mode 100755