refactor: simplify account handling and add tests for flow overrides

Author: M03ED

backend/xray/config.go

@@ -152,8 +152,7 @@ func (i *Inbound) syncUsers(users []*common.User) {
 					log.Println("error for user", user.GetEmail(), ":", err)
 					continue
 				}
-				newAccount := checkVless(i, *account)
-				i.clients[user.GetEmail()] = &newAccount
+				i.clients[user.GetEmail()] = account
 			}
 		}
 
@@ -217,8 +216,7 @@ func (i *Inbound) updateUser(account api.Account) {
 		i.clients[email] = a
 
 	case *api.VlessAccount:
-		newAccount := checkVless(i, *a)
-		i.clients[email] = &newAccount
+		i.clients[email] = a
 
 	case *api.TrojanAccount:
 		i.clients[email] = a
@@ -259,8 +257,7 @@ func (i *Inbound) updateUsers(accounts []api.Account, removeEmails []string) {
 	case Vless:
 		for _, account := range accounts {
 			if a, ok := account.(*api.VlessAccount); ok {
-				newAccount := checkVless(i, *a)
-				i.clients[account.GetEmail()] = &newAccount
+				i.clients[account.GetEmail()] = a
 			}
 		}
 

backend/xray/user.go

@@ -41,45 +41,28 @@ func setupUserAccount(user *common.User) (api.ProxySettings, error) {
 	return settings, nil
 }
 
-func checkVless(inbound *Inbound, account api.VlessAccount) api.VlessAccount {
-	if account.Flow != "" {
-
-		networkType, ok := inbound.StreamSettings["network"]
-		if !ok || !(networkType == "tcp" || networkType == "raw" || networkType == "kcp") {
-			account.Flow = ""
-			return account
-		}
-
-		securityType, ok := inbound.StreamSettings["security"]
-		if !ok || !(securityType == "tls" || securityType == "reality") {
-			account.Flow = ""
-			return account
-		}
-
-		rawMap, ok := inbound.StreamSettings["rawSettings"].(map[string]interface{})
-		if !ok {
-			rawMap, ok = inbound.StreamSettings["tcpSettings"].(map[string]interface{})
-			if !ok {
-				return account
-			}
-		}
-
-		headerMap, ok := rawMap["header"].(map[string]interface{})
-		if !ok {
-			return account
-		}
+func inboundFlow(inbound *Inbound) string {
+	if inbound == nil || inbound.Settings == nil {
+		return ""
+	}
+	flow, _ := inbound.Settings["flow"].(string)
+	return flow
+}
 
-		headerType, ok := headerMap["Type"].(string)
-		if !ok {
-			return account
-		}
+func accountForAPI(inbound *Inbound, account api.Account) api.Account {
+	vlessAccount, ok := account.(*api.VlessAccount)
+	if !ok {
+		return account
+	}
 
-		if headerType == "http" {
-			account.Flow = ""
-			return account
-		}
+	overrideFlow := inboundFlow(inbound)
+	if overrideFlow == "" {
+		return account
 	}
-	return account
+
+	copy := *vlessAccount
+	copy.Flow = overrideFlow
+	return &copy
 }
 
 func checkShadowsocks2022(method string, account api.ShadowsocksAccount) api.ShadowsocksAccount {
@@ -95,8 +78,7 @@ func isActiveInbound(inbound *Inbound, inbounds []string, settings api.ProxySett
 			if settings.Vless == nil {
 				return nil, false
 			}
-			account := checkVless(inbound, *settings.Vless)
-			return &account, true
+			return settings.Vless, true
 
 		case Vmess:
 			if settings.Vmess == nil {
@@ -157,7 +139,7 @@ func (x *Xray) SyncUser(ctx context.Context, user *common.User) error {
 		account, isActive := isActiveInbound(inbound, userInbounds, proxySetting)
 		if isActive {
 			inbound.updateUser(account)
-			err = handler.AddInboundUser(ctx, inbound.Tag, account)
+			err = handler.AddInboundUser(ctx, inbound.Tag, accountForAPI(inbound, account))
 			if err != nil {
 				log.Println(err)
 				errMessage += "\n" + err.Error()
@@ -204,7 +186,7 @@ func (x *Xray) UpdateUsers(ctx context.Context, users []*common.User) error {
 
 		for _, account := range update.accounts {
 			_ = handler.RemoveInboundUser(ctx, tag, account.GetEmail())
-			if err := handler.AddInboundUser(ctx, tag, account); err != nil {
+			if err := handler.AddInboundUser(ctx, tag, accountForAPI(inbound, account)); err != nil {
 				log.Println(err)
 				errMessage += "\n" + err.Error()
 			}

backend/xray/user_test.go

@@ -0,0 +1,115 @@
+package xray
+
+import (
+	"testing"
+
+	"github.com/google/uuid"
+
+	"github.com/pasarguard/node/backend/xray/api"
+	"github.com/pasarguard/node/common"
+)
+
+func TestAccountForAPIUsesInboundFlowOverrideWhenPresent(t *testing.T) {
+	user := &common.User{
+		Email: "user@example.com",
+		Proxies: &common.Proxy{
+			Vless: &common.Vless{
+				Id:   uuid.New().String(),
+				Flow: "user-flow",
+			},
+		},
+	}
+
+	account, err := api.NewVlessAccount(user)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	inbound := &Inbound{
+		Settings: map[string]any{
+			"flow": "inbound-flow",
+		},
+	}
+
+	apiAccount := accountForAPI(inbound, account)
+	vlessAccount, ok := apiAccount.(*api.VlessAccount)
+	if !ok {
+		t.Fatalf("unexpected account type: %T", apiAccount)
+	}
+	if vlessAccount.Flow != "inbound-flow" {
+		t.Fatalf("unexpected flow: got %q want %q", vlessAccount.Flow, "inbound-flow")
+	}
+	if account.Flow != "user-flow" {
+		t.Fatalf("original account flow was mutated: got %q want %q", account.Flow, "user-flow")
+	}
+}
+
+func TestAccountForAPIUsesUserFlowWhenInboundFlowEmpty(t *testing.T) {
+	user := &common.User{
+		Email: "user@example.com",
+		Proxies: &common.Proxy{
+			Vless: &common.Vless{
+				Id:   uuid.New().String(),
+				Flow: "user-flow",
+			},
+		},
+	}
+
+	account, err := api.NewVlessAccount(user)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	inbound := &Inbound{
+		Settings: map[string]any{
+			"flow": "",
+		},
+	}
+
+	apiAccount := accountForAPI(inbound, account)
+	vlessAccount, ok := apiAccount.(*api.VlessAccount)
+	if !ok {
+		t.Fatalf("unexpected account type: %T", apiAccount)
+	}
+	if vlessAccount.Flow != "user-flow" {
+		t.Fatalf("unexpected flow: got %q want %q", vlessAccount.Flow, "user-flow")
+	}
+}
+
+func TestIsActiveInboundKeepsUserFlowForConfigStorage(t *testing.T) {
+	user := &common.User{
+		Email:    "user@example.com",
+		Inbounds: []string{"vless-in"},
+		Proxies: &common.Proxy{
+			Vless: &common.Vless{
+				Id:   uuid.New().String(),
+				Flow: "user-flow",
+			},
+		},
+	}
+
+	settings, err := setupUserAccount(user)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	inbound := &Inbound{
+		Tag:      "vless-in",
+		Protocol: Vless,
+		Settings: map[string]any{
+			"flow": "inbound-flow",
+		},
+	}
+
+	account, ok := isActiveInbound(inbound, user.Inbounds, settings)
+	if !ok {
+		t.Fatal("expected inbound to be active")
+	}
+	vlessAccount, ok := account.(*api.VlessAccount)
+	if !ok {
+		t.Fatalf("unexpected account type: %T", account)
+	}
+	if vlessAccount.Flow != "user-flow" {
+		t.Fatalf("unexpected config flow: got %q want %q", vlessAccount.Flow, "user-flow")
+	}
+}