mirror of
https://github.com/netbirdio/netbird.git
synced 2026-10-07 05:59:06 +02:00
* [agent-network] Shared proto, OpenAPI schema, and generated types * [agent-network] Management: store, manager, synthesizer, policy engine, provider catalog, HTTP/gRPC API Adds the account-scoped agent-network module: provider/policy/budget CRUD and store, the reverse-proxy service synthesizer, policy selection + limit enforcement, the provider catalog (incl. Vertex AI and AWS Bedrock entries), and the management HTTP + proxy gRPC surfaces. * [management] Fix agent-network proxy-peer fan-out on affected-peer recompute The affected-peers resolver loaded only persisted reverse-proxy services, but agent-network services are synthesized on demand and never persisted. As a result the embedded proxy peer was never folded into the affected set when a client's group changed, so the proxy received no network-map update for a newly authorised client and rejected its handshake until a full resync (restart). loadProxyServices now merges the synthesized agent-network services (injected via a registration hook to avoid an import cycle), so proxy peers learn newly authorised clients immediately. * [proxy] Reverse-proxy middleware framework, chain, and request plumbing The per-target middleware chain (slots, dispatcher, mutation gate, metadata merger), body capture, access-log terminal sink, and the proxy wiring that builds + runs chains for synthesized agent-network services. * [proxy] LLM parsers, pricing, and builtin middlewares (OpenAI, Anthropic, Vertex AI, AWS Bedrock) Request/response parsers and SSE/event-stream metering, the embedded pricing table, and the builtin middleware set: request parser, router, policy limit-check/record, cost meter, guardrail, identity inject, response parser. Includes the path-routed providers — Google Vertex AI (keyfile:: service-account OAuth minting) and AWS Bedrock (bearer auth, invoke/converse/streaming, optional /bedrock prefix) — plus the Models allowlist and unmeterable-publisher deny. * [proxy] IPv6 in-place apply and TCP accept-loop hardening on netstack listeners * [agent-network] End-to-end test suite, module docs, and deployment preset * [agent-network] Fix codespell typos and exclude false positives - labelgen word pool: vermillion -> vermilion, racoon -> raccoon. - codespell ignore list: add flate (Go compress/flate package), recordin (a test-local identifier), and unparseable (a valid alternative spelling used consistently across identifiers + a metadata-value constant). * [management] Set LastSeen on injected proxy peer in realstack test (MySQL strict-mode) The injected embedded proxy peer had a PeerStatus with a zero LastSeen, which serializes to '0000-00-00' and is rejected by MySQL in strict mode (SQLite tolerates it). Set LastSeen to a valid time so SaveAccount succeeds on both engines. * [agent-network] Remove e2e shell-script suite from this branch The end-to-end shell scripts under scripts/e2e/ are maintained in a separate testing suite and are not part of this change set. * [agent-network] Polish module docs: remove internal review scaffolding, fix links, verify diagrams Strip PR-review framing, commit references, absolute paths, and stale internal references from the agent-network module docs; fix broken relative links; verify all diagrams against the current architecture. Remove the internal AI-reviewer prompt file. * [management] Refine session expiration handling to support 3-state encoding for SSO deadlines * [agent-network] Relocate agentnetwork package to internals/modules Move management/server/agentnetwork (and its catalog/, labelgen/, types/ subpackages) to management/internals/modules/agentnetwork, alongside the reverse-proxy module, and rewrite all importers. Pure relocation: package names, the synthesizer + affectedpeers registration hook, and store access (shared store.Store) are unchanged, so no import cycle is introduced (affectedpeers still depends only on the agentnetwork/types leaf). * [agent-network] Co-locate HTTP handlers in the module (RegisterEndpoints) Move the agent-network HTTP handlers from server/http/handlers/agentnetwork into the module at internals/modules/agentnetwork/handlers (package handlers) and rename the entrypoint AddEndpoints -> RegisterEndpoints, matching the reverse-proxy module convention. Wiring in http/handler.go updated accordingly.
76 lines
3.5 KiB
Go
76 lines
3.5 KiB
Go
package llm_guardrail
|
|
|
|
import (
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/netbirdio/netbird/proxy/internal/middleware"
|
|
)
|
|
|
|
// PII redactor scope: redact prompt content BEFORE it lands in the metadata
|
|
// bag. The bearer-with-keyword pass runs first so the keyword is preserved.
|
|
// We then chain the package-level middleware.Scan to pick up PEM, JWT, AWS
|
|
// access keys, generic bearer tokens (40+ chars), and Luhn-validated credit
|
|
// cards — keeping prompt redaction in sync with metadata-value scanning. Email,
|
|
// SSN (dashed form), phone (E.164 + NA), and IPv4 are prompt-shaped patterns
|
|
// the metadata scanner intentionally leaves alone.
|
|
var (
|
|
emailRegex = regexp.MustCompile(`[A-Za-z0-9._%+\-]+@[A-Za-z0-9.\-]+\.[A-Za-z]{2,}`)
|
|
ssnRegex = regexp.MustCompile(`\b\d{3}-\d{2}-\d{4}\b`)
|
|
phoneE164 = regexp.MustCompile(`\+\d{8,15}\b`)
|
|
// phoneNARgx accepts the 3-3-4 North-American shape with any of the common
|
|
// separators (space, dot, dash, slash) or none at all between the area code
|
|
// and the body. The optional `\(?...\)?` wraps the area code; the separator
|
|
// classes use `*` (not `?`) so multi-char separators ("(202) " followed by
|
|
// space-and-something) and zero-separator runs ("2025550134") both match.
|
|
// False-positive tradeoff: 10 consecutive digits in a prompt will be
|
|
// treated as a phone number. For PII redaction that is the correct way to
|
|
// err — under-redaction leaks; over-redaction is annoying.
|
|
phoneNARgx = regexp.MustCompile(`\(?\b\d{3}\)?[\s.\-/]*\d{3}[\s.\-/]*\d{4}\b`)
|
|
bearerRegex = regexp.MustCompile(`(?i)\b(bearer|token|api[_-]?key|authorization)([\s:=]+)(\S{20,})`)
|
|
ipv4Regex = regexp.MustCompile(`\b(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\b`)
|
|
)
|
|
|
|
// redactPII is the package-private alias kept for internal callers; new code
|
|
// outside the guardrail middleware should call RedactPII.
|
|
func redactPII(value string) string { return RedactPII(value) }
|
|
|
|
// RedactPII replaces high-signal PII patterns in value with
|
|
// `[REDACTED:<kind>]`. Non-matching input is returned unchanged. Exported so
|
|
// the request / response parsers can reuse the same coverage on raw prompts
|
|
// and completions when the account's redact_pii toggle is on.
|
|
func RedactPII(value string) string {
|
|
if value == "" {
|
|
return value
|
|
}
|
|
result := value
|
|
// Keyword-preserving bearer first so the "bearer "/"token=" prefix survives
|
|
// before the generic scanner gets at the same content.
|
|
result = bearerRegex.ReplaceAllStringFunc(result, redactBearer)
|
|
// Structured secrets shared with metadata-value scanning: PEM, JWT, AWS
|
|
// keys, generic bearer (40+), and Luhn-validated credit cards.
|
|
result = middleware.Scan(result)
|
|
// Prompt-shaped PII the metadata scanner doesn't cover.
|
|
result = emailRegex.ReplaceAllString(result, "[REDACTED:email]")
|
|
result = ssnRegex.ReplaceAllString(result, "[REDACTED:ssn]")
|
|
result = phoneE164.ReplaceAllString(result, "[REDACTED:phone]")
|
|
result = phoneNARgx.ReplaceAllString(result, "[REDACTED:phone]")
|
|
result = ipv4Regex.ReplaceAllString(result, "[REDACTED:ip]")
|
|
return result
|
|
}
|
|
|
|
// redactBearer keeps the leading keyword and its separator, replacing
|
|
// only the secret payload so the surrounding context is preserved.
|
|
func redactBearer(match string) string {
|
|
sub := bearerRegex.FindStringSubmatch(match)
|
|
if len(sub) < 4 {
|
|
return "[REDACTED:bearer]"
|
|
}
|
|
var b strings.Builder
|
|
b.Grow(len(sub[1]) + len(sub[2]) + len("[REDACTED:bearer]"))
|
|
b.WriteString(sub[1])
|
|
b.WriteString(sub[2])
|
|
b.WriteString("[REDACTED:bearer]")
|
|
return b.String()
|
|
}
|