mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-16 20:45:50 +00:00
367152556a
1. **Fixed XPadding Placement Dropdown**: - Added the missing `cookie` and `query` options to `xPaddingPlacement` (`stream_xhttp.html`). - *Why:* Previously, users wanting `cookie` obfuscation were forced to use the `header` placement string. This caused Xray-core to blindly intercept the entire monolithic HTTP Cookie header, failing internal padding-length validations and causing the inbound to silently drop the connection. 2. **Fixed Uplink Data Placement Validation**: - Replaced the unsupported `query` option with `cookie` in `uplinkDataPlacement`. - *Why:* Xray-core's `transport_internet.go` explicitly forbids `query` as an uplink placement option. Selecting it from the UI previously sent a payload that would cause Xray-core to instantly throw an `unsupported uplink data placement: query` panic. Adding `cookie` perfectly aligns the UI with Xray-core restrictions. ### Related Issues - Resolves #3992
82 lines
1.9 KiB
Go
82 lines
1.9 KiB
Go
package trojan
|
|
|
|
import (
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/common/protocol"
|
|
)
|
|
|
|
// Validator stores valid trojan users.
|
|
type Validator struct {
|
|
// Considering email's usage here, map + sync.Mutex/RWMutex may have better performance.
|
|
email sync.Map
|
|
users sync.Map
|
|
}
|
|
|
|
// Add a trojan user, Email must be empty or unique.
|
|
func (v *Validator) Add(u *protocol.MemoryUser) error {
|
|
if u.Email != "" {
|
|
_, loaded := v.email.LoadOrStore(strings.ToLower(u.Email), u)
|
|
if loaded {
|
|
return errors.New("User ", u.Email, " already exists.")
|
|
}
|
|
}
|
|
v.users.Store(hexString(u.Account.(*MemoryAccount).Key), u)
|
|
return nil
|
|
}
|
|
|
|
// Del a trojan user with a non-empty Email.
|
|
func (v *Validator) Del(e string) error {
|
|
if e == "" {
|
|
return errors.New("Email must not be empty.")
|
|
}
|
|
le := strings.ToLower(e)
|
|
u, _ := v.email.Load(le)
|
|
if u == nil {
|
|
return errors.New("User ", e, " not found.")
|
|
}
|
|
v.email.Delete(le)
|
|
v.users.Delete(hexString(u.(*protocol.MemoryUser).Account.(*MemoryAccount).Key))
|
|
return nil
|
|
}
|
|
|
|
// Get a trojan user with hashed key, nil if user doesn't exist.
|
|
func (v *Validator) Get(hash string) *protocol.MemoryUser {
|
|
u, _ := v.users.Load(hash)
|
|
if u != nil {
|
|
return u.(*protocol.MemoryUser)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Get a trojan user with hashed key, nil if user doesn't exist.
|
|
func (v *Validator) GetByEmail(email string) *protocol.MemoryUser {
|
|
email = strings.ToLower(email)
|
|
u, _ := v.email.Load(email)
|
|
if u != nil {
|
|
return u.(*protocol.MemoryUser)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Get all users
|
|
func (v *Validator) GetAll() []*protocol.MemoryUser {
|
|
var u = make([]*protocol.MemoryUser, 0, 100)
|
|
v.email.Range(func(key, value interface{}) bool {
|
|
u = append(u, value.(*protocol.MemoryUser))
|
|
return true
|
|
})
|
|
return u
|
|
}
|
|
|
|
// Get users count
|
|
func (v *Validator) GetCount() int64 {
|
|
var c int64 = 0
|
|
v.email.Range(func(key, value interface{}) bool {
|
|
c++
|
|
return true
|
|
})
|
|
return c
|
|
}
|