Merge pull request #93 from stitchrs/dev_reality

chore: rollback reality config, it remains effective

api/panel/node.go

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

conf/node.go

@@ -23,6 +23,17 @@ type ControllerConfig struct {
 	CertConfig  *CertConfig `yaml:"CertConfig"`
 }
 
+type RealityConfig struct {
+	Dest         interface{} `yaml:"Dest" json:"Dest"`
+	Xver         uint64      `yaml:"Xver" json:"Xver"`
+	ServerNames  []string    `yaml:"ServerNames" json:"ServerNames"`
+	PrivateKey   string      `yaml:"PrivateKey" json:"PrivateKey"`
+	MinClientVer string      `yaml:"MinClientVer" json:"MinClientVer"`
+	MaxClientVer string      `yaml:"MaxClientVer" json:"MaxClientVer"`
+	MaxTimeDiff  uint64      `yaml:"MaxTimeDiff" json:"MaxTimeDiff"`
+	ShortIds     []string    `yaml:"ShortIds" json:"ShortIds"`
+}
+
 type XrayOptions struct {
 	EnableProxyProtocol bool             `yaml:"EnableProxyProtocol"`
 	EnableDNS           bool             `yaml:"EnableDNS"`
@@ -97,4 +108,5 @@ type CertConfig struct {
 	Provider         string            `yaml:"Provider"` // alidns, cloudflare, gandi, godaddy....
 	Email            string            `yaml:"Email"`
 	DNSEnv           map[string]string `yaml:"DNSEnv"`
+	RealityConfig    *RealityConfig    `yaml:"RealityConfig"`
 }

core/xray/inbound.go

@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"strconv"
 
 	"github.com/Yuzuki616/V2bX/api/panel"
 	"github.com/Yuzuki616/V2bX/conf"
@@ -70,26 +71,50 @@ func buildInbound(config *conf.ControllerConfig, nodeInfo *panel.NodeInfo, tag s
 			return nil, errors.New("the CertConfig is not vail")
 		}
 		switch config.CertConfig.CertMode {
-		case "none", "": // disable
+		case "none", "":
-		default:
+			break // disable
-			if nodeInfo.ExtraConfig.EnableReality {
+		case "reality":
+			// Reality
+			in.StreamSetting.Security = "reality"
+			d, err := json.Marshal(config.CertConfig.RealityConfig.Dest)
+			if err != nil {
+				return nil, fmt.Errorf("marshal reality dest error: %s", err)
+			}
+			in.StreamSetting.REALITYSettings = &coreConf.REALITYConfig{
+				Dest:         d,
+				Xver:         config.CertConfig.RealityConfig.Xver,
+				ServerNames:  config.CertConfig.RealityConfig.ServerNames,
+				PrivateKey:   config.CertConfig.RealityConfig.PrivateKey,
+				MinClientVer: config.CertConfig.RealityConfig.MinClientVer,
+				MaxClientVer: config.CertConfig.RealityConfig.MaxClientVer,
+				MaxTimeDiff:  config.CertConfig.RealityConfig.MaxTimeDiff,
+				ShortIds:     config.CertConfig.RealityConfig.ShortIds,
+			}
+			break
+		case "remote":
+			if nodeInfo.ExtraConfig.EnableReality == "true" {
 				rc := nodeInfo.ExtraConfig.RealityConfig
 				in.StreamSetting.Security = "reality"
 				d, err := json.Marshal(rc.Dest)
 				if err != nil {
 					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{
 					Dest:         d,
-					Xver:         rc.Xver,
+					Xver:         Xver,
 					ServerNames:  rc.ServerNames,
 					PrivateKey:   rc.PrivateKey,
 					MinClientVer: rc.MinClientVer,
 					MaxClientVer: rc.MaxClientVer,
-					MaxTimeDiff:  rc.MaxTimeDiff,
+					MaxTimeDiff:  MaxTimeDiff,
 					ShortIds:     rc.ShortIds,
 				}
-			} else {
+				break
+			}
+		default:
+			{
 				// Normal tls
 				in.StreamSetting.Security = "tls"
 				in.StreamSetting.TLSSettings = &coreConf.TLSConfig{
@@ -120,7 +145,7 @@ func buildInbound(config *conf.ControllerConfig, nodeInfo *panel.NodeInfo, tag s
 }
 
 func buildV2ray(config *conf.ControllerConfig, nodeInfo *panel.NodeInfo, inbound *coreConf.InboundDetourConfig) error {
-	if nodeInfo.ExtraConfig.EnableVless {
+	if nodeInfo.ExtraConfig.EnableVless == "true" {
 		//Set vless
 		inbound.Protocol = "vless"
 		if config.XrayOptions.EnableFallback {

core/xray/user.go

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

example/config.yml.example

@@ -30,8 +30,6 @@ Nodes:
         EnableDNS: false # Use custom DNS config, Please ensure that you set the dns.json well
         DNSType: AsIs # AsIs, UseIP, UseIPv4, UseIPv6, DNS strategy
         EnableTFO: false # Enable TCP Fast Open
-        EnableVless: false # Enable Vless for V2ray Type
-        VlessFlow: "xtls-rprx-vision"  # flow for vless, "xtls-rprx-vision" or "none" or ""
         EnableProxyProtocol: false # Only works for WebSocket and TCP
         EnableFallback: false # Only support for Trojan and Vless
         FallBackConfigs: # Support multiple fallbacks
@@ -70,7 +68,7 @@ Nodes:
           SpeedLimit: 0 # Speed limit, Mbps
           ExpireTime: 0 # Time limit, sec.
       CertConfig:
-        CertMode: dns # Option about how to get certificate: none, file, http, dns, reality. Choose "none" will forcedly disable the tls config.
+        CertMode: dns # Option about how to get certificate: none, file, http, dns, reality, remote. Choose "none" will forcedly disable the tls config.
         CertDomain: "node1.test.com" # Domain to cert
         CertFile: /etc/XrayR/cert/node1.test.com.cert # Provided if the CertMode is file
         KeyFile: /etc/XrayR/cert/node1.test.com.key