From 6fedc8d9425ef3726477d51d80187bd3dfa5e47c Mon Sep 17 00:00:00 2001
From: MetaCubeX <maze.y2b@github.com>
Date: Wed, 22 Jun 2022 22:18:13 +0800
Subject: [PATCH] fix: Converter for password of ss2022

fix: Converter for password of ss2022

fixup! fix: Converter for password of ss2022 and ws

fix: Converter for password of ss2022 and ws
---
 common/convert/converter.go | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/common/convert/converter.go b/common/convert/converter.go
index eb01524b..4c1aceb5 100644
--- a/common/convert/converter.go
+++ b/common/convert/converter.go
@@ -114,7 +114,6 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 				headers := make(map[string]any)
 				wsOpts := make(map[string]any)
 
-				//headers["Host"] = RandHost()
 				headers["User-Agent"] = RandUserAgent()
 
 				wsOpts["path"] = query.Get("path")
@@ -209,9 +208,9 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			case "ws":
 				headers := make(map[string]any)
 				wsOpts := make(map[string]any)
-
-				headers["Host"] = []string{query.Get("host")}
-				wsOpts["path"] = []string{query.Get("path")}
+				headers["User-Agent"] = RandUserAgent()
+				headers["Host"] = query.Get("host")
+				wsOpts["path"] = query.Get("path")
 				wsOpts["headers"] = headers
 
 				vless["ws-opts"] = wsOpts
@@ -305,10 +304,10 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 				wsOpts := make(map[string]any)
 				wsOpts["path"] = []string{"/"}
 				if values["host"] != "" && values["host"] != nil {
-					headers["Host"] = []string{values["host"].(string)}
+					headers["Host"] = values["host"].(string)
 				}
 				if values["path"] != "" && values["path"] != nil {
-					wsOpts["path"] = []string{values["path"].(string)}
+					wsOpts["path"] = values["path"].(string)
 				}
 				wsOpts["headers"] = headers
 				vmess["ws-opts"] = wsOpts
@@ -348,9 +347,9 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			)
 
 			if password, found = urlSS.User.Password(); !found {
-				dcBuf, err := encRaw.DecodeString(cipher)
-				if err != nil {
-					continue
+				dcBuf, _ := enc.DecodeString(cipher)
+				if !strings.Contains(string(dcBuf), "2022-blake3") {
+					dcBuf, _ = encRaw.DecodeString(cipher)
 				}
 				cipher, password, found = strings.Cut(string(dcBuf), ":")
 				if !found {