mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-19 03:25:01 +03:00
fix(amneziawg): let an emptied forwardedPorts withdraw a client's forwards
UpdateInboundClient carried the stored forwardedPorts forward whenever the incoming value was empty, and Client.ForwardedPorts was a plain omitempty string, so clearing the field in the client editor, as its hint says to, reported success while the settings kept the old ports and the host kept relaying them to the client's device. The field is now a pointer, as KeepAlive is: nil (not sent) keeps the stored spec and "" withdraws it. The client record follows the live spec on every update, and a one-time seeder fills records that still hold their creation value from the inbound settings, so the editor no longer posts an empty field that would drop forwards added later.
This commit is contained in:
@@ -213,6 +213,10 @@ func (s *ClientService) Create(inboundSvc *InboundService, payload *ClientCreate
|
||||
return false, err
|
||||
}
|
||||
normalizeClientTrafficReset(&client)
|
||||
// Nothing to withdraw on a new client, so a blank spec is no spec.
|
||||
if client.ForwardedPortsSpec() == "" {
|
||||
client.ForwardedPorts = nil
|
||||
}
|
||||
client.ClientHostRuleIds = model.NormalizeClientHostRuleIds(client.ClientHostRuleIds)
|
||||
if len(payload.InboundIds) == 0 {
|
||||
return false, common.NewError("at least one inbound is required")
|
||||
@@ -938,6 +942,16 @@ func (s *ClientService) Update(inboundSvc *InboundService, id int, updated model
|
||||
return needRestart, err
|
||||
}
|
||||
|
||||
// The AmneziaWG forwards too: the record merge keeps a stored spec when the settings
|
||||
// carry none, so a withdrawal is written here; nil (not sent) leaves it alone.
|
||||
if updated.ForwardedPorts != nil {
|
||||
if err := database.GetDB().Model(&model.ClientRecord{}).
|
||||
Where("id = ?", id).
|
||||
UpdateColumn("wg_forwarded_ports", updated.ForwardedPortsSpec()).Error; err != nil {
|
||||
return needRestart, err
|
||||
}
|
||||
}
|
||||
|
||||
// Same shape as the group write above: SyncInbound keeps a stored ad-tag
|
||||
// when the incoming settings carry none, so clearing the override must be
|
||||
// applied here, where the editor always round-trips the field.
|
||||
@@ -1186,7 +1200,7 @@ func (s *ClientService) Attach(inboundSvc *InboundService, id int, inboundIds []
|
||||
copyClient := *clientWire
|
||||
// A forward is a listener on the target inbound's host, set per inbound: carried over, it
|
||||
// would let a node-reported client choose ports on this host.
|
||||
copyClient.ForwardedPorts = ""
|
||||
copyClient.ForwardedPorts = nil
|
||||
if !addressesFitAmneziaWGInbound(copyClient.AllowedIPs, inbound) {
|
||||
copyClient.AllowedIPs = nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user