next bit of work on agentclass (including normalizeIP)

This commit is contained in:
amy
2026-11-14 23:24:49 -07:00
parent b20a2a4f6c
commit 4078d62efc
2 changed files with 202 additions and 7 deletions
+60
View File
@@ -0,0 +1,60 @@
/*
* Amsterdam Web Communities System
* Copyright (c) 2025-2026 Erbosoft Metaverse Design Solutions, All Rights Reserved
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*
* SPDX-License-Identifier: MPL-2.0
*/
// Package agentclass contains support for agent request classification.
package agentclass
import (
"net/netip"
"regexp"
"strings"
)
type ParsedIP struct {
V6 bool
Value netip.Addr
}
func parseIP(ip string) *ParsedIP {
s := strings.TrimSpace(ip)
v6 := strings.Index(s, ":") >= 0
addy, err := netip.ParseAddr(s)
if err != nil || addy.Is6() != v6 {
return nil
}
return new(ParsedIP{V6: v6, Value: addy})
}
var bracketedExpr = regexp.MustCompile(`^\[([^\]]+)\](?::\d+)?$`)
var v4WithPortExpr = regexp.MustCompile(`^(\d{1,3}(?:\.\d{1,3}){3}):\d+$`)
func normalizeIP(ip string) *string {
s := strings.TrimSpace(ip)
if s == "" || strings.Index(s, ",") >= 0 {
return nil
}
bracketed := bracketedExpr.FindStringSubmatch(s)
v4WithPort := v4WithPortExpr.FindStringSubmatch(s)
candidate := s
if bracketed != nil {
candidate = bracketed[1]
} else if v4WithPort != nil {
candidate = v4WithPort[1]
}
parsed := parseIP(candidate)
if parsed == nil {
return nil
}
if parsed.V6 && parsed.Value.Is4In6() {
return new(netip.AddrFrom4(parsed.Value.As4()).String())
}
return new(candidate)
}