nite/sub2clash
1
Fork 0
mirror of https://github.com/bestnite/sub2clash.git synced 2025-07-04 11:52:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enhance Base64 validation in isLikelyBase64 function to include UTF-8 check and improve decoding logic.

Browse Source
This commit is contained in:
nite
2025-06-26 10:58:56 +08:00
parent 307c36aa8d
commit b256c5e809
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
parser/common.go
View File

@ -5,6 +5,7 @@ import (
"errors" "errors"
"strconv" "strconv"
"strings" "strings"
"unicode/utf8"
P "github.com/bestnite/sub2clash/model/proxy" P "github.com/bestnite/sub2clash/model/proxy"
) )
@ -32,8 +33,13 @@ func ParsePort(portStr string) (int, error) {
return port, nil return port, nil
} }
// isLikelyBase64 不严格判断是否是合法的 Base64, 很多分享链接不符合 Base64 规范
func isLikelyBase64(s string) bool { func isLikelyBase64(s string) bool {
if len(s)%4 == 0 && !strings.Contains(strings.TrimSuffix(s, "="), "=") { if strings.TrimSpace(s) == "" {
return false
}
if !strings.Contains(strings.TrimSuffix(s, "="), "=") {
s = strings.TrimSuffix(s, "=") s = strings.TrimSuffix(s, "=")
chars := "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" chars := "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
for _, c := range s { for _, c := range s {
@ -41,17 +47,25 @@ func isLikelyBase64(s string) bool {
return false return false
} }
} }
return true
} }
decoded, err := DecodeBase64(s)
if err != nil {
return false return false
}
if !utf8.ValidString(decoded) {
return false
}
return true
} }
func DecodeBase64(s string) (string, error) { func DecodeBase64(s string) (string, error) {
s = strings.TrimSpace(s) s = strings.TrimSpace(s)
if strings.Contains(s, "-") || strings.Contains(s, "_") { if strings.Contains(s, "-") || strings.Contains(s, "_") {
s = strings.Replace(s, "-", "+", -1) s = strings.ReplaceAll(s, "-", "+")
s = strings.Replace(s, "_", "/", -1) s = strings.ReplaceAll(s, "_", "/")
} }
if len(s)%4 != 0 { if len(s)%4 != 0 {
s += strings.Repeat("=", 4-len(s)%4) s += strings.Repeat("=", 4-len(s)%4)