mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-17 18:45:03 +03:00
fix(mtproto): zero sidecar quotas only for clients whose usage was reset
Invariant: the sidecar's quota counter for a client is zeroed exactly when the panel zeroes that client's usage. InboundService.ResetAllTraffics resets only inbound counters, yet it cleared every MTProto client's sidecar quota - on the master and, through its node propagation, on every node - handing out a fresh quota while the panel still counted the old usage. ResetAllClientTraffics for one inbound likewise cleared the quotas of MTProto clients on every other inbound. The inbound-level reset no longer touches sidecar quotas, and the per-inbound client reset zeroes only the clients it reset.
This commit is contained in:
@@ -126,22 +126,24 @@ func (s *ClientService) BulkResetTraffic(inboundSvc *InboundService, emails []st
|
||||
|
||||
func (s *ClientService) ResetAllClientTraffics(inboundSvc *InboundService, id int) error {
|
||||
var resetNodes []int
|
||||
var resetEmails []string
|
||||
err := submitTrafficWrite(func() error {
|
||||
var inner error
|
||||
resetNodes, inner = s.resetAllClientTrafficsLocked(id)
|
||||
resetEmails, resetNodes, inner = s.resetAllClientTrafficsLocked(id)
|
||||
return inner
|
||||
})
|
||||
if err == nil {
|
||||
inboundSvc.resetAllMtprotoQuotas()
|
||||
inboundSvc.resetMtprotoClientQuotas(resetEmails)
|
||||
inboundSvc.deliverNodeResetsNow(resetNodes)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *ClientService) resetAllClientTrafficsLocked(id int) ([]int, error) {
|
||||
func (s *ClientService) resetAllClientTrafficsLocked(id int) ([]string, []int, error) {
|
||||
db := database.GetDB()
|
||||
now := time.Now().Unix() * 1000
|
||||
var resetNodes []int
|
||||
var reset []string
|
||||
|
||||
if err := db.Transaction(func(tx *gorm.DB) error {
|
||||
// client_traffics.inbound_id is stale: it reflects the inbound the row was
|
||||
@@ -164,6 +166,7 @@ func (s *ClientService) resetAllClientTrafficsLocked(id int) ([]int, error) {
|
||||
if len(resetEmails) == 0 {
|
||||
return nil
|
||||
}
|
||||
reset = resetEmails
|
||||
|
||||
if err := adjustGroupBaselinesForRemovedTraffic(tx, resetEmails); err != nil {
|
||||
return err
|
||||
@@ -204,9 +207,9 @@ func (s *ClientService) resetAllClientTrafficsLocked(id int) ([]int, error) {
|
||||
|
||||
return result.Error
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
return nil, nil, err
|
||||
}
|
||||
return resetNodes, nil
|
||||
return reset, resetNodes, nil
|
||||
}
|
||||
|
||||
func (s *ClientService) ResetAllTraffics() (bool, error) {
|
||||
|
||||
Reference in New Issue
Block a user