diff options
| author | Paul Buetow <paul@buetow.org> | 2026-07-22 23:51:18 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2026-07-22 23:51:18 +0300 |
| commit | 849951be1d1a7ee9f9302006ccb187bf5b4e36f3 (patch) | |
| tree | 496c924a03a9ea6212e29bb4699e268066ebad81 /internal/ssh/server/authkeystore.go | |
| parent | bf78b3abffee6d49c08ca2980156afc455994969 (diff) | |
feat: DTail fork — server/client feature development
Squashed development of the snonux/dtail fork's product code (internal/, cmd/)
since diverging from mimecast/dtail. Major areas:
- Read/output path: the former "turbo" channel-less path is now the single,
default server-side read/output path for cat/grep/tail and MapReduce; the old
channel-based path and its config/env toggles were removed.
- MapReduce: single aggregate implementation (server + serverless) fed directly
by a processor pipeline, with input-exhausted finalization via the shutdown
coordinator; high-concurrency and data-race fixes.
- Journal source reads (journal:unit.service) via journalctl, Linux-gated behind
a journal-v1 capability.
- Auth-key fast reconnect: in-memory per-user public-key cache with TTL/max-keys,
registered over an authenticated session (AUTHKEY), checked before
authorized_keys.
- Interactive query reload (--interactive-query) with SESSION START/UPDATE
generation boundaries and capability negotiation.
- Client-side deadlines: --timeout / --shutdownAfter as context deadlines;
follow shutdown handling.
- Client logging: diagnostics-only daily log by default, opt-in payload tee via
--log-payload.
- Numerous correctness fixes (buffer-pool double-recycle races, EOF-sentinel
leaks, glob-expansion cap, TOCTOU in CSV parsing) with accompanying unit tests.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Diffstat (limited to 'internal/ssh/server/authkeystore.go')
| -rw-r--r-- | internal/ssh/server/authkeystore.go | 186 |
1 files changed, 186 insertions, 0 deletions
diff --git a/internal/ssh/server/authkeystore.go b/internal/ssh/server/authkeystore.go new file mode 100644 index 0000000..4de71ee --- /dev/null +++ b/internal/ssh/server/authkeystore.go @@ -0,0 +1,186 @@ +package server + +import ( + "sync" + "time" + + gossh "golang.org/x/crypto/ssh" +) + +const ( + defaultAuthKeyTTL = 24 * time.Hour + defaultAuthKeyMaxPerUser = 5 +) + +type authKeyEntry struct { + pubKey gossh.PublicKey + registeredAt time.Time +} + +// AuthKeyStore is an in-memory, per-user cache of SSH public keys. +// Each Server instance owns exactly one AuthKeyStore, constructed via +// NewAuthKeyStore. There is no shared package-level instance; callers +// must always supply a non-nil store. +type AuthKeyStore struct { + mu sync.RWMutex + keysByUser map[string][]authKeyEntry + ttl time.Duration + maxKeysPerUser int + now func() time.Time +} + +// NewAuthKeyStore builds a thread-safe auth key store. +func NewAuthKeyStore(ttl time.Duration, maxKeysPerUser int) *AuthKeyStore { + return newAuthKeyStoreWithClock(ttl, maxKeysPerUser, time.Now) +} + +func newAuthKeyStoreWithClock(ttl time.Duration, maxKeysPerUser int, + nowFn func() time.Time) *AuthKeyStore { + + if ttl <= 0 { + ttl = defaultAuthKeyTTL + } + if maxKeysPerUser <= 0 { + maxKeysPerUser = defaultAuthKeyMaxPerUser + } + if nowFn == nil { + nowFn = time.Now + } + + return &AuthKeyStore{ + keysByUser: make(map[string][]authKeyEntry), + ttl: ttl, + maxKeysPerUser: maxKeysPerUser, + now: nowFn, + } +} + +// Add stores or refreshes a key for a user. +func (s *AuthKeyStore) Add(user string, pubKey gossh.PublicKey) { + if user == "" || pubKey == nil { + return + } + + now := s.now() + offeredKey := marshalKey(pubKey) + + s.mu.Lock() + defer s.mu.Unlock() + + userEntries := s.pruneExpiredLocked(user, now) + + newEntries := make([]authKeyEntry, 0, len(userEntries)+1) + for _, entry := range userEntries { + if marshalKey(entry.pubKey) == offeredKey { + continue + } + newEntries = append(newEntries, entry) + } + + newEntries = append(newEntries, authKeyEntry{ + pubKey: pubKey, + registeredAt: now, + }) + if len(newEntries) > s.maxKeysPerUser { + newEntries = newEntries[len(newEntries)-s.maxKeysPerUser:] + } + + s.keysByUser[user] = newEntries +} + +// Has returns true if a non-expired key exists for a user. +func (s *AuthKeyStore) Has(user string, pubKey gossh.PublicKey) bool { + if user == "" || pubKey == nil { + return false + } + + now := s.now() + offeredKey := marshalKey(pubKey) + + s.mu.Lock() + defer s.mu.Unlock() + + userEntries := s.pruneExpiredLocked(user, now) + for _, entry := range userEntries { + if marshalKey(entry.pubKey) == offeredKey { + return true + } + } + + return false +} + +// Remove deletes a key for a user if it exists. +func (s *AuthKeyStore) Remove(user string, pubKey gossh.PublicKey) { + if user == "" || pubKey == nil { + return + } + + offeredKey := marshalKey(pubKey) + + s.mu.Lock() + defer s.mu.Unlock() + + userEntries := s.pruneExpiredLocked(user, s.now()) + if len(userEntries) == 0 { + return + } + + remaining := make([]authKeyEntry, 0, len(userEntries)) + for _, entry := range userEntries { + if marshalKey(entry.pubKey) == offeredKey { + continue + } + remaining = append(remaining, entry) + } + + if len(remaining) == 0 { + delete(s.keysByUser, user) + return + } + + s.keysByUser[user] = remaining +} + +func (s *AuthKeyStore) pruneExpiredLocked(user string, now time.Time) []authKeyEntry { + userEntries, ok := s.keysByUser[user] + if !ok || len(userEntries) == 0 { + delete(s.keysByUser, user) + return nil + } + + hasExpiredEntries := false + for _, entry := range userEntries { + if s.expired(entry, now) { + hasExpiredEntries = true + break + } + } + if !hasExpiredEntries { + return userEntries + } + + activeEntries := make([]authKeyEntry, 0, len(userEntries)) + for _, entry := range userEntries { + if s.expired(entry, now) { + continue + } + activeEntries = append(activeEntries, entry) + } + + if len(activeEntries) == 0 { + delete(s.keysByUser, user) + return nil + } + + s.keysByUser[user] = activeEntries + return activeEntries +} + +func (s *AuthKeyStore) expired(entry authKeyEntry, now time.Time) bool { + return !entry.registeredAt.Add(s.ttl).After(now) +} + +func marshalKey(pubKey gossh.PublicKey) string { + return string(pubKey.Marshal()) +} |
