mirror of
https://github.com/netbirdio/netbird.git
synced 2026-07-17 03:59:56 +00:00
b416063bcc
* [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.
80 lines
2.2 KiB
Go
80 lines
2.2 KiB
Go
package middleware
|
|
|
|
import (
|
|
"regexp"
|
|
"strings"
|
|
)
|
|
|
|
// Redaction scope: Scan handles the narrow, high-signal set of
|
|
// secrets we are comfortable masking with a regex. The intent is
|
|
// "make accidental leaks impossible to miss at a glance", not "be a
|
|
// DLP product". Contributors adding more patterns should weigh false
|
|
// positives carefully — a metadata value that over-redacts benign
|
|
// strings is strictly worse than one that misses a rare format.
|
|
var (
|
|
jwtRegex = regexp.MustCompile(`eyJ[A-Za-z0-9_-]{5,}\.[A-Za-z0-9_-]{5,}\.[A-Za-z0-9_-]{5,}`)
|
|
pemRegex = regexp.MustCompile(`-----BEGIN [A-Z ]+-----[\s\S]*?-----END [A-Z ]+-----`)
|
|
awsKeyRegex = regexp.MustCompile(`AKIA[0-9A-Z]{16}`)
|
|
bearerRegex = regexp.MustCompile(`(?i)\b(?:bearer|token|api[_-]?key|authorization)[\s:=]+([A-Za-z0-9_\-\.]{40,})`)
|
|
ccCandidateRgx = regexp.MustCompile(`\b(?:\d[ -]?){13,19}\b`)
|
|
)
|
|
|
|
// Scan redacts high-signal secret patterns from value. Matches are
|
|
// replaced with `[REDACTED:<kind>]`. Non-matching input is returned
|
|
// unchanged.
|
|
func Scan(value string) string {
|
|
if value == "" {
|
|
return value
|
|
}
|
|
result := value
|
|
result = pemRegex.ReplaceAllString(result, "[REDACTED:pem]")
|
|
result = jwtRegex.ReplaceAllString(result, "[REDACTED:jwt]")
|
|
result = awsKeyRegex.ReplaceAllString(result, "[REDACTED:aws_key]")
|
|
result = bearerRegex.ReplaceAllStringFunc(result, func(match string) string {
|
|
sub := bearerRegex.FindStringSubmatch(match)
|
|
if len(sub) < 2 {
|
|
return "[REDACTED:bearer]"
|
|
}
|
|
return strings.Replace(match, sub[1], "[REDACTED:bearer]", 1)
|
|
})
|
|
result = ccCandidateRgx.ReplaceAllStringFunc(result, func(match string) string {
|
|
digits := stripNonDigits(match)
|
|
if len(digits) < 13 || len(digits) > 19 {
|
|
return match
|
|
}
|
|
if !luhn(digits) {
|
|
return match
|
|
}
|
|
return "[REDACTED:cc]"
|
|
})
|
|
return result
|
|
}
|
|
|
|
func stripNonDigits(s string) string {
|
|
var b strings.Builder
|
|
b.Grow(len(s))
|
|
for _, r := range s {
|
|
if r >= '0' && r <= '9' {
|
|
b.WriteRune(r)
|
|
}
|
|
}
|
|
return b.String()
|
|
}
|
|
|
|
func luhn(digits string) bool {
|
|
sum := 0
|
|
alt := false
|
|
for i := len(digits) - 1; i >= 0; i-- {
|
|
n := int(digits[i] - '0')
|
|
if alt {
|
|
n *= 2
|
|
if n > 9 {
|
|
n -= 9
|
|
}
|
|
}
|
|
sum += n
|
|
alt = !alt
|
|
}
|
|
return sum%10 == 0
|
|
}
|