starred/godoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-24 09:48:49 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

refactor(acl): adjust summary format and add total count

Browse Source
This commit is contained in:
yusing
2025-10-11 16:13:52 +08:00
parent d5e9a7b3b6
commit 2bfbdbf519
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
internal/acl/config.go
View File

@@ -45,8 +45,13 @@ type config struct {
ipCache *xsync.Map[string, *checkCache] ipCache *xsync.Map[string, *checkCache]
// will be nil if Notify.To is empty // will be nil if Notify.To is empty
allowCounts map[string]uint32 // these are per IP, reset every Notify.Interval
blockedCounts map[string]uint32 allowedCount map[string]uint32
blockedCount map[string]uint32
// these are total, never reset
totalAllowedCount uint64
totalBlockedCount uint64
logAllowed bool logAllowed bool
// will be nil if Log is nil // will be nil if Log is nil
@@ -120,8 +125,8 @@ func (c *Config) Validate() gperr.Error {
} }
if c.needNotify() { if c.needNotify() {
c.allowCounts = make(map[string]uint32) c.allowedCount = make(map[string]uint32)
c.blockedCounts = make(map[string]uint32) c.blockedCount = make(map[string]uint32)
} }
if c.Notify.Interval < 0 { if c.Notify.Interval < 0 {
@@ -205,31 +210,30 @@ func (c *Config) logNotifyLoop(parent task.Parent) {
if c.needNotify() { if c.needNotify() {
if log.allowed { if log.allowed {
if c.notifyAllowed { if c.notifyAllowed {
c.allowCounts[log.info.Str]++ c.allowedCount[log.info.Str]++
c.totalAllowedCount++
} }
} else { } else {
c.blockedCounts[log.info.Str]++ c.blockedCount[log.info.Str]++
c.totalBlockedCount++
} }
} }
case <-c.notifyTicker.C: // will never tick when notify is disabled case <-c.notifyTicker.C: // will never tick when notify is disabled
total := len(c.allowCounts) + len(c.blockedCounts) total := len(c.allowedCount) + len(c.blockedCount)
if total == 0 { if total == 0 {
continue continue
} }
fieldsBody := make(notif.FieldsBody, total) total++
fieldsBody := make(notif.ListBody, total)
i := 0 i := 0
for ip, count := range c.allowCounts { fieldsBody[i] = fmt.Sprintf("Total: allowed %d, blocked %d", c.totalAllowedCount, c.totalBlockedCount)
fieldsBody[i] = notif.LogField{ i++
Name: ip, for ip, count := range c.allowedCount {
Value: fmt.Sprintf("allowed %d times", count), fieldsBody[i] = fmt.Sprintf("%s: allowed %d times", ip, count)
}
i++ i++
} }
for ip, count := range c.blockedCounts { for ip, count := range c.blockedCount {
fieldsBody[i] = notif.LogField{ fieldsBody[i] = fmt.Sprintf("%s: blocked %d times", ip, count)
Name: ip,
Value: fmt.Sprintf("blocked %d times", count),
}
i++ i++
} }
notif.Notify(&notif.LogMessage{ notif.Notify(&notif.LogMessage{
@@ -238,8 +242,8 @@ func (c *Config) logNotifyLoop(parent task.Parent) {
Body: fieldsBody, Body: fieldsBody,
To: c.Notify.To, To: c.Notify.To,
}) })
clear(c.allowCounts) clear(c.allowedCount)
clear(c.blockedCounts) clear(c.blockedCount)
} }
} }
} }