mirror of
https://github.com/netbirdio/netbird.git
synced 2026-08-24 16:41:30 +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.
123 lines
4.9 KiB
Go
123 lines
4.9 KiB
Go
package store
|
|
|
|
import (
|
|
"context"
|
|
"net/netip"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
nbpeer "github.com/netbirdio/netbird/management/server/peer"
|
|
"github.com/netbirdio/netbird/management/server/types"
|
|
)
|
|
|
|
const activityAccountID = "activityAccountId"
|
|
|
|
func newActivityTestStore(t *testing.T) Store {
|
|
t.Helper()
|
|
|
|
store, cleanUp, err := NewTestStoreFromSQL(context.Background(), "", t.TempDir())
|
|
require.NoError(t, err)
|
|
t.Cleanup(cleanUp)
|
|
|
|
require.NoError(t, store.SaveAccount(context.Background(), &types.Account{
|
|
Id: activityAccountID,
|
|
Domain: "activity.example.com",
|
|
CreatedAt: time.Now().UTC(),
|
|
}))
|
|
|
|
return store
|
|
}
|
|
|
|
func TestRefreshPeerLastSeen(t *testing.T) {
|
|
ctx := context.Background()
|
|
store := newActivityTestStore(t)
|
|
stored := time.Now().UTC().Add(-3 * time.Hour)
|
|
require.NoError(t, store.AddPeerToAccount(ctx, activityPeer(stored)))
|
|
|
|
refreshed, err := store.RefreshPeerLastSeen(ctx, activityAccountID, "activityPeer", time.Now().UTC().Add(-time.Hour))
|
|
require.NoError(t, err)
|
|
assert.True(t, refreshed, "a peer seen three hours ago is stale enough to refresh")
|
|
|
|
peer, err := store.GetPeerByID(ctx, LockingStrengthNone, activityAccountID, "activityPeer")
|
|
require.NoError(t, err)
|
|
assert.WithinDuration(t, time.Now().UTC(), peer.Status.LastSeen.UTC(), time.Minute, "last seen should be stamped at write time")
|
|
assert.True(t, peer.Status.LastSeen.After(stored), "last seen must move forward")
|
|
}
|
|
|
|
// TestRefreshPeerLastSeenHonoursCutoff covers the throttle the caller relies on:
|
|
// two concurrent requests both read the same stale peer, but only the statement
|
|
// that still finds LastSeen behind the cutoff writes.
|
|
func TestRefreshPeerLastSeenHonoursCutoff(t *testing.T) {
|
|
ctx := context.Background()
|
|
store := newActivityTestStore(t)
|
|
stored := time.Now().UTC().Add(-10 * time.Minute)
|
|
require.NoError(t, store.AddPeerToAccount(ctx, activityPeer(stored)))
|
|
|
|
refreshed, err := store.RefreshPeerLastSeen(ctx, activityAccountID, "activityPeer", time.Now().UTC().Add(-time.Hour))
|
|
require.NoError(t, err)
|
|
assert.False(t, refreshed, "a peer seen inside the interval must not be written")
|
|
|
|
peer, err := store.GetPeerByID(ctx, LockingStrengthNone, activityAccountID, "activityPeer")
|
|
require.NoError(t, err)
|
|
assert.WithinDuration(t, stored, peer.Status.LastSeen.UTC(), time.Second, "last seen must be left where it was")
|
|
}
|
|
|
|
// TestRefreshPeerLastSeenRecordsNeverSeenPeer covers the nullable column. Status
|
|
// is an embedded pointer, so a peer stored without one leaves last seen NULL,
|
|
// and NULL loses the cutoff comparison — such a peer would never record its
|
|
// first activity.
|
|
func TestRefreshPeerLastSeenRecordsNeverSeenPeer(t *testing.T) {
|
|
ctx := context.Background()
|
|
store := newActivityTestStore(t)
|
|
stored := activityPeer(time.Time{})
|
|
stored.Status = nil
|
|
require.NoError(t, store.AddPeerToAccount(ctx, stored))
|
|
|
|
refreshed, err := store.RefreshPeerLastSeen(ctx, activityAccountID, "activityPeer", time.Now().UTC().Add(-time.Hour))
|
|
require.NoError(t, err)
|
|
assert.True(t, refreshed, "a peer that was never seen must record its first activity")
|
|
|
|
peer, err := store.GetPeerByID(ctx, LockingStrengthNone, activityAccountID, "activityPeer")
|
|
require.NoError(t, err)
|
|
assert.WithinDuration(t, time.Now().UTC(), peer.Status.LastSeen.UTC(), time.Minute, "last seen should be stamped at write time")
|
|
}
|
|
|
|
// TestRefreshPeerLastSeenLeavesSessionStateAlone pins the column boundary: the
|
|
// connected flag and the session token belong to the sync stream that owns the
|
|
// peer's session, and a blind write here would corrupt its fencing. This is why
|
|
// SavePeerStatus is not reused for an activity bump.
|
|
func TestRefreshPeerLastSeenLeavesSessionStateAlone(t *testing.T) {
|
|
ctx := context.Background()
|
|
store := newActivityTestStore(t)
|
|
|
|
stored := activityPeer(time.Date(2026, 3, 1, 9, 0, 0, 0, time.UTC))
|
|
stored.Status.Connected = true
|
|
stored.Status.SessionStartedAt = 1234567890
|
|
require.NoError(t, store.AddPeerToAccount(ctx, stored))
|
|
|
|
refreshed, err := store.RefreshPeerLastSeen(ctx, activityAccountID, "activityPeer", time.Now().UTC().Add(-time.Hour))
|
|
require.NoError(t, err)
|
|
require.True(t, refreshed, "the peer is stale enough to refresh")
|
|
|
|
peer, err := store.GetPeerByID(ctx, LockingStrengthNone, activityAccountID, "activityPeer")
|
|
require.NoError(t, err)
|
|
assert.WithinDuration(t, time.Now().UTC(), peer.Status.LastSeen.UTC(), time.Minute, "last seen should move forward")
|
|
assert.True(t, peer.Status.Connected, "connected flag must survive an activity write")
|
|
assert.Equal(t, int64(1234567890), peer.Status.SessionStartedAt, "session token must survive an activity write")
|
|
}
|
|
|
|
func activityPeer(lastSeen time.Time) *nbpeer.Peer {
|
|
return &nbpeer.Peer{
|
|
ID: "activityPeer",
|
|
AccountID: activityAccountID,
|
|
Key: "activityPeerKey",
|
|
IP: netip.MustParseAddr("100.64.0.9"),
|
|
Name: "activity-peer",
|
|
DNSLabel: "activity-peer",
|
|
Status: &nbpeer.PeerStatus{LastSeen: lastSeen},
|
|
}
|
|
}
|