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

fix(acl): deny rules now have higher precedence than allow rules

Browse Source
This commit is contained in:
yusing
2026-01-18 10:50:46 +08:00
committed by github-actions[bot]
parent 90a4922b79
commit ab1881d02e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/acl/config.go
View File

@@ -292,16 +292,16 @@ func (c *Config) IPAllowed(ip net.IP) bool {
} }
ipAndStr := &maxmind.IPInfo{IP: ip, Str: ipStr} ipAndStr := &maxmind.IPInfo{IP: ip, Str: ipStr}
if c.Allow.Match(ipAndStr) {
c.logAndNotify(ipAndStr, true)
c.cacheRecord(ipAndStr, true)
return true
}
if c.Deny.Match(ipAndStr) { if c.Deny.Match(ipAndStr) {
c.logAndNotify(ipAndStr, false) c.logAndNotify(ipAndStr, false)
c.cacheRecord(ipAndStr, false) c.cacheRecord(ipAndStr, false)
return false return false
} }
if c.Allow.Match(ipAndStr) {
c.logAndNotify(ipAndStr, true)
c.cacheRecord(ipAndStr, true)
return true
}
c.logAndNotify(ipAndStr, c.defaultAllow) c.logAndNotify(ipAndStr, c.defaultAllow)
c.cacheRecord(ipAndStr, c.defaultAllow) c.cacheRecord(ipAndStr, c.defaultAllow)