mirror of
https://github.com/netbirdio/netbird.git
synced 2026-08-25 00:51:28 +02:00
f805c149d9
People who only ever reach private services through the reverse proxy were invisible to activity accounting. Active users are counted from user.LastLogin or from the LastSeen of a peer they own, and neither column was written on the proxy paths — so a person signing in via SSO to a proxied service, or a peer serving one over the mesh, never showed up in the 24 hour numbers. Both writes now happen where the proxy already authenticates: - GenerateSessionToken stamps LastLogin after the session token is signed, the same column and the same way the dashboard and device login paths do. - ValidateTunnelPeer stamps the calling peer's LastSeen, the column its owner activates through. The policy lives in a new reverseproxy/activity manager rather than in the gRPC service, matching the module layout the other reverse proxy domains use. It skips what can never count — service users, embedded proxy peers and WASM clients — and throttles peer writes to once an hour, well inside the window accounting asks about and far above the proxy's five minute tunnel cache. The peer write is a single indexed UPDATE that touches only peer_status_last_seen. Connected and SessionStartedAt are left alone so the session-ownership fencing MarkPeerConnectedIfNewerSession relies on is never disturbed, and the timestamp comes from the database clock rather than the caller, for the same reason the other status writers take it from there. The caller's cutoff travels into the statement's WHERE, so concurrent requests for one peer collapse into a single write instead of each acting on its own stale read, and a peer that was never seen — NULL last seen, since Status is an embedded pointer — still records its first activity. Nothing outside the reverse proxy changes behaviour: the only addition elsewhere is the RefreshPeerLastSeen store method the manager calls.
26 lines
1.1 KiB
Go
26 lines
1.1 KiB
Go
// Package activity records that a principal used a reverse proxy service, so
|
|
// that activity accounting counts people and devices which reach services
|
|
// through the proxy but never touch the dashboard or the management API.
|
|
package activity
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/netbirdio/netbird/management/server/peer"
|
|
"github.com/netbirdio/netbird/management/server/types"
|
|
)
|
|
|
|
// Manager records reverse proxy usage against the timestamps activity
|
|
// accounting reads. Both methods are best effort from the caller's point of
|
|
// view: a lost record is corrected by the next request, and no authorization
|
|
// decision reads them back.
|
|
type Manager interface {
|
|
// RecordUserLogin records a completed SSO sign-in to a proxied service.
|
|
// Service users have no interactive login and are ignored.
|
|
RecordUserLogin(ctx context.Context, accountID string, user *types.User) error
|
|
// RecordPeerSeen records that a peer reached a private service over the
|
|
// mesh, which is what lets its owner count as active. Peers activity
|
|
// accounting excludes, and peers already seen recently, are ignored.
|
|
RecordPeerSeen(ctx context.Context, accountID string, peer *peer.Peer) error
|
|
}
|