feat: support base64 decode before resolve clash subscription. #22

mzz2017 · Sep 28, 2022 · 60b77f0 · 60b77f0
1 parent ef64eae
commit 60b77f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/cmd/subscription.go b/cmd/subscription.go
@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"github.com/mzz2017/gg/common"
@@ -41,8 +40,14 @@ type SIP008Server struct {
 func resolveSubscriptionAsClash(log *logrus.Logger, b []byte) (dialers []*dialer.Dialer, err error) {
 	log.Traceln("try to resolve as Clash")
 
+	// base64 decode
+	raw, e := common.Base64StdDecode(string(b))
+	if e != nil {
+		raw, _ = common.Base64URLDecode(string(b))
+	}
+
 	var conf ClashConfig
-	if err = yaml.NewDecoder(bytes.NewReader(b)).Decode(&conf); err != nil {
+	if err = yaml.NewDecoder(strings.NewReader(raw)).Decode(&conf); err != nil {
 		return nil, err
 	}
 	for i, node := range conf.Proxy {

diff --git a/common/util.go b/common/util.go
@@ -19,7 +19,7 @@ func Base64StdDecode(s string) (string, error) {
 	if err != nil {
 		return saver, err
 	}
-	return string(raw), err
+	return string(raw), nil
 }
 
 func BoolToString(b bool) string {
@@ -46,7 +46,7 @@ func Base64URLDecode(s string) (string, error) {
 	if err != nil {
 		return saver, err
 	}
-	return string(raw), err
+	return string(raw), nil
 }
 
 func ObjectToKV(v interface{}, tagName string) (kv []string) {