GuanM/XrayR
1
0
Fork 0
mirror of https://github.com/XrayR-project/XrayR.git synced 2025-07-15 15:39:49 +00:00
Code Issues Actions1 Packages Projects Releases Wiki Activity

fix: only encode userKey with base64 for V2board

Browse Source
This commit is contained in:
pocketW 2022-12-20 09:05:18 +11:00
parent 224224084e
commit 03b7bf6ed1
1 changed files with 7 additions and 7 deletions

14
service/controller/userbuilder.go

@ -85,7 +85,7 @@ func (c *Controller) buildSSUser(userInfo *[]api.UserInfo, method string) (users
// shadowsocks2022 Key = "openssl rand -base64 32" and multi users needn't cipher method // shadowsocks2022 Key = "openssl rand -base64 32" and multi users needn't cipher method
if C.Contains(shadowaead_2022.List, strings.ToLower(method)) { if C.Contains(shadowaead_2022.List, strings.ToLower(method)) {
e := c.buildUserTag(&user) e := c.buildUserTag(&user)
userKey, err := checkShadowsocksPassword(user.Passwd, method) userKey, err := c.checkShadowsocksPassword(user.Passwd, method)
if err != nil { if err != nil {
newError(fmt.Errorf("[UID: %d] %s", user.UID, err)).AtError().WriteToLog() newError(fmt.Errorf("[UID: %d] %s", user.UID, err)).AtError().WriteToLog()
continue continue
@ -120,7 +120,7 @@ func (c *Controller) buildSSPluginUser(userInfo *[]api.UserInfo) (users []*proto
// shadowsocks2022 Key = openssl rand -base64 32 and multi users needn't cipher method // shadowsocks2022 Key = openssl rand -base64 32 and multi users needn't cipher method
if C.Contains(shadowaead_2022.List, strings.ToLower(user.Method)) { if C.Contains(shadowaead_2022.List, strings.ToLower(user.Method)) {
e := c.buildUserTag(&user) e := c.buildUserTag(&user)
userKey, err := checkShadowsocksPassword(user.Passwd, user.Method) userKey, err := c.checkShadowsocksPassword(user.Passwd, user.Method)
if err != nil { if err != nil {
newError(fmt.Errorf("[UID: %d] %s", user.UID, err)).AtError().WriteToLog() newError(fmt.Errorf("[UID: %d] %s", user.UID, err)).AtError().WriteToLog()
continue continue
@ -171,14 +171,12 @@ func (c *Controller) buildUserTag(user *api.UserInfo) string {
return fmt.Sprintf("%s|%s|%d", c.Tag, user.Email, user.UID) return fmt.Sprintf("%s|%s|%d", c.Tag, user.Email, user.UID)
} }
func checkShadowsocksPassword(password string, method string) (string, error) { func (c *Controller) checkShadowsocksPassword(password string, method string) (string, error) {
if rxBase64.MatchString(password) { if c.panelType == "V2board" {
return password, nil var userKey string
} else {
if len(password) < 16 { if len(password) < 16 {
return "", fmt.Errorf("shadowsocks2022 key's length must be greater than 16") return "", fmt.Errorf("shadowsocks2022 key's length must be greater than 16")
} }
var userKey string
if method == "2022-blake3-aes-128-gcm" { if method == "2022-blake3-aes-128-gcm" {
userKey = password[:16] userKey = password[:16]
} else { } else {
@ -188,5 +186,7 @@ func checkShadowsocksPassword(password string, method string) (string, error) {
userKey = password[:32] userKey = password[:32]
} }
return base64.StdEncoding.EncodeToString([]byte(userKey)), nil return base64.StdEncoding.EncodeToString([]byte(userKey)), nil
} else {
return password, nil
} }
} }