GuanM/XrayR
1
0
Fork 0
mirror of https://github.com/XrayR-project/XrayR.git synced 2025-06-08 13:29:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: shadowsocks2022 user manager not working

Browse Source
This commit is contained in:
Senis John 2022-12-04 00:42:35 +08:00
parent 5397720430
commit fc16cb0972
No known key found for this signature in database
GPG Key ID: 845E9E4727C3E1A4
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
service/controller/inboundbuilder.go
View File

@ -3,6 +3,7 @@ package controller
import (
"crypto/rand"
"encoding/base64"
"encoding/hex"
"encoding/json"
"fmt"
@ -105,10 +106,16 @@ func InboundBuilder(config *Config, nodeInfo *api.NodeInfo, tag string) (*core.I
proxySetting, _ := proxySetting.(*conf.ShadowsocksServerConfig)
// shadowsocks must have a random password
if !C.Contains(shadowaead_2022.List, cipher) {
b := make([]byte, 16)
rand.Read(b)
proxySetting.Password = hex.EncodeToString(b)
// shadowsocks2022's password == user PSK, thus should a length of string >= 32 and base64 encoder
b := make([]byte, 16)
rand.Read(b)
randPasswd := hex.EncodeToString(b)
if C.Contains(shadowaead_2022.List, cipher) {
proxySetting.Users = append(proxySetting.Users, &conf.ShadowsocksUserConfig{
Password: base64.StdEncoding.EncodeToString([]byte(randPasswd)),
})
} else {
proxySetting.Password = randPasswd
}
proxySetting.NetworkList = &conf.NetworkList{"tcp", "udp"}

20
service/controller/userbuilder.go
View File

@ -1,6 +1,7 @@
package controller
import (
"encoding/base64"
"fmt"
"strings"
@ -10,6 +11,7 @@ import (
"github.com/xtls/xray-core/common/serial"
"github.com/xtls/xray-core/infra/conf"
"github.com/xtls/xray-core/proxy/shadowsocks"
"github.com/xtls/xray-core/proxy/shadowsocks_2022"
"github.com/xtls/xray-core/proxy/trojan"
"github.com/xtls/xray-core/proxy/vless"
@ -78,11 +80,14 @@ func (c *Controller) buildSSUser(userInfo *[]api.UserInfo, method string) (users
for i, user := range *userInfo {
// todo waiting xray-core complete proxy.UserManager in shadowsocks2022
if C.Contains(shadowaead_2022.List, strings.ToLower(method)) {
e := c.buildUserTag(&user)
users[i] = &protocol.User{
Level: 0,
Email: c.buildUserTag(&user),
Account: serial.ToTypedMessage(&shadowsocks.Account{
Password: user.Passwd,
Email: e,
Account: serial.ToTypedMessage(&shadowsocks_2022.User{
Key: base64.StdEncoding.EncodeToString([]byte(user.Passwd)),
Email: e,
Level: 0,
}),
}
} else {
@ -105,11 +110,14 @@ func (c *Controller) buildSSPluginUser(userInfo *[]api.UserInfo) (users []*proto
for i, user := range *userInfo {
// todo waiting xray-core complete proxy.UserManager in shadowsocks2022
if C.Contains(shadowaead_2022.List, strings.ToLower(user.Method)) {
e := c.buildUserTag(&user)
users[i] = &protocol.User{
Level: 0,
Email: c.buildUserTag(&user),
Account: serial.ToTypedMessage(&shadowsocks.Account{
Password: user.Passwd,
Email: e,
Account: serial.ToTypedMessage(&shadowsocks_2022.User{
Key: base64.StdEncoding.EncodeToString([]byte(user.Passwd)),
Email: e,
Level: 0,
}),
}
} else {