initial code for classifier complete
This commit is contained in:
+18
-12
@@ -15,24 +15,19 @@ package agentclass
|
||||
import (
|
||||
"net/netip"
|
||||
"regexp"
|
||||
"slices"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// ParsedIP is the structure that holds a parsed IP address.
|
||||
type ParsedIP struct {
|
||||
V6 bool // is this a v6 address?
|
||||
Value netip.Addr // the actual address
|
||||
}
|
||||
|
||||
// parseIP turns a string IP address into a ParsedIP. Returns nil if address is not parseable.
|
||||
func parseIP(ip string) *ParsedIP {
|
||||
func parseIP(ip string) *netip.Addr {
|
||||
s := strings.TrimSpace(ip)
|
||||
v6 := strings.Index(s, ":") >= 0
|
||||
v6 := strings.Contains(s, ":")
|
||||
addy, err := netip.ParseAddr(s)
|
||||
if err != nil || addy.Is6() != v6 {
|
||||
return nil
|
||||
}
|
||||
return new(ParsedIP{V6: v6, Value: addy})
|
||||
return &addy
|
||||
}
|
||||
|
||||
// bracketedExpr recognizes an IP address with brackets.
|
||||
@@ -44,7 +39,7 @@ var v4WithPortExpr = regexp.MustCompile(`^(\d{1,3}(?:\.\d{1,3}){3}):\d+$`)
|
||||
// normalizeIP filters a supplied IP address. Returns nil if the address is not parseable.
|
||||
func normalizeIP(ip string) *string {
|
||||
s := strings.TrimSpace(ip)
|
||||
if s == "" || strings.Index(s, ",") >= 0 {
|
||||
if s == "" || strings.Contains(s, ",") {
|
||||
return nil
|
||||
}
|
||||
bracketed := bracketedExpr.FindStringSubmatch(s)
|
||||
@@ -59,8 +54,19 @@ func normalizeIP(ip string) *string {
|
||||
if parsed == nil {
|
||||
return nil
|
||||
}
|
||||
if parsed.V6 && parsed.Value.Is4In6() {
|
||||
return new(netip.AddrFrom4(parsed.Value.As4()).String())
|
||||
if parsed.Is4In6() {
|
||||
return new(netip.AddrFrom4(parsed.As4()).String())
|
||||
}
|
||||
return new(candidate)
|
||||
}
|
||||
|
||||
func inRanges(ip string, cidrs []netip.Prefix) bool {
|
||||
normalized := normalizeIP(ip)
|
||||
if normalized == nil {
|
||||
return false
|
||||
}
|
||||
addy := parseIP(*normalized)
|
||||
return slices.IndexFunc(cidrs, func(c netip.Prefix) bool {
|
||||
return c.Contains(*addy)
|
||||
}) >= 0
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user