mirror of
https://github.com/netbirdio/netbird.git
synced 2026-07-16 03:29:57 +00:00
* [management,proxy] Agent network: per-account LLM gateway (policy, metering, multi-provider) (#6555) * [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. * Update getting started to point to rc when agent network enabled * Add a reference to a commercial license * Fix docs localhost link * Fix docs localhost link * Add private services domain note * [management] Add agent-network telemetry metrics (#6561) Surface agent-network adoption and usage in the self-hosted metrics worker: distinct accounts, providers, policies, budget rules, accounts with log collection enabled, and aggregated input/output tokens plus cost. Tokens and cost are summed from agent_network_request_usage (the always-written per-request ledger) so the figures are accurate regardless of the log-collection toggle and carry no double-counting. All values come from a handful of indexed aggregate queries run only on the worker's periodic tick. Adds store.AgentNetworkMetrics with GetAgentNetworkMetrics on the Store interface, the SqlStore implementation, and a zero-valued FileStore stub. * Update NetBird server and proxy image versions to 0.74.0-rc.2 * [management,proxy] Reduce agent-network cognitive complexity (#6566) Address the SonarCloud quality-gate findings in new agent-network code by extracting focused helpers. No behavior change. - synthesizer.go: split buildIdentityInjectConfigJSON into per-shape rule builders; extract mergeGuardrail from mergeGuardrails to cut nesting depth. - llm_identity_inject: extract injectionEmitsAnything validation predicate from New. - llm_response_parser/streaming.go: extract applyOpenAIStreamUsage and applyAnthropicStreamUsage (via a named anthropicStreamUsage type) and simplify the OpenAI scanner loop. - reverseproxy.go: decompose ServeHTTP into serveRouteError, buildTargetContext, serveDirect, serveWithChain, captureRequestForChain, serveDeny, newResponseWriter, observeResponse, and forwardUpstream, preserving the defer ordering so response observation still reads the captured writer before it is released. * [management] Move agent-network access-log ingest into the agentnetwork module (#6568) The agent-network access-log ingest path (metaKey wire contract, flatten, usage derivation, and the dual-write of the usage ledger + settings-gated full row) lived in the reverseproxy accesslogs manager, even though the agentnetwork module already owns the rest of that domain — types, read (ListAccessLogs / GetUsageOverview), the budget-counter writes, and retention cleanup. Move it next to the rest: a stateless agentnetwork.IngestAccessLog(ctx, store, entry) that the reverseproxy SaveAccessLog delegates to when the entry is agent-network. Removes the agentNetworkTypes import from the reverseproxy manager. No behavior change; the write/read table separation is unchanged. Adds real-store coverage for the disable->enable log-collection toggle (usage ledger always written, full row gated) plus the metadata parse and group-dedup helpers, which previously had no dedicated tests. * Add session view support in the access log * [management,proxy] Container-based agent-network e2e harness (#6577) * [e2e] Add container-based agent-network e2e harness (Pillar 1) Introduce a self-contained, OIDC-free e2e harness that stands up NetBird in containers, so suites no longer depend on the hand-maintained Tilt stack or a real IdP. - harness brings up the combined server (management + signal + relay + STUN + embedded IdP) in a single container built from combined/Dockerfile.multistage, and mints an admin PAT through the unauthenticated /api/setup bootstrap (NB_SETUP_PAT_ENABLED). API access goes through the existing shared/management/client/rest typed client. - the image is built via the docker CLI (BuildKit) so the Dockerfile's cache mounts are honored; testcontainers then runs the tagged image. - everything is behind the `e2e` build tag so normal builds and unit tests never pull in testcontainers. Adds BuildKit cache mounts to combined/Dockerfile.multistage so source changes recompile incrementally rather than from scratch. Pillar 1 proven by TestCombinedBootstrap: server builds, boots, mints a PAT, and the PAT authenticates a real management API call. * [e2e] Add management-side agent-network scenarios (Pillar 2) Port the API-driven agent-network scenarios from the bash suites to Go, sharing one combined server per package run (TestMain) with each test owning its resource cleanup. Drives the /api/agent-network/* endpoints through the shared REST client's NewRequest primitive with the generated api types. Scenarios: - provider lifecycle (create/get/list/delete + 404 after delete) - provider validation (missing api_key, unknown catalog id → 4xx) - settings collection-toggle round-trip with cluster/subdomain immutability - policy window floor (reject <60s enabled limit, accept at 60s) - consumption read endpoint returns an array All deterministic and dependency-free (dummy provider keys; no upstream calls), so they run headless in CI. * [e2e] Add live chat-through-proxy scenario (Pillar 3) Stand up the full agent-network data path in containers and drive a real chat-completion through the gateway: - harness: a shared docker network (combined server reachable by alias), a proxy container built from the published reverse-proxy image (NB_PROXY_PRIVATE, NB_PROXY_ALLOW_INSECURE, NB_RELAY_TRANSPORT=ws to match the combined server's WS-multiplexed relay) with a generated self-signed wildcard cert, and a netbird client container that joins via a setup key. - the combined image, proxy image, and client image default to the published rc.2 releases (overridable via NB_E2E_*_IMAGE; a bare local tag is built from source instead). Geolocation download is disabled so the server starts without external fetches. - one shared domain is used for the management exposed address, the proxy domain, and the agent-network cluster; the proxy token is minted via the server CLI (global) to match the manual install. TestChatCompletionThroughProxy provisions provider+policy+group+setup key, runs proxy+client, drives an OpenAI chat-completion through the tunnel, and asserts a 200 plus the ingested access-log row. Requires OPENAI_TOKEN (skips otherwise). The provider must be created with enabled=true explicitly — the create default is false despite the API doc. * [e2e] Run the live chat scenario across a provider matrix Replace the single-provider chat test with a data-driven matrix that runs the same scenario through every provider whose credentials are present in the environment (keys/URLs sourced from ~/.llm-keys locally, Actions secrets in CI): - OpenAI (chat), Anthropic (messages), Vercel, OpenRouter, Cloudflare (OpenAI-compatible gateways), and Bedrock (path-routed, bearer, via the messages shape) — covering both wire shapes and the gateway routing. - all providers are created enabled with a unique model string so the proxy's connect-time snapshot carries them all and model->provider routing is unambiguous (provider toggles after connect don't reconcile to a connected proxy). - the client supports both wire shapes (/v1/chat/completions and /v1/messages); Cloudflare gets the openai provider segment appended to its gateway URL. Each provider must return 200 through the tunnel and produce an ingested access-log row. Vertex is intentionally excluded from the uniform matrix: it needs a bespoke rawPredict request shape rather than the shared chat/messages path, so it warrants a dedicated scenario. * [ci] Add manual workflow for the agent-network e2e suite The e2e suite (build tag `e2e`) stands up the combined server + proxy + client in Docker and drives live chat-completions, so it is slow and needs provider credentials. Gate it out of normal CI (it already is, via the build tag) and run it on demand via workflow_dispatch. Provider scenarios skip when their secret is unset, so it degrades gracefully. * [e2e] Add Vertex to the provider matrix; run e2e on ubuntu-latest Vertex (Anthropic-on-Vertex) doesn't share the chat/messages wire shapes: the model travels in a rawPredict path and the proxy mints the service account's OAuth token. Add a Vertex client method that posts /v1/projects/<project>/locations/<region>/publishers/anthropic/models/<model>:rawPredict with the Vertex anthropic_version body, and wire it into the matrix as a path-routed provider (created without a models array). It is keyed off GOOGLE_VERTEX_SA_BASE64 + GOOGLE_VERTEX_PROJECT (region defaults to "global", model to a pinned claude snapshot, both overridable). Also bump the e2e workflow runner to ubuntu-latest and add the Vertex secrets. * Add docker/docker and docker/go-connections as direct dependencies in go.mod * [ci] Trigger agent-network e2e workflow on push to main and pull requests * [e2e] Fix proxy cert permission denied on Linux CI runners The proxy bind-mounts a temp dir of self-signed certs. MkdirTemp creates it 0700 and the key was 0600, which Docker Desktop on macOS ignores but a non-root proxy container on Linux runners cannot traverse/read, so the cert watcher failed with "open /certs/tls.crt: permission denied" and the container exited. Widen the cert dir to 0755 and write the throwaway key 0644 so the proxy uid can read the bind-mounted material. * [e2e] Build images from source by default instead of pulling rc.2 The agent-network code under test lives in this branch, so the e2e should exercise it rather than a frozen published release. Flip the harness default: combined/proxy/client are now built from their in-repo Dockerfiles (combined/Dockerfile.multistage, proxy/Dockerfile.multistage, e2e/harness/Dockerfile.client) under local tags. Pulling a published image stays available by setting NB_E2E_*_IMAGE to a registry reference. Builds now go through buildx --load so the Dockerfile cache mounts are honored and the result is loaded for testcontainers. The CI workflow adds a container-driver builder and a local layer cache (NB_E2E_BUILDX_CACHE) persisted via actions/cache, which caches the base/apt/dep-download layers across runs. The Go compile still re-runs each time, as BuildKit mount caches cannot be exported to the GitHub cache. * [e2e] Cover real providers in lifecycle + assert real consumption metering - TestProviderLifecycle now runs per available real provider (create → get → list → delete → 404) instead of a single dummy provider, exercising each catalog's create and field round-trip. Create is offline, so it stays fast and burns no provider quota; falls back to a synthetic OpenAI provider when no keys are set. - TestProvidersMatrix attaches a token limit (high caps, 60s window) to its policy, which switches on usage metering, and asserts consumption rows are recorded with positive token counts after the live traffic. Consumption is account-scoped (keyed by source group / user and window, not per provider), so the assertion is aggregate. - TestProviderValidation gains invalid-upstream and blank-name cases. Create validation is uniform across catalogs (no per-provider required-field rules), so per-provider rejection cases would be redundant. * [e2e] Assert session id propagates per provider Each matrix request now sends a unique session id as the universal x-session-id header and asserts it round-trips into that provider's access-log row. This guards the session-grouping contract end to end for every provider (header extraction runs in llm_request_parser ahead of the parser-specific body extraction, so it is provider-agnostic). * [e2e] Drop accidentally committed sync-phases dashboard netbird-sync-phases.json was swept into the Pillar 1 commit by a broad git add; it belongs to the unrelated sync-phases metrics work, not this e2e harness. Remove it from the branch so the PR diff is scoped to the e2e changes. * [e2e] Revert accidentally committed sync-phase ingest spec The netbird_sync_phase measurement spec in metrics ingest was swept into the Pillar 1 commit; it belongs to the unrelated sync-phases metrics work, not this e2e harness. Its emission side never landed here, so the spec was orphaned anyway. Restore ingest/main.go to its origin/main state. * Fix golint issues * Fix sonar * Add access log session test * Fix access log tests --------- Co-authored-by: braginini <bangvalo@gmail.com> Co-authored-by: Zoltan Papp <zoltan.pmail@gmail.com>
573 lines
18 KiB
Go
573 lines
18 KiB
Go
package proxy
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
stdlog "log"
|
|
"net"
|
|
"net/http"
|
|
"net/netip"
|
|
"strconv"
|
|
"sync"
|
|
"time"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
"github.com/netbirdio/netbird/client/embed"
|
|
"github.com/netbirdio/netbird/proxy/internal/auth"
|
|
"github.com/netbirdio/netbird/proxy/internal/debug"
|
|
nbtcp "github.com/netbirdio/netbird/proxy/internal/tcp"
|
|
"github.com/netbirdio/netbird/proxy/internal/types"
|
|
)
|
|
|
|
// httpInboundReadHeaderTimeout matches the host-listener read header timeout
|
|
// so per-account http.Servers don't leak idle connections.
|
|
const httpInboundReadHeaderTimeout = 30 * time.Second
|
|
|
|
// httpInboundIdleTimeout caps idle keep-alive on per-account inbound HTTP
|
|
// servers; matches the host listener.
|
|
const httpInboundIdleTimeout = 90 * time.Second
|
|
|
|
// inboundShutdownTimeout caps how long a per-account http.Server gets to
|
|
// drain in-flight requests during teardown.
|
|
const inboundShutdownTimeout = 5 * time.Second
|
|
|
|
// privateInboundPortHTTPS is the WG-side TLS port. Each account's
|
|
// embedded netstack binds independently, so a fixed port is fine.
|
|
const privateInboundPortHTTPS = 443
|
|
|
|
// privateInboundPortHTTP is the WG-side plain-HTTP port.
|
|
const privateInboundPortHTTP = 80
|
|
|
|
// inboundManager wires per-account inbound listeners into the proxy
|
|
// pipeline when --private is enabled. When disabled the manager
|
|
// is nil and every method on *Server that touches it short-circuits.
|
|
type inboundManager struct {
|
|
logger *log.Logger
|
|
handler http.Handler
|
|
tlsConfig *tls.Config
|
|
// muxLock guards entries and pendingRoutes.
|
|
muxLock sync.Mutex
|
|
entries map[types.AccountID]*inboundEntry
|
|
pendingRoutes map[types.AccountID][]pendingInboundRoute
|
|
}
|
|
|
|
// inboundEntry owns the listeners, router and HTTP servers for a single
|
|
// account's embedded netstack. errorLogWriters retain the logrus pipe
|
|
// writers backing each http.Server's ErrorLog so tearDown can close
|
|
// them — otherwise the pipe + its scanner goroutine leak per account.
|
|
type inboundEntry struct {
|
|
router *nbtcp.Router
|
|
tlsListener net.Listener
|
|
plainListener net.Listener
|
|
httpsServer *http.Server
|
|
httpServer *http.Server
|
|
errorLogWriters []*io.PipeWriter
|
|
cancel context.CancelFunc
|
|
wg sync.WaitGroup
|
|
}
|
|
|
|
// pendingInboundRoute holds a route that arrived before the account's
|
|
// listener finished starting.
|
|
type pendingInboundRoute struct {
|
|
host nbtcp.SNIHost
|
|
route nbtcp.Route
|
|
}
|
|
|
|
// newInboundManager constructs a manager bound to the proxy's HTTP
|
|
// handler chain and TLS config.
|
|
func newInboundManager(logger *log.Logger, handler http.Handler, tlsConfig *tls.Config) *inboundManager {
|
|
return &inboundManager{
|
|
logger: logger,
|
|
handler: handler,
|
|
tlsConfig: tlsConfig,
|
|
entries: make(map[types.AccountID]*inboundEntry),
|
|
pendingRoutes: make(map[types.AccountID][]pendingInboundRoute),
|
|
}
|
|
}
|
|
|
|
// onClientReady is registered with NetBird.SetClientLifecycle so the
|
|
// listener pair comes up exactly when the embedded client reports ready.
|
|
// The returned value is opaque to the roundtrip package; it is handed
|
|
// back verbatim to onClientStop on teardown.
|
|
func (m *inboundManager) onClientReady(ctx context.Context, accountID types.AccountID, client *embed.Client) any {
|
|
if m == nil {
|
|
return nil
|
|
}
|
|
entry, err := m.bringUp(ctx, accountID, client)
|
|
if err != nil {
|
|
m.logger.WithField("account_id", accountID).WithError(err).Warn("failed to start per-account inbound listener; continuing without inbound")
|
|
return nil
|
|
}
|
|
|
|
m.flushPending(accountID, entry)
|
|
|
|
m.logger.WithFields(log.Fields{
|
|
"account_id": accountID,
|
|
"https": entry.tlsListener.Addr().String(),
|
|
"http": entry.plainListener.Addr().String(),
|
|
}).Info("per-account inbound listeners up")
|
|
return entry
|
|
}
|
|
|
|
// onClientStop tears down a per-account listener bundle. State is the
|
|
// opaque value previously returned by onClientReady.
|
|
func (m *inboundManager) onClientStop(accountID types.AccountID, state any) {
|
|
if m == nil {
|
|
return
|
|
}
|
|
entry, ok := state.(*inboundEntry)
|
|
if !ok || entry == nil {
|
|
return
|
|
}
|
|
m.tearDown(accountID, entry)
|
|
}
|
|
|
|
// bringUp opens both listeners on the account's netstack, builds the
|
|
// router, and starts the parallel HTTP servers.
|
|
func (m *inboundManager) bringUp(ctx context.Context, accountID types.AccountID, client *embed.Client) (*inboundEntry, error) {
|
|
tlsListener, err := client.ListenTCP(fmt.Sprintf(":%d", privateInboundPortHTTPS))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("listen tls on netstack: %w", err)
|
|
}
|
|
plainListener, err := client.ListenTCP(fmt.Sprintf(":%d", privateInboundPortHTTP))
|
|
if err != nil {
|
|
_ = tlsListener.Close()
|
|
return nil, fmt.Errorf("listen plain on netstack: %w", err)
|
|
}
|
|
|
|
router := nbtcp.NewRouter(m.logger, accountDialResolver(accountID, client), tlsListener.Addr(), nbtcp.WithPlainHTTP(plainListener.Addr()))
|
|
|
|
scopedHandler := withTunnelLookup(m.handler, accountTunnelLookup(client))
|
|
|
|
// markOverlayOrigin stamps every connection accepted by an inbound
|
|
// listener with a context value middlewares can read to skip
|
|
// geo/CrowdSec checks (the source address is always inside the
|
|
// NetBird CGNAT range and won't match either dataset).
|
|
markOverlayOrigin := func(ctx context.Context, _ net.Conn) context.Context {
|
|
return types.WithOverlayOrigin(ctx)
|
|
}
|
|
|
|
httpsErrLog, httpsErrW := newInboundErrorLog(m.logger, "https", accountID)
|
|
httpErrLog, httpErrW := newInboundErrorLog(m.logger, "http", accountID)
|
|
|
|
httpsServer := &http.Server{
|
|
Handler: scopedHandler,
|
|
TLSConfig: m.tlsConfig,
|
|
ReadHeaderTimeout: httpInboundReadHeaderTimeout,
|
|
IdleTimeout: httpInboundIdleTimeout,
|
|
ErrorLog: httpsErrLog,
|
|
ConnContext: markOverlayOrigin,
|
|
}
|
|
httpServer := &http.Server{
|
|
Handler: scopedHandler,
|
|
ReadHeaderTimeout: httpInboundReadHeaderTimeout,
|
|
IdleTimeout: httpInboundIdleTimeout,
|
|
ErrorLog: httpErrLog,
|
|
ConnContext: markOverlayOrigin,
|
|
}
|
|
|
|
runCtx, cancel := context.WithCancel(ctx)
|
|
entry := &inboundEntry{
|
|
router: router,
|
|
tlsListener: tlsListener,
|
|
plainListener: plainListener,
|
|
httpsServer: httpsServer,
|
|
httpServer: httpServer,
|
|
errorLogWriters: []*io.PipeWriter{httpsErrW, httpErrW},
|
|
cancel: cancel,
|
|
}
|
|
|
|
entry.wg.Add(1)
|
|
go func() {
|
|
defer entry.wg.Done()
|
|
if err := router.Serve(runCtx, tlsListener); err != nil {
|
|
m.logger.WithField("account_id", accountID).Debugf("per-account router stopped: %v", err)
|
|
}
|
|
}()
|
|
|
|
entry.wg.Add(1)
|
|
go func() {
|
|
defer entry.wg.Done()
|
|
if err := httpsServer.ServeTLS(router.HTTPListener(), "", ""); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
|
m.logger.WithField("account_id", accountID).Debugf("per-account https server stopped: %v", err)
|
|
}
|
|
}()
|
|
|
|
entry.wg.Add(1)
|
|
go func() {
|
|
defer entry.wg.Done()
|
|
if err := httpServer.Serve(router.HTTPListenerPlain()); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
|
m.logger.WithField("account_id", accountID).Debugf("per-account http server stopped: %v", err)
|
|
}
|
|
}()
|
|
|
|
entry.wg.Add(1)
|
|
go func() {
|
|
defer entry.wg.Done()
|
|
feedRouterFromListener(runCtx, plainListener, router, m.logger, accountID)
|
|
}()
|
|
|
|
m.muxLock.Lock()
|
|
m.entries[accountID] = entry
|
|
m.muxLock.Unlock()
|
|
|
|
return entry, nil
|
|
}
|
|
|
|
// tearDown shuts every goroutine down and closes the netstack listeners.
|
|
func (m *inboundManager) tearDown(accountID types.AccountID, entry *inboundEntry) {
|
|
m.muxLock.Lock()
|
|
if m.entries[accountID] == entry {
|
|
delete(m.entries, accountID)
|
|
delete(m.pendingRoutes, accountID)
|
|
}
|
|
m.muxLock.Unlock()
|
|
|
|
entry.cancel()
|
|
|
|
shutdownCtx, cancel := context.WithTimeout(context.Background(), inboundShutdownTimeout)
|
|
defer cancel()
|
|
|
|
if err := entry.httpsServer.Shutdown(shutdownCtx); err != nil {
|
|
m.logger.Debugf("per-account https shutdown: %v", err)
|
|
}
|
|
if err := entry.httpServer.Shutdown(shutdownCtx); err != nil {
|
|
m.logger.Debugf("per-account http shutdown: %v", err)
|
|
}
|
|
if err := entry.tlsListener.Close(); err != nil {
|
|
m.logger.Debugf("close per-account tls listener: %v", err)
|
|
}
|
|
if err := entry.plainListener.Close(); err != nil {
|
|
m.logger.Debugf("close per-account plain listener: %v", err)
|
|
}
|
|
entry.wg.Wait()
|
|
// Close the ErrorLog pipes only after the http.Servers have fully
|
|
// stopped so any straggling stdlib write doesn't race with the
|
|
// close. Each writer also tears down the logrus scanner goroutine.
|
|
for _, w := range entry.errorLogWriters {
|
|
if err := w.Close(); err != nil {
|
|
m.logger.Debugf("close per-account inbound error log writer: %v", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
// AddRoute records an SNI/host route on the account's per-account router.
|
|
// Routes registered before the listener is up are queued and replayed
|
|
// once startup completes.
|
|
func (m *inboundManager) AddRoute(accountID types.AccountID, host nbtcp.SNIHost, route nbtcp.Route) {
|
|
if m == nil {
|
|
return
|
|
}
|
|
m.muxLock.Lock()
|
|
entry, ok := m.entries[accountID]
|
|
if !ok {
|
|
m.queuePendingLocked(accountID, host, route)
|
|
m.muxLock.Unlock()
|
|
return
|
|
}
|
|
router := entry.router
|
|
m.muxLock.Unlock()
|
|
|
|
router.AddRoute(host, route)
|
|
}
|
|
|
|
// RemoveRoute drops a previously registered route. Safe to call when the
|
|
// listener is not yet up; queued copies are pruned in that case.
|
|
func (m *inboundManager) RemoveRoute(accountID types.AccountID, host nbtcp.SNIHost, svcID types.ServiceID) {
|
|
if m == nil {
|
|
return
|
|
}
|
|
m.muxLock.Lock()
|
|
m.dropPendingLocked(accountID, host, svcID)
|
|
entry, ok := m.entries[accountID]
|
|
if !ok {
|
|
m.muxLock.Unlock()
|
|
return
|
|
}
|
|
router := entry.router
|
|
m.muxLock.Unlock()
|
|
|
|
router.RemoveRoute(host, svcID)
|
|
}
|
|
|
|
// queuePendingLocked stores or upserts a pending route. Caller holds muxLock.
|
|
func (m *inboundManager) queuePendingLocked(accountID types.AccountID, host nbtcp.SNIHost, route nbtcp.Route) {
|
|
queued := m.pendingRoutes[accountID]
|
|
for i, pr := range queued {
|
|
if pr.host == host && pr.route.ServiceID == route.ServiceID {
|
|
queued[i] = pendingInboundRoute{host: host, route: route}
|
|
m.pendingRoutes[accountID] = queued
|
|
return
|
|
}
|
|
}
|
|
m.pendingRoutes[accountID] = append(queued, pendingInboundRoute{host: host, route: route})
|
|
}
|
|
|
|
// dropPendingLocked removes any queued route matching host/svcID.
|
|
// Caller holds muxLock.
|
|
func (m *inboundManager) dropPendingLocked(accountID types.AccountID, host nbtcp.SNIHost, svcID types.ServiceID) {
|
|
queued, ok := m.pendingRoutes[accountID]
|
|
if !ok {
|
|
return
|
|
}
|
|
filtered := queued[:0]
|
|
for _, pr := range queued {
|
|
if pr.host == host && pr.route.ServiceID == svcID {
|
|
continue
|
|
}
|
|
filtered = append(filtered, pr)
|
|
}
|
|
if len(filtered) == 0 {
|
|
delete(m.pendingRoutes, accountID)
|
|
return
|
|
}
|
|
m.pendingRoutes[accountID] = filtered
|
|
}
|
|
|
|
// flushPending applies all queued routes to a freshly-up router.
|
|
func (m *inboundManager) flushPending(accountID types.AccountID, entry *inboundEntry) {
|
|
m.muxLock.Lock()
|
|
queued := m.pendingRoutes[accountID]
|
|
delete(m.pendingRoutes, accountID)
|
|
m.muxLock.Unlock()
|
|
|
|
for _, pr := range queued {
|
|
entry.router.AddRoute(pr.host, pr.route)
|
|
}
|
|
}
|
|
|
|
// HasInbound reports whether the manager has a live listener for the account.
|
|
// Used by tests.
|
|
func (m *inboundManager) HasInbound(accountID types.AccountID) bool {
|
|
if m == nil {
|
|
return false
|
|
}
|
|
m.muxLock.Lock()
|
|
defer m.muxLock.Unlock()
|
|
_, ok := m.entries[accountID]
|
|
return ok
|
|
}
|
|
|
|
// PendingRouteCount reports the number of queued routes for the account.
|
|
// Used by tests.
|
|
func (m *inboundManager) PendingRouteCount(accountID types.AccountID) int {
|
|
if m == nil {
|
|
return 0
|
|
}
|
|
m.muxLock.Lock()
|
|
defer m.muxLock.Unlock()
|
|
return len(m.pendingRoutes[accountID])
|
|
}
|
|
|
|
// InboundListenerInfo describes the bound addresses of a single
|
|
// per-account inbound listener. Both addresses live on the embedded
|
|
// netstack of the account's WireGuard client and share the same tunnel IP.
|
|
type InboundListenerInfo struct {
|
|
TunnelIP string
|
|
HTTPSPort uint16
|
|
HTTPPort uint16
|
|
}
|
|
|
|
// ListenerInfo returns the inbound listener addresses for the given
|
|
// account, or ok=false when the account has no live listener. Used by
|
|
// the status-update RPC and the debug HTTP handler to surface inbound
|
|
// reachability to operators.
|
|
func (m *inboundManager) ListenerInfo(accountID types.AccountID) (InboundListenerInfo, bool) {
|
|
if m == nil {
|
|
return InboundListenerInfo{}, false
|
|
}
|
|
m.muxLock.Lock()
|
|
defer m.muxLock.Unlock()
|
|
entry, ok := m.entries[accountID]
|
|
if !ok || entry == nil {
|
|
return InboundListenerInfo{}, false
|
|
}
|
|
return listenerInfoFromEntry(entry), true
|
|
}
|
|
|
|
// Snapshot returns the inbound listener state for every account that has
|
|
// a live listener at call time. Empty when --private is off or
|
|
// no accounts have come up yet.
|
|
func (m *inboundManager) Snapshot() map[types.AccountID]InboundListenerInfo {
|
|
if m == nil {
|
|
return nil
|
|
}
|
|
m.muxLock.Lock()
|
|
defer m.muxLock.Unlock()
|
|
if len(m.entries) == 0 {
|
|
return nil
|
|
}
|
|
out := make(map[types.AccountID]InboundListenerInfo, len(m.entries))
|
|
for id, entry := range m.entries {
|
|
if entry == nil {
|
|
continue
|
|
}
|
|
out[id] = listenerInfoFromEntry(entry)
|
|
}
|
|
return out
|
|
}
|
|
|
|
// listenerInfoFromEntry extracts the tunnel IP and ports from a live
|
|
// per-account entry. Both listeners are bound on the same netstack so
|
|
// their host components match; we still pull the TLS host as the
|
|
// authoritative source.
|
|
func listenerInfoFromEntry(entry *inboundEntry) InboundListenerInfo {
|
|
info := InboundListenerInfo{HTTPSPort: privateInboundPortHTTPS, HTTPPort: privateInboundPortHTTP}
|
|
if entry.tlsListener != nil {
|
|
host, port := splitHostPort(entry.tlsListener.Addr())
|
|
info.TunnelIP = host
|
|
if port != 0 {
|
|
info.HTTPSPort = port
|
|
}
|
|
}
|
|
if entry.plainListener != nil {
|
|
host, port := splitHostPort(entry.plainListener.Addr())
|
|
if info.TunnelIP == "" {
|
|
info.TunnelIP = host
|
|
}
|
|
if port != 0 {
|
|
info.HTTPPort = port
|
|
}
|
|
}
|
|
return info
|
|
}
|
|
|
|
// splitHostPort extracts host and port from a net.Addr, returning the
|
|
// zero values when the address is missing or malformed.
|
|
func splitHostPort(addr net.Addr) (string, uint16) {
|
|
if addr == nil {
|
|
return "", 0
|
|
}
|
|
host, portStr, err := net.SplitHostPort(addr.String())
|
|
if err != nil {
|
|
return "", 0
|
|
}
|
|
if portStr == "" {
|
|
return host, 0
|
|
}
|
|
port, err := strconv.ParseUint(portStr, 10, 16)
|
|
if err != nil {
|
|
return host, 0
|
|
}
|
|
return host, uint16(port)
|
|
}
|
|
|
|
// feedRouterFromListener accepts on the plain-HTTP netstack listener and
|
|
// hands every connection to the account's router. The router peeks the
|
|
// first byte and dispatches to the plain-HTTP channel for non-TLS
|
|
// streams or the TLS channel for ClientHellos that arrive on :80.
|
|
func feedRouterFromListener(ctx context.Context, ln net.Listener, router *nbtcp.Router, logger *log.Logger, accountID types.AccountID) {
|
|
go func() {
|
|
<-ctx.Done()
|
|
_ = ln.Close()
|
|
}()
|
|
|
|
var backoff nbtcp.AcceptBackoff
|
|
for {
|
|
conn, err := ln.Accept()
|
|
if err != nil {
|
|
if ctx.Err() != nil || nbtcp.IsClosedListenerErr(err) {
|
|
return
|
|
}
|
|
logger.WithField("account_id", accountID).Debugf("plain inbound accept: %v; backing off", err)
|
|
if !backoff.Backoff(ctx) {
|
|
return
|
|
}
|
|
continue
|
|
}
|
|
backoff.Reset()
|
|
router.HandleConn(ctx, conn)
|
|
}
|
|
}
|
|
|
|
// accountDialResolver returns a DialResolver bound to a single account's
|
|
// embedded client. The router only ever serves traffic for that account
|
|
// so the supplied accountID is ignored at dial time.
|
|
func accountDialResolver(_ types.AccountID, client *embed.Client) nbtcp.DialResolver {
|
|
return func(_ types.AccountID) (types.DialContextFunc, error) {
|
|
return client.DialContext, nil
|
|
}
|
|
}
|
|
|
|
// accountTunnelLookup returns a TunnelLookupFunc backed by the embedded
|
|
// client's peerstore for a single account. Phase 3 uses the result to
|
|
// short-circuit ValidateTunnelPeer when the source IP is not in the
|
|
// account's roster and to seed the cached identity for known peers.
|
|
func accountTunnelLookup(client *embed.Client) auth.TunnelLookupFunc {
|
|
if client == nil {
|
|
return nil
|
|
}
|
|
return func(ip netip.Addr) (auth.PeerIdentity, bool) {
|
|
pubKey, fqdn, ok := client.IdentityForIP(ip)
|
|
if !ok {
|
|
return auth.PeerIdentity{}, false
|
|
}
|
|
return auth.PeerIdentity{
|
|
PubKey: pubKey,
|
|
TunnelIP: ip,
|
|
FQDN: fqdn,
|
|
}, true
|
|
}
|
|
}
|
|
|
|
// withTunnelLookup returns an http.Handler that attaches the per-account
|
|
// peerstore lookup to every request's context before delegating to next.
|
|
// Calling on the host-level listener is a no-op because that path never
|
|
// installs this wrapper, so the existing behaviour stays byte-for-byte
|
|
// identical when --private is off or the request didn't arrive
|
|
// on a per-account listener.
|
|
func withTunnelLookup(next http.Handler, lookup auth.TunnelLookupFunc) http.Handler {
|
|
if lookup == nil {
|
|
return next
|
|
}
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
ctx := auth.WithTunnelLookup(r.Context(), lookup)
|
|
next.ServeHTTP(w, r.WithContext(ctx))
|
|
})
|
|
}
|
|
|
|
// inboundDebugAdapter adapts *inboundManager to the debug.InboundProvider
|
|
// interface so the debug HTTP handler can render per-account inbound
|
|
// listener state without importing the proxy package.
|
|
type inboundDebugAdapter struct {
|
|
mgr *inboundManager
|
|
}
|
|
|
|
// InboundListeners returns a snapshot of the live per-account inbound
|
|
// listeners formatted for the debug surface.
|
|
func (a inboundDebugAdapter) InboundListeners() map[types.AccountID]debug.InboundListenerInfo {
|
|
if a.mgr == nil {
|
|
return nil
|
|
}
|
|
snap := a.mgr.Snapshot()
|
|
if len(snap) == 0 {
|
|
return nil
|
|
}
|
|
out := make(map[types.AccountID]debug.InboundListenerInfo, len(snap))
|
|
for id, info := range snap {
|
|
out[id] = debug.InboundListenerInfo{
|
|
TunnelIP: info.TunnelIP,
|
|
HTTPSPort: info.HTTPSPort,
|
|
HTTPPort: info.HTTPPort,
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
// newInboundErrorLog routes a per-account http.Server's stdlib error
|
|
// stream through logrus at warn level. The returned PipeWriter must be
|
|
// closed by the caller (tearDown) once the http.Server has shut down —
|
|
// otherwise the pipe and its scanner goroutine leak per account, see
|
|
// logrus.Entry.WriterLevel.
|
|
func newInboundErrorLog(logger *log.Logger, scheme string, accountID types.AccountID) (*stdlog.Logger, *io.PipeWriter) {
|
|
w := logger.WithFields(log.Fields{
|
|
"inbound-http": scheme,
|
|
"account_id": accountID,
|
|
}).WriterLevel(log.WarnLevel)
|
|
return stdlog.New(w, "", 0), w
|
|
}
|