mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-19 03:25:01 +03:00
Split the client edit form's AllowedIPs into per-protocol fields
A client attached to both WireGuard and AmneziaWG shared one AllowedIPs form field with a dynamically-switching label, so its two genuinely different addresses could never both be shown or edited correctly. Worse, Update/Create broadcast that one shared value to every attached wg/awg inbound with no subnet-fit check, so an ordinary edit save could silently overwrite one protocol's address with the other's -- the same bug class already fixed for Attach, but reachable from any client edit. model.Client gains an optional AllowedIPsByInbound map so a caller can send distinct values per inbound; Update/Create honor it and, when it's absent, clear a shared value that doesn't fit an AmneziaWG inbound's own subnet instead of writing it through. A new TunnelAllowedIPsByInbound read path feeds the real per-inbound address to the client edit form via GET, which now renders two separate, correctly-labeled fields whenever both protocols are attached (unchanged single dynamic field otherwise).
This commit is contained in:
@@ -133,6 +133,41 @@ func (s *ClientService) GetInboundIdsForRecord(id int) ([]int, error) {
|
||||
return ids, nil
|
||||
}
|
||||
|
||||
// TunnelAllowedIPsByInbound returns, for each given WireGuard/AmneziaWG
|
||||
// inbound id, the real AllowedIPs this email currently has on that specific
|
||||
// inbound's own settings JSON -- joined comma-separated, matching the form
|
||||
// value shape a single AllowedIPs field already uses. Non-tunnel inbounds
|
||||
// and ids the email isn't actually attached to are simply absent from the
|
||||
// result (not an error): callers use this to seed a per-protocol display
|
||||
// field, and ClientRecord's own single AllowedIPs column can't tell two
|
||||
// different protocol addresses apart, which is exactly the gap this closes.
|
||||
func (s *ClientService) TunnelAllowedIPsByInbound(inboundSvc *InboundService, email string, inboundIds []int) (map[int]string, error) {
|
||||
result := make(map[int]string, len(inboundIds))
|
||||
for _, ibId := range inboundIds {
|
||||
inbound, err := inboundSvc.GetInbound(ibId)
|
||||
if err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
continue
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
if inbound.Protocol != model.WireGuard && inbound.Protocol != model.AmneziaWG {
|
||||
continue
|
||||
}
|
||||
clients, err := inboundSvc.GetClients(inbound)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for i := range clients {
|
||||
if strings.EqualFold(clients[i].Email, email) {
|
||||
result[ibId] = strings.Join(clients[i].AllowedIPs, ",")
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (s *ClientService) List() ([]ClientWithAttachments, error) {
|
||||
db := database.GetDB()
|
||||
var rows []model.ClientRecord
|
||||
|
||||
Reference in New Issue
Block a user