xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Converter panic on bad VMess share links

Browse source
This commit is contained in:
gVisor bot 2023-04-12 14:40:38 +08:00
parent 4733356a76
commit da1b748348
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common/buf/sing.go
View file

@ -9,10 +9,12 @@ const BufferSize = buf.BufferSize
type Buffer = buf.Buffer type Buffer = buf.Buffer
var New = buf.New var (
var StackNew = buf.StackNew New = buf.New
var StackNewSize = buf.StackNewSize StackNew = buf.StackNew
var With = buf.With StackNewSize = buf.StackNewSize
With = buf.With
)
var KeepAlive = common.KeepAlive var KeepAlive = common.KeepAlive
@ -21,5 +23,7 @@ func Dup[T any](obj T) T {
return common.Dup(obj) return common.Dup(obj)
} }
var Must = common.Must var (
var Error = common.Error Must = common.Must
Error = common.Error
)

11
common/convert/converter.go
View file

@ -5,10 +5,11 @@ import (
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/Dreamacro/clash/log"
"net/url" "net/url"
"strconv" "strconv"
"strings" "strings"
"github.com/Dreamacro/clash/log"
) )
// ConvertsV2Ray convert V2Ray subscribe proxies data to clash proxies config // ConvertsV2Ray convert V2Ray subscribe proxies data to clash proxies config
@ -201,7 +202,8 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
vmess["servername"] = sni vmess["servername"] = sni
} }
network := strings.ToLower(values["net"].(string)) network, _ := values["net"].(string)
network = strings.ToLower(network)
if values["type"] == "http" { if values["type"] == "http" {
network = "http" network = "http"
} else if network == "http" { } else if network == "http" {
@ -209,10 +211,13 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
} }
vmess["network"] = network vmess["network"] = network
tls := strings.ToLower(values["tls"].(string)) tls, ok := values["tls"].(string)
if ok {
tls = strings.ToLower(tls)
if strings.HasSuffix(tls, "tls") { if strings.HasSuffix(tls, "tls") {
vmess["tls"] = true vmess["tls"] = true
} }
}
switch network { switch network {
case "http": case "http":