mirror of
https://github.com/netbirdio/netbird.git
synced 2026-10-06 05:29:07 +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.
109 lines
4.1 KiB
Go
109 lines
4.1 KiB
Go
package llm_identity_inject
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/netbirdio/netbird/proxy/internal/middleware"
|
|
"github.com/netbirdio/netbird/proxy/internal/middleware/builtin"
|
|
)
|
|
|
|
// ProviderInjection describes one resolved provider's injection rule.
|
|
// Identity stamping uses one of HeaderPair / JSONMetadata; ExtraHeaders
|
|
// is independent — each entry is a static (operator-configured) header
|
|
// stamped on every matching request with anti-spoof. A rule with no
|
|
// shape AND no extras is dropped at New() time as a no-op.
|
|
type ProviderInjection struct {
|
|
// ProviderID is the resolved provider id — matches the value
|
|
// llm_router stamps under KeyLLMResolvedProviderID.
|
|
ProviderID string `json:"provider_id"`
|
|
// HeaderPair is the LiteLLM-style wire convention: separate
|
|
// headers for end-user id and tags CSV.
|
|
HeaderPair *HeaderPairRule `json:"header_pair,omitempty"`
|
|
// JSONMetadata is the Portkey-style wire convention: a single
|
|
// header carrying a JSON object keyed by reserved field names.
|
|
JSONMetadata *JSONMetadataRule `json:"json_metadata,omitempty"`
|
|
// ExtraHeaders is an operator-configured list of static headers
|
|
// (e.g. "x-portkey-config: pc-...") that the middleware stamps
|
|
// on every matching request. The synth pre-resolves the values
|
|
// from the provider record's ExtraValues map; the middleware
|
|
// just emits them. Each name is also added to HeadersRemove for
|
|
// anti-spoof so a client can't smuggle their own value.
|
|
ExtraHeaders []ExtraHeaderKV `json:"extra_headers,omitempty"`
|
|
}
|
|
|
|
// ExtraHeaderKV is one static header entry the middleware stamps as-is.
|
|
type ExtraHeaderKV struct {
|
|
Name string `json:"name"`
|
|
Value string `json:"value"`
|
|
}
|
|
|
|
// HeaderPairRule emits identity through dedicated per-dimension
|
|
// headers. The two *InBody flags layer body-level identity on top: when
|
|
// TagsInBody is set the middleware also writes the tag list into the
|
|
// request body's metadata.tags array (required for LiteLLM tag-budget
|
|
// enforcement, which only inspects the body); when EndUserIDInBody is
|
|
// set the display identity is also written into the body's top-level
|
|
// "user" field (the OpenAI-standard end-user identifier — defense-in-
|
|
// depth and anti-spoof on top of the header path).
|
|
type HeaderPairRule struct {
|
|
EndUserIDHeader string `json:"end_user_id_header,omitempty"`
|
|
TagsHeader string `json:"tags_header,omitempty"`
|
|
TagsInBody bool `json:"tags_in_body,omitempty"`
|
|
EndUserIDInBody bool `json:"end_user_id_in_body,omitempty"`
|
|
}
|
|
|
|
// JSONMetadataRule emits identity through a single JSON-object header.
|
|
// Empty UserKey/GroupsKey skip that dimension at emit time. When
|
|
// MaxValueLength > 0 each emitted JSON value is truncated to that many
|
|
// bytes — Portkey enforces 128 chars per value.
|
|
type JSONMetadataRule struct {
|
|
Header string `json:"header"`
|
|
UserKey string `json:"user_key,omitempty"`
|
|
GroupsKey string `json:"groups_key,omitempty"`
|
|
MaxValueLength int `json:"max_value_length,omitempty"`
|
|
}
|
|
|
|
// Config is the on-wire configuration accepted by the factory. An
|
|
// empty Providers slice yields a no-op middleware (every resolved
|
|
// provider passes through unchanged).
|
|
type Config struct {
|
|
Providers []ProviderInjection `json:"providers"`
|
|
}
|
|
|
|
// Factory builds llm_identity_inject instances from raw config bytes.
|
|
type Factory struct{}
|
|
|
|
// ID returns the registry identifier.
|
|
func (Factory) ID() string { return ID }
|
|
|
|
// New constructs a middleware instance. Empty, null, and {} configs
|
|
// yield a no-op middleware. Non-empty payloads must parse cleanly so
|
|
// misconfigurations surface at chain build time.
|
|
func (Factory) New(rawConfig []byte) (middleware.Middleware, error) {
|
|
cfg := Config{}
|
|
if !isEmptyJSON(rawConfig) {
|
|
if err := json.Unmarshal(rawConfig, &cfg); err != nil {
|
|
return nil, fmt.Errorf("decode config: %w", err)
|
|
}
|
|
}
|
|
return New(cfg), nil
|
|
}
|
|
|
|
// isEmptyJSON reports whether the payload is whitespace, null, or an
|
|
// empty object/array.
|
|
func isEmptyJSON(raw []byte) bool {
|
|
trimmed := strings.TrimSpace(string(bytes.TrimSpace(raw)))
|
|
switch trimmed {
|
|
case "", "null", "{}", "[]":
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
func init() {
|
|
builtin.Register(Factory{})
|
|
}
|