mirror of
https://github.com/XTLS/Xray-core.git
synced 2025-08-22 09:36:49 +08:00
VLESS practice: Use user-sent VLESS UUID's 7th<<8 | 8th bytes as vlessRoute
instead
https://github.com/XTLS/Xray-core/pull/5009#issuecomment-3195718690
Replaces 105b306d07
This commit is contained in:
@@ -456,7 +456,7 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection s
|
||||
}
|
||||
inbound.Name = "vless"
|
||||
inbound.User = request.User
|
||||
inbound.VlessRoute = net.Port(userSentID[15])
|
||||
inbound.VlessRoute = net.PortFromBytes(userSentID[6:8])
|
||||
|
||||
account := request.User.Account.(*vless.MemoryAccount)
|
||||
|
||||
|
@@ -18,6 +18,12 @@ type Validator interface {
|
||||
GetCount() int64
|
||||
}
|
||||
|
||||
func ProcessUUID(id [16]byte) [16]byte {
|
||||
id[6] = 0
|
||||
id[7] = 0
|
||||
return id
|
||||
}
|
||||
|
||||
// MemoryValidator stores valid VLESS users.
|
||||
type MemoryValidator struct {
|
||||
// Considering email's usage here, map + sync.Mutex/RWMutex may have better performance.
|
||||
@@ -33,7 +39,7 @@ func (v *MemoryValidator) Add(u *protocol.MemoryUser) error {
|
||||
return errors.New("User ", u.Email, " already exists.")
|
||||
}
|
||||
}
|
||||
v.users.Store([15]byte(u.Account.(*MemoryAccount).ID.Bytes()), u)
|
||||
v.users.Store(ProcessUUID(u.Account.(*MemoryAccount).ID.UUID()), u)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -48,13 +54,13 @@ func (v *MemoryValidator) Del(e string) error {
|
||||
return errors.New("User ", e, " not found.")
|
||||
}
|
||||
v.email.Delete(le)
|
||||
v.users.Delete([15]byte(u.(*protocol.MemoryUser).Account.(*MemoryAccount).ID.Bytes()))
|
||||
v.users.Delete(ProcessUUID(u.(*protocol.MemoryUser).Account.(*MemoryAccount).ID.UUID()))
|
||||
return nil
|
||||
}
|
||||
|
||||
// Get a VLESS user with UUID, nil if user doesn't exist.
|
||||
func (v *MemoryValidator) Get(id uuid.UUID) *protocol.MemoryUser {
|
||||
u, _ := v.users.Load([15]byte(id[:]))
|
||||
u, _ := v.users.Load(ProcessUUID(id))
|
||||
if u != nil {
|
||||
return u.(*protocol.MemoryUser)
|
||||
}
|
||||
|
Reference in New Issue
Block a user