mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-06-28 00:24:19 +00:00
MHSanaei
896016f7f6
DelInboundClientByEmail gated the runtime RemoveUser/DeleteUser (and its push-plan resolution) on !emailShared. But Xray users are keyed by inbound tag + email, so a client attached to two inbounds left its user live in the running Xray of every inbound where the email was still shared by a sibling inbound, until an Xray restart. Decouple the per-inbound runtime removal from emailShared; keep emailShared only for preserving the shared email-keyed client_traffics/IP rows.
35 lines
1.2 KiB
Go
35 lines
1.2 KiB
Go
package service
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/google/uuid"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
)
|
|
|
|
// Deleting a client that is attached to more than one inbound must still remove
|
|
// the user from the running runtime of the inbound being deleted from. The
|
|
// runtime user is keyed by inbound tag, so a sibling inbound still carrying the
|
|
// same email (emailShared) must not suppress the per-inbound runtime removal —
|
|
// otherwise the deleted user keeps connecting on that inbound until Xray
|
|
// restart (#5543).
|
|
func TestDelInboundClientByEmail_SharedEmailStillRemovesFromRuntime(t *testing.T) {
|
|
setupBulkDB(t)
|
|
nodeID, fake := setupNodeRuntime(t)
|
|
|
|
shared := []model.Client{{ID: uuid.NewString(), Email: "shared@x", Enable: true}}
|
|
ibA := nodeInbound(t, nodeID, 31001, shared)
|
|
nodeInbound(t, nodeID, 31002, shared)
|
|
|
|
svc := &ClientService{}
|
|
inboundSvc := &InboundService{}
|
|
|
|
if _, err := svc.DelInboundClientByEmail(inboundSvc, ibA.Id, "shared@x", false); err != nil {
|
|
t.Fatalf("DelInboundClientByEmail: %v", err)
|
|
}
|
|
|
|
if got := fake.deleteUser.Load(); got != 1 {
|
|
t.Fatalf("shared-email delete dispatched %d DeleteUser RPCs, want 1 (must remove from the deleted inbound's runtime despite the sibling inbound) (#5543)", got)
|
|
}
|
|
}
|