extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-08-16 10:57:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for scoped bandwidth limits in agent.CanCreateShare; make relax actions error without failing (#606, #451)

Browse Source
This commit is contained in:
Michael Quigley
2024-06-07 13:29:51 -04:00
parent efd16c2760
commit afc8d22a9f
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
controller/limits/agent.go
View File

@ -87,15 +87,24 @@ func (a *Agent) CanCreateShare(acctId, envId int, reserved, uniqueName bool, _ s
return false, err
}
bwcs := ul.toBandwidthArray(backendMode)
for _, bwc := range bwcs {
latestJe, err := a.isBandwidthClassLimitedForAccount(acctId, bwc, trx)
if scopedBwc, found := ul.scopes[backendMode]; found {
latestScopedJe, err := a.isBandwidthClassLimitedForAccount(acctId, scopedBwc, trx)
if err != nil {
return false, err
}
if latestJe != nil {
if latestScopedJe != nil {
return false, nil
}
} else {
for _, bwc := range ul.bandwidth {
latestJe, err := a.isBandwidthClassLimitedForAccount(acctId, bwc, trx)
if err != nil {
return false, err
}
if latestJe != nil {
return false, nil
}
}
}
if ul.resource.GetShares() > store.Unlimited || (reserved && ul.resource.GetReservedShares() > store.Unlimited) || (reserved && uniqueName && ul.resource.GetUniqueNames() > store.Unlimited) {