mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-17 21:15: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
129 lines
2.2 KiB
Go
129 lines
2.2 KiB
Go
package account
|
|
|
|
import (
|
|
"sync"
|
|
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/common/protocol"
|
|
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
func (a *Account) AsAccount() (protocol.Account, error) {
|
|
return &MemoryAccount{
|
|
Auth: a.Auth,
|
|
}, nil
|
|
}
|
|
|
|
type MemoryAccount struct {
|
|
Auth string
|
|
}
|
|
|
|
func (a *MemoryAccount) Equals(another protocol.Account) bool {
|
|
if account, ok := another.(*MemoryAccount); ok {
|
|
return a.Auth == account.Auth
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (a *MemoryAccount) ToProto() proto.Message {
|
|
return &Account{
|
|
Auth: a.Auth,
|
|
}
|
|
}
|
|
|
|
type Validator struct {
|
|
emails map[string]struct{}
|
|
users map[string]*protocol.MemoryUser
|
|
|
|
mutex sync.Mutex
|
|
}
|
|
|
|
func NewValidator() *Validator {
|
|
return &Validator{
|
|
emails: make(map[string]struct{}),
|
|
users: make(map[string]*protocol.MemoryUser),
|
|
}
|
|
}
|
|
|
|
func (v *Validator) Add(u *protocol.MemoryUser) error {
|
|
v.mutex.Lock()
|
|
defer v.mutex.Unlock()
|
|
|
|
if u.Email != "" {
|
|
if _, ok := v.emails[u.Email]; ok {
|
|
return errors.New("User ", u.Email, " already exists.")
|
|
}
|
|
v.emails[u.Email] = struct{}{}
|
|
}
|
|
v.users[u.Account.(*MemoryAccount).Auth] = u
|
|
|
|
return nil
|
|
}
|
|
|
|
func (v *Validator) Del(email string) error {
|
|
if email == "" {
|
|
return errors.New("Email must not be empty.")
|
|
}
|
|
|
|
v.mutex.Lock()
|
|
defer v.mutex.Unlock()
|
|
|
|
if _, ok := v.emails[email]; !ok {
|
|
return errors.New("User ", email, " not found.")
|
|
}
|
|
delete(v.emails, email)
|
|
for key, user := range v.users {
|
|
if user.Email == email {
|
|
delete(v.users, key)
|
|
break
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (v *Validator) Get(auth string) *protocol.MemoryUser {
|
|
v.mutex.Lock()
|
|
defer v.mutex.Unlock()
|
|
|
|
return v.users[auth]
|
|
}
|
|
|
|
func (v *Validator) GetByEmail(email string) *protocol.MemoryUser {
|
|
if email == "" {
|
|
return nil
|
|
}
|
|
|
|
v.mutex.Lock()
|
|
defer v.mutex.Unlock()
|
|
|
|
if _, ok := v.emails[email]; ok {
|
|
for _, user := range v.users {
|
|
if user.Email == email {
|
|
return user
|
|
}
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (v *Validator) GetAll() []*protocol.MemoryUser {
|
|
v.mutex.Lock()
|
|
defer v.mutex.Unlock()
|
|
|
|
var users = make([]*protocol.MemoryUser, 0, len(v.users))
|
|
for _, user := range v.users {
|
|
users = append(users, user)
|
|
}
|
|
|
|
return users
|
|
}
|
|
|
|
func (v *Validator) GetCount() int64 {
|
|
v.mutex.Lock()
|
|
defer v.mutex.Unlock()
|
|
|
|
return int64(len(v.users))
|
|
}
|