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

fix(acl): maxmind error even if configured, refactor

Browse Source
This commit is contained in:
yusing
2025-05-14 13:44:43 +08:00
parent 8e27886235
commit b490e8c475
5 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/acl/matcher.go
View File

@@ -24,6 +24,9 @@ const (
MatcherTypeCountry = "country"
)
// TODO: use this error in the future
//
//nolint:unused
var errMatcherFormat = gperr.Multiline().AddLines(
"invalid matcher format, expect {type}:{value}",
"Available types: ip|cidr|tz|country",
@@ -34,10 +37,9 @@ var errMatcherFormat = gperr.Multiline().AddLines(
)
var (
errSyntax = errors.New("syntax error")
errInvalidIP = errors.New("invalid IP")
errInvalidCIDR = errors.New("invalid CIDR")
errMaxMindNotConfigured = errors.New("MaxMind not configured")
errSyntax = errors.New("syntax error")
errInvalidIP = errors.New("invalid IP")
errInvalidCIDR = errors.New("invalid CIDR")
)
func (matcher *Matcher) Parse(s string) error {
@@ -60,14 +62,8 @@ func (matcher *Matcher) Parse(s string) error {
}
matcher.match = matchCIDR(net)
case MatcherTypeTimeZone:
if !maxmind.HasInstance() {
return errMaxMindNotConfigured
}
matcher.match = matchTimeZone(parts[1])
case MatcherTypeCountry:
if !maxmind.HasInstance() {
return errMaxMindNotConfigured
}
matcher.match = matchISOCode(parts[1])
default:
return errSyntax