tcjlj/V2bX
1
0
Fork 0
mirror of https://github.com/wyx2685/V2bX.git synced 2025-02-08 17:18:13 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: wrong typo

Browse Source
This commit is contained in:
cubemaze 2023-07-19 23:41:42 +08:00
parent 7e0b9f694b
commit d2ead10ddf
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/panel/node.go
View File

@ -72,20 +72,20 @@ type NodeInfo struct {
} }
type V2rayExtraConfig struct { type V2rayExtraConfig struct {
EnableVless bool `json:"EnableVless"` EnableVless string `json:"EnableVless"`
VlessFlow string `json:"VlessFlow"` VlessFlow string `json:"VlessFlow"`
EnableReality bool `json:"EnableReality"` EnableReality string `json:"EnableReality"`
RealityConfig *RealityConfig `json:"RealityConfig"` RealityConfig *RealityConfig `json:"RealityConfig"`
} }
type RealityConfig struct { type RealityConfig struct {
Dest interface{} `yaml:"Dest" json:"Dest"` Dest interface{} `yaml:"Dest" json:"Dest"`
Xver uint64 `yaml:"Xver" json:"Xver"` Xver string `yaml:"Xver" json:"Xver"`
ServerNames []string `yaml:"ServerNames" json:"ServerNames"` ServerNames []string `yaml:"ServerNames" json:"ServerNames"`
PrivateKey string `yaml:"PrivateKey" json:"PrivateKey"` PrivateKey string `yaml:"PrivateKey" json:"PrivateKey"`
MinClientVer string `yaml:"MinClientVer" json:"MinClientVer"` MinClientVer string `yaml:"MinClientVer" json:"MinClientVer"`
MaxClientVer string `yaml:"MaxClientVer" json:"MaxClientVer"` MaxClientVer string `yaml:"MaxClientVer" json:"MaxClientVer"`
MaxTimeDiff uint64 `yaml:"MaxTimeDiff" json:"MaxTimeDiff"` MaxTimeDiff string `yaml:"MaxTimeDiff" json:"MaxTimeDiff"`
ShortIds []string `yaml:"ShortIds" json:"ShortIds"` ShortIds []string `yaml:"ShortIds" json:"ShortIds"`
} }
@ -155,9 +155,9 @@ func (c *Client) GetNodeInfo() (node *NodeInfo, err error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("decode v2ray extra error: %s", err) return nil, fmt.Errorf("decode v2ray extra error: %s", err)
} }
if node.ExtraConfig.EnableReality { if node.ExtraConfig.EnableReality == "true" {
if node.ExtraConfig.RealityConfig == nil { if node.ExtraConfig.RealityConfig == nil {
node.ExtraConfig.EnableReality = false node.ExtraConfig.EnableReality = "false"
} else { } else {
key := crypt.GenX25519Private([]byte(strconv.Itoa(c.NodeId) + c.NodeType + c.Token + key := crypt.GenX25519Private([]byte(strconv.Itoa(c.NodeId) + c.NodeType + c.Token +
node.ExtraConfig.RealityConfig.PrivateKey)) node.ExtraConfig.RealityConfig.PrivateKey))

11
core/xray/inbound.go
View File

@ -6,6 +6,7 @@ import (
"encoding/hex" "encoding/hex"
"errors" "errors"
"fmt" "fmt"
"strconv"
"github.com/Yuzuki616/V2bX/api/panel" "github.com/Yuzuki616/V2bX/api/panel"
"github.com/Yuzuki616/V2bX/conf" "github.com/Yuzuki616/V2bX/conf"
@ -90,21 +91,23 @@ func buildInbound(config *conf.ControllerConfig, nodeInfo *panel.NodeInfo, tag s
} }
case "remote": case "remote":
default: default:
if nodeInfo.ExtraConfig.EnableReality { if nodeInfo.ExtraConfig.EnableReality == "true" {
rc := nodeInfo.ExtraConfig.RealityConfig rc := nodeInfo.ExtraConfig.RealityConfig
in.StreamSetting.Security = "reality" in.StreamSetting.Security = "reality"
d, err := json.Marshal(rc.Dest) d, err := json.Marshal(rc.Dest)
if err != nil { if err != nil {
return nil, fmt.Errorf("marshal reality dest error: %s", err) return nil, fmt.Errorf("marshal reality dest error: %s", err)
} }
Xver, _ := strconv.ParseUint(rc.Xver, 10, 64)
MaxTimeDiff, _ := strconv.ParseUint(rc.Xver, 10, 64)
in.StreamSetting.REALITYSettings = &coreConf.REALITYConfig{ in.StreamSetting.REALITYSettings = &coreConf.REALITYConfig{
Dest: d, Dest: d,
Xver: rc.Xver, Xver: Xver,
ServerNames: rc.ServerNames, ServerNames: rc.ServerNames,
PrivateKey: rc.PrivateKey, PrivateKey: rc.PrivateKey,
MinClientVer: rc.MinClientVer, MinClientVer: rc.MinClientVer,
MaxClientVer: rc.MaxClientVer, MaxClientVer: rc.MaxClientVer,
MaxTimeDiff: rc.MaxTimeDiff, MaxTimeDiff: MaxTimeDiff,
ShortIds: rc.ShortIds, ShortIds: rc.ShortIds,
} }
} else { } else {
@ -138,7 +141,7 @@ func buildInbound(config *conf.ControllerConfig, nodeInfo *panel.NodeInfo, tag s
} }
func buildV2ray(config *conf.ControllerConfig, nodeInfo *panel.NodeInfo, inbound *coreConf.InboundDetourConfig) error { func buildV2ray(config *conf.ControllerConfig, nodeInfo *panel.NodeInfo, inbound *coreConf.InboundDetourConfig) error {
if nodeInfo.ExtraConfig.EnableVless { if nodeInfo.ExtraConfig.EnableVless == "true" {
//Set vless //Set vless
inbound.Protocol = "vless" inbound.Protocol = "vless"
if config.XrayOptions.EnableFallback { if config.XrayOptions.EnableFallback {

2
core/xray/user.go
View File

@ -74,7 +74,7 @@ func (c *Core) AddUsers(p *vCore.AddUsersParams) (added int, err error) {
users := make([]*protocol.User, 0, len(p.UserInfo)) users := make([]*protocol.User, 0, len(p.UserInfo))
switch p.NodeInfo.Type { switch p.NodeInfo.Type {
case "v2ray": case "v2ray":
if p.NodeInfo.ExtraConfig.EnableVless { if p.NodeInfo.ExtraConfig.EnableVless == "true" {
users = buildVlessUsers(p.Tag, p.UserInfo, p.NodeInfo.ExtraConfig.VlessFlow) users = buildVlessUsers(p.Tag, p.UserInfo, p.NodeInfo.ExtraConfig.VlessFlow)
} else { } else {
users = buildVmessUsers(p.Tag, p.UserInfo) users = buildVmessUsers(p.Tag, p.UserInfo)