mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
* feat(auth): add revocable API tokens (bot/service auth) Add long-lived, revocable API tokens so headless clients (the introspection MCP tool, bots, CI) can authenticate without a password. Presented as "Authorization: Bearer <token>", a token authenticates as a specific user, inheriting that user's role and permissions. - migration 018 + dedicated api_tokens table (kept separate from sessions so bulk logout and the per-user session cap never touch these); only the SHA-256 hash is stored, raw token shown once at creation - auth.ResolveTokenHash: one shared bearer resolver that both AuthMiddleware and adminAuthMiddleware now call. Sessions are matched first so existing login behavior is unchanged; API tokens are a fallback only on session miss. A DB outage is returned wrapped, never mistaken for a bad token. - `server token create|list|revoke` CLI: mints directly against the DB with no HTTP and no login — the password-free bootstrap path - tests: resolver (8 cases incl. outage-not-fallthrough), db queries (6), api middleware integration (valid + revoked token) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(tools): add owncord-introspect MCP server A local MCP dev tool that lets Claude Code introspect a running OwnCord instance: read its logs, query any REST endpoint, and tail the desktop client's log file. It is a thin wrapper over the existing API plus the client log — no new product surface. - tools/mcp-introspect/index.mjs (Node/ESM, one dep: @modelcontextprotocol/sdk) exposes api_request (full read-write passthrough), server_logs (admin SSE ring-buffer stream), client_logs (reads the desktop log file) - authenticates with an API token (OWNCORD_API_TOKEN); pins the self-signed cert and skips hostname checks (the cert has no SAN) - registered in .mcp.json (secret-free ${OWNCORD_API_TOKEN}) - un-ignore tools/mcp-introspect/ so this shared dev tool is committed, while tools/livekit-server.exe and node_modules stay ignored - docs/mcp-introspect.md: how it works, tool reference, setup, troubleshooting Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(dependencies): update and add various crate versions in Cargo.lock * feat(admin): manage API tokens from the admin panel Add Owner-gated HTTP endpoints and a UI card to create, list, and revoke API tokens from the web admin panel. Previously only the `server token` CLI could manage them, which requires shell access to the host. - POST|GET|DELETE /admin/api/tokens in admin/handlers_tokens.go, wired in admin/api.go. All three are Owner-only (ownerOnlyMiddleware, like backups/updates): an HTTP token-mint endpoint is a network-reachable credential-minting surface, and API tokens deliberately survive password change + bulk logout, so a hijacked admin session must not mint one. - Reuses the same db.*APIToken calls as the CLI; create sources the actor from request context (audits who clicked, not the bound user); the raw token is returned once in the 201 body, never stored. - Add json tags to db.APITokenListItem for snake_case wire consistency. - Admin panel: "API Tokens" nav item + create modal, show-once reveal, revoke confirm in admin/static/index.html. - Tests: 7 in admin/api_test.go (+api_tokens table in the in-memory schema). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * refactor: modernize to Go 1.26 idioms + enable modernize linter Apply `golangci-lint modernize` autofixes across the server and enable the linter in .golangci.yml so these stop re-accumulating (they built up only because modernize was never in the config). Production code: slices.Contains for hand-rolled membership loops (api router, ws origin, db/account, plugin manifest); strings.SplitSeq for allocation-free line/segment iteration (db/migrate, updater, livekit_proxy); strings.Cut (config); fmt.Appendf (dm_handler); min() (event_pruner); any (ws client). Tests: range-over-int, t.Context(), WaitGroup.Go, slices.Sort, maps.Copy, new(expr), interface{}->any. - plugin/manifest.go parent-traversal check applied by hand: modernize skipped it (two conflicting rewrites); used the slices.Contains form. - Removed the now-dead ptr() test helper after newexpr inlined its callers. - Dropped dangling sort imports left by the sort.Slice->slices.Sort rewrite. No behavior change. All four tag variants build, full test suite is green, and golangci-lint (with modernize enabled) reports 0 issues. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
269 lines
8.6 KiB
Go
269 lines
8.6 KiB
Go
package ws
|
|
|
|
import (
|
|
"context"
|
|
"log/slog"
|
|
"time"
|
|
|
|
"github.com/owncord/server/db"
|
|
"github.com/owncord/server/syncutil"
|
|
)
|
|
|
|
const (
|
|
sendBufSize = 256 // per-client outbound send-channel capacity (normal priority)
|
|
sendHighBufSize = 64 // high-priority buffer (DMs, mentions)
|
|
sendLowBufSize = 64 // low-priority buffer (typing, presence)
|
|
)
|
|
|
|
// SessionCheckInterval is the number of messages processed between periodic
|
|
// session-expiry checks in readPump. Exported so tests can trigger the check
|
|
// without waiting for a real ticker.
|
|
const SessionCheckInterval = 10
|
|
|
|
// Client represents a single authenticated WebSocket connection.
|
|
// The underlying transport (conn) is set by ServeWS; in tests it remains nil.
|
|
type Client struct {
|
|
hub *Hub
|
|
conn wsConn // interface — nil in unit tests
|
|
ctx context.Context // derived from WS upgrade request; cancelled on disconnect
|
|
userID int64
|
|
user *db.User
|
|
channelID int64 // currently viewed channel for channel-scoped broadcasts
|
|
voiceChID int64 // voice channel the user is in (0 = not in voice); guarded by voiceMu
|
|
voiceJoinToken string // opaque join-instance token for the current voice session; guarded by voiceMu
|
|
e2eePubKey string // ECDH P-256 public key (base64) for voice E2EE; guarded by voiceMu
|
|
e2eeSignature string // identity-key signature over e2eePubKey (F3 TOFU); "" for legacy announces; guarded by voiceMu
|
|
roleName string // cached role name for chat_message broadcasts
|
|
tokenHash string // SHA-256 hex of the session token; used for periodic revalidation
|
|
lastSeq uint64 // last_seq sent by the client during auth; 0 = fresh connection (e.g. F5 reload)
|
|
connectedAt time.Time // when the WS connection was established
|
|
remoteAddr string // client IP:port from the HTTP upgrade request
|
|
msgCount int // count of messages processed; resets after session check
|
|
msgsReceived int64 // total messages received over the lifetime of this connection
|
|
msgsSent int64 // total messages sent over the lifetime of this connection
|
|
msgsDropped int64 // messages dropped due to full send buffer
|
|
invalidCount int // consecutive invalid messages; reset on valid parse
|
|
lastActivity time.Time // last message received from this client; guarded by mu
|
|
sendClosed bool // true after all send channels have been closed
|
|
send chan []byte // normal-priority outbound messages (chat messages, reactions)
|
|
sendHigh chan []byte // high-priority outbound messages (DMs, mentions)
|
|
sendLow chan []byte // low-priority outbound messages (typing, presence) — dropped on overflow
|
|
mu syncutil.Mutex // guards sendClosed, msgCount, channelID, lastActivity, msgsReceived, msgsSent, msgsDropped
|
|
voiceMu syncutil.Mutex // guards voiceChID and voiceJoinToken
|
|
}
|
|
|
|
// wsConn is the subset of github.com/coder/websocket.Conn used by writePump/readPump.
|
|
// Defining it as an interface lets us avoid importing github.com/coder/websocket here,
|
|
// keeping the core hub logic free from that dependency during unit tests.
|
|
type wsConn any
|
|
|
|
// newClient creates a real client wrapping a WebSocket connection (set by serve.go).
|
|
func newClient(hub *Hub, conn wsConn, user *db.User, tokenHash string, lastSeq uint64, ctx context.Context) *Client {
|
|
now := time.Now()
|
|
return &Client{
|
|
hub: hub,
|
|
conn: conn,
|
|
ctx: ctx,
|
|
userID: user.ID,
|
|
user: user,
|
|
tokenHash: tokenHash,
|
|
lastSeq: lastSeq,
|
|
connectedAt: now,
|
|
lastActivity: now,
|
|
send: make(chan []byte, sendBufSize),
|
|
sendHigh: make(chan []byte, sendHighBufSize),
|
|
sendLow: make(chan []byte, sendLowBufSize),
|
|
}
|
|
}
|
|
|
|
// GetTokenHash returns the session token hash stored on this client.
|
|
// Exported for tests.
|
|
func (c *Client) GetTokenHash() string {
|
|
return c.tokenHash
|
|
}
|
|
|
|
// touch updates the last activity timestamp and increments the received counter.
|
|
func (c *Client) touch() {
|
|
c.mu.Lock()
|
|
c.lastActivity = time.Now()
|
|
c.msgsReceived++
|
|
c.mu.Unlock()
|
|
}
|
|
|
|
// getLastActivity returns the last activity timestamp under mu.
|
|
func (c *Client) getLastActivity() time.Time {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
return c.lastActivity
|
|
}
|
|
|
|
// getChannelID returns the currently focused channel ID under mu.
|
|
func (c *Client) getChannelID() int64 {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
return c.channelID
|
|
}
|
|
|
|
// getVoiceChID returns the voice channel ID under voiceMu.
|
|
func (c *Client) getVoiceChID() int64 {
|
|
c.voiceMu.Lock()
|
|
defer c.voiceMu.Unlock()
|
|
return c.voiceChID
|
|
}
|
|
|
|
func (c *Client) getVoiceState() (int64, string) {
|
|
c.voiceMu.Lock()
|
|
defer c.voiceMu.Unlock()
|
|
return c.voiceChID, c.voiceJoinToken
|
|
}
|
|
|
|
func (c *Client) setVoiceState(chID int64, joinToken string) {
|
|
c.voiceMu.Lock()
|
|
defer c.voiceMu.Unlock()
|
|
c.voiceChID = chID
|
|
c.voiceJoinToken = joinToken
|
|
}
|
|
|
|
// clearVoiceChID clears the voice channel ID and returns the old value.
|
|
func (c *Client) clearVoiceChID() int64 {
|
|
oldChID, _ := c.clearVoiceState()
|
|
return oldChID
|
|
}
|
|
|
|
func (c *Client) clearVoiceState() (int64, string) {
|
|
c.voiceMu.Lock()
|
|
defer c.voiceMu.Unlock()
|
|
oldChID := c.voiceChID
|
|
oldJoinToken := c.voiceJoinToken
|
|
c.voiceChID = 0
|
|
c.voiceJoinToken = ""
|
|
c.e2eePubKey = ""
|
|
c.e2eeSignature = ""
|
|
return oldChID, oldJoinToken
|
|
}
|
|
|
|
// setE2EEPubKey stores the ECDH public key for voice E2EE key exchange,
|
|
// together with its identity-key signature ("" for legacy announces).
|
|
func (c *Client) setE2EEPubKey(key, signature string) {
|
|
c.voiceMu.Lock()
|
|
defer c.voiceMu.Unlock()
|
|
c.e2eePubKey = key
|
|
c.e2eeSignature = signature
|
|
}
|
|
|
|
// getE2EEPubKey returns the stored ECDH public key and its signature.
|
|
func (c *Client) getE2EEPubKey() (string, string) {
|
|
c.voiceMu.Lock()
|
|
defer c.voiceMu.Unlock()
|
|
return c.e2eePubKey, c.e2eeSignature
|
|
}
|
|
|
|
// sendMsg queues a normal-priority message (chat messages, reactions, channel events).
|
|
// If the buffer is full, the client is disconnected to force a reconnect
|
|
// with replay recovery instead of silently losing messages (BUG-124).
|
|
func (c *Client) sendMsg(msg []byte) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
if c.sendClosed {
|
|
return
|
|
}
|
|
select {
|
|
case c.send <- msg:
|
|
c.msgsSent++
|
|
default:
|
|
c.msgsDropped++
|
|
slog.Warn("ws: client send buffer full, closing connection to force reconnect",
|
|
"user_id", c.userID)
|
|
c.closeAllSendLocked()
|
|
}
|
|
}
|
|
|
|
// sendHighMsg queues a high-priority message (DMs, direct mentions).
|
|
// High-priority messages are drained before normal and low-priority messages
|
|
// by writePump. If the high-priority buffer is full, falls back to the normal
|
|
// buffer. If both are full, disconnects the client.
|
|
func (c *Client) sendHighMsg(msg []byte) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
if c.sendClosed {
|
|
return
|
|
}
|
|
select {
|
|
case c.sendHigh <- msg:
|
|
c.msgsSent++
|
|
default:
|
|
// Fall back to normal priority channel.
|
|
select {
|
|
case c.send <- msg:
|
|
c.msgsSent++
|
|
default:
|
|
c.msgsDropped++
|
|
slog.Warn("ws: client high+normal buffers full, closing connection",
|
|
"user_id", c.userID)
|
|
c.closeAllSendLocked()
|
|
}
|
|
}
|
|
}
|
|
|
|
// sendLowMsg queues a low-priority message (typing indicators, presence updates).
|
|
// If the buffer is full the message is silently dropped — the client is NOT
|
|
// disconnected, since these events are ephemeral and can be safely lost.
|
|
func (c *Client) sendLowMsg(msg []byte) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
if c.sendClosed {
|
|
return
|
|
}
|
|
select {
|
|
case c.sendLow <- msg:
|
|
c.msgsSent++
|
|
default:
|
|
c.msgsDropped++
|
|
// Do NOT disconnect — low-priority messages are safely droppable.
|
|
}
|
|
}
|
|
|
|
// trySendMsg queues a normal-priority message and returns true if it was
|
|
// accepted, false if the buffer is full or the channel is closed.
|
|
// On buffer overflow, the client is disconnected to force a reconnect (BUG-124).
|
|
func (c *Client) trySendMsg(msg []byte) bool {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
if c.sendClosed {
|
|
return false
|
|
}
|
|
select {
|
|
case c.send <- msg:
|
|
c.msgsSent++
|
|
return true
|
|
default:
|
|
c.msgsDropped++
|
|
slog.Warn("ws: client send buffer full (trySend), closing connection to force reconnect",
|
|
"user_id", c.userID)
|
|
c.closeAllSendLocked()
|
|
return false
|
|
}
|
|
}
|
|
|
|
// closeSend marks all send channels closed and closes them exactly once.
|
|
// Safe to call from any goroutine.
|
|
func (c *Client) closeSend() {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
c.closeAllSendLocked()
|
|
}
|
|
|
|
// closeAllSendLocked closes all three send channels. Caller must hold c.mu.
|
|
func (c *Client) closeAllSendLocked() {
|
|
if !c.sendClosed {
|
|
c.sendClosed = true
|
|
close(c.send)
|
|
if c.sendHigh != c.send {
|
|
close(c.sendHigh)
|
|
}
|
|
if c.sendLow != c.send && c.sendLow != c.sendHigh {
|
|
close(c.sendLow)
|
|
}
|
|
}
|
|
}
|