mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
* refactor(ws): split handleVoiceJoin into cohesive join-stage helpers handleVoiceJoin was 130 statements / cyclomatic 59 / nestif 11, breaking all three complexity budgets at once. Split along the stage boundaries the doc comment already described: precheck, leave-current, persist, restore moderator flags, grant token, complete. The publish-permission derivation becomes its own helper because it is the one branch-heavy block inside the token grant. Pure move: every statement is preserved verbatim. The only edits are bare `return`s becoming the typed returns of their new helper, `c.userID` becoming the `userID` parameter inside voiceJoinPublishPerms, and voiceJoinComplete re-reading `ch.VoiceMaxUsers` instead of receiving it — `ch` is never mutated, so the value is identical. Verified by normalising both revisions of the region to sorted, comment- and whitespace-stripped statements and diffing: the only deltas are the ones listed above. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor: collapse the three duplicated sibling pairs dupl flagged three pairs of adjacent near-identical functions. Each pair is now one parameterised implementation plus two thin, still-greppable wrappers. - ws/voice_controls.go: handleVoiceMuteV2 / handleVoiceDeafenV2 share voiceSelfToggleV2; handleVoiceCameraV2 / handleVoiceScreenshareV2 share voiceStreamToggleV2. Camera and screenshare drawing from one voice_max_video budget (OC-0023) was a bug caused by exactly this duplication drifting, so one body is the point, not a side effect. - db/mention_queries.go: ListMentionTargetsByRoles / ListMentionTargetsByUserIDs share listMentionTargets. The matched column is a closed named type (mentionTargetColumn) rather than a bare string, so the value interpolated into the SELECT cannot become caller-supplied. Behaviour is unchanged: every rate-limit key, error code, error string, slog message and slog key is preserved verbatim, including the two "failed to update <kind> state" messages, which are now assembled the same way enableVideoSlot already assembled them. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(api): extract readEmojiUpload from handleCreateEmoji handleCreateEmoji was 101 lines against a 100-line budget. The upload-bytes stage — pull the file out of the parsed form, cap its size, sniff its MIME type and sniff its dimensions — is the one self-contained block in it, and it already wrote its own refusals, so it moves out whole as readEmojiUpload. The permission-before-parse ordering the doc comment calls out is unchanged; so is every error string. file.Close() now runs when the helper returns rather than when the handler does, which is strictly earlier and unobservable: the bytes are already copied into raw and nothing else touches the handle. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor: extract one cohesive block from three single-budget offenders Each of these was over exactly one budget, so each gets exactly one extraction rather than a restructure: - api/totp_handler.go handleVerifyTOTP (102 lines / 100): the block that resolves the user behind the partial-auth challenge and decrypts their TOTP secret becomes totpChallengeSecret. The ban-inside-the-partial-window check moves with it. - service/message_reactions.go handleReaction (cyclop 21 / 20): the whole authorisation chain — channel lookup, archived gate, DM participant and block checks, non-DM permission check — becomes reactionAudience, which also returns the DM fan-out audience it already resolved. Check order is unchanged and load-bearing. - db/admin_queries.go BackupToSafe (cyclop 21 / 20): the character allowlist loop and the SQL-comment rejection become validateBackupPathChars. That loop alone was most of the branch count. No error string, no check and no ordering changed. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(plugin): split InstallFromZip into staged install helpers 104 statements / cyclomatic 44 / nestif 12. Split along the stages the code already had: installZipExtract (the per-entry write loop, with installZipEntryDest holding the mode/symlink/zip-slip guard chain and installZipWriteEntry the size-capped copy), installZipStagedManifest, installZipPromote, and installZipReactivate for the :399 nested block. Every zip-slip, symlink, entry-mode and uncompressed-size check is preserved in the same order relative to the writes it guards. The 19 inline `cleanup(); return` sites collapse to 4 in the orchestrator, one per stage, because each helper now returns an error instead of unwinding itself — the staging directory is still removed on exactly the same set of failures. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(api): split newWAFMiddleware into engine build and per-phase helpers 184 lines / cyclomatic 38, and the request-body block at :382 was the worst nested site in the tree at nestif 17. Engine construction moves out of the closure (wafInlineEngine, wafCRSEngine — the Coraza directive string is lifted verbatim), and each request phase becomes its own helper: wafInlineRequestHeaders, wafCRSRequestHeaders (including the Host/Transfer-Encoding re-add for CRS 920280), wafFeedCRSBody and wafInspectRequestBody, which is the old :382 block. The three `handleWAFInterruption(w, it); return` sites inside the body block become one: the helper now returns the interruption and the orchestrator handles it. No statement runs between the two points on either side, so the verdict is honoured identically — in particular a CRS body interruption still returns without replacing r.Body. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(service): split SendMessage and lift EditMessage's access check SendMessage was 79 statements / cyclomatic 35 with an 11-deep nested attachment block at :101; EditMessage was one point over cyclop. SendMessage becomes sendMessagePrecheck (permission and DM-block gates, content sanitisation), sendMessageLinkAttachments (the :101 block: attachment ownership, claim and link) and sendMessageDMSideEffects. EditMessage gets editMessageCheckAccess and nothing else — one budget over earns one extraction. The sanitizeContent fixpoint and the attachment ownership check are unchanged, as is the order of every gate. The DM side effects run behind `isDM && !s.sendMessageDMSideEffects(...)`, so a non-DM never enters them; inside, only the GetDMParticipantIDs failure returns false, matching the one error the original early-returned on. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(admin): split handlePatchUser into per-field apply helpers 106 lines / cyclomatic 29, with the ban block at :154 nested 9 deep. Each optional field of the partial edit becomes its own helper — patchUserPrecheck, patchUserAuthorizeRole, patchUserApplyBan (the :154 block, including the session disconnect and the broadcast) and patchUserApplyRole. Each returns a bool meaning "keep going"; none of them writes a success response, so the single response site in the orchestrator is unchanged. Field application order, the permission-cache invalidation on a role change and the disconnect-and-broadcast on a ban are all preserved, as are the three fail-closed `mod == nil` guards, which now sit at the top of their own helper and still fire on exactly the same conditions. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(admin): split handleSetup into first-run setup stages 143 lines / cyclomatic 30, with the optional-wizard block at :219 sitting exactly on the nestif threshold. Split into the stages the endpoint already had: request gating (rate limit and origin check, which run before any auth exists on a fresh server), owner account creation, and the wizard application that was the :219 block. Every gate in front of the handler is a security control on an unauthenticated endpoint; none moved relative to the work it protects. setup_wizard.go is untouched. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor: split run() into named bootstrap and shutdown steps 131 statements / cyclomatic 57, with the executable-path fallback at :126 nested 9 deep. The five anonymous `defer func(){...}()` blocks become named functions — telemetryStop, runClosePlugins, runStopEventPersistence, runStopAuditWriter, maintenanceStop — and the bootstrap stages move out likewise. Every defer is still registered in run() itself, at the same point in the sequence, so the LIFO teardown order is unchanged; that order is documented in the surrounding comments and is load-bearing (the audit-writer stop must follow database.Close's registration, the event-persistence stop must precede it). runStopEventPersistence is now registered unconditionally with a nil persister meaning "disabled", where the old code registered its defer inside the enabled branch — a no-op occupying that slot cannot change the relative order of the others. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(ws): split handleReconnect into resume stages 77 statements / cyclomatic 41, plus the replay block at :199 and, in handleFreshConnect, the voice-state restore at :622. handleReconnect becomes reconnectPrecheck, reconnectSelectReplay (with reconnectVetColdTail for the cold-tier gap check), reconnectRegister and reconnectWriteReplay. handleFreshConnect's stale-voice cleanup moves to its own helper, where the `if h.livekit != nil` wrapper becomes a guard clause — that block was the tail of its scope, so returning early and falling off the end are the same. The parts that carry the invariants are moved verbatim: reconnectRegister still takes h.seqMu, still calls registerNow inside that same critical section (BUG-123 / OC-0206), still unlocks on every exit, and still emits the "full" tier counter and telemetry on each of its three re-check failures. handleReconnect's two-boolean contract is unchanged — the collapsed `return false, false` sites are all fall-through-to-full-ready, and the single `return true, false` is still the handshake-write-failure path whose teardown already ran (OC-0051). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * docs(server): fold in the adversarial review of the complexity refactors Eleven skeptic passes over the refactor commits on this branch found no blocker and no major — behaviour is preserved throughout. They did find comment and accuracy defects worth correcting: - db/mention_queries.go: the mentionTargetColumn rationale claimed the named type made the interpolated column "only ever one of the two constants". A Go named type is not closed, so that is a convention the type makes visible, not one it enforces. Reworded, gosec justification included. - ws/voice_controls.go: the dupl collapse generalised away three specifics — that a server deafen is the moderator's to lift (now on the serverDeafen field), the concrete voice_states.camera / voice_states.screenshare column names, and the half of the OC-0023 rationale about neither stream kind hiding from the other's count. All three restored. - ws/voice_join.go: `maxUsers := ch.VoiceMaxUsers` had been hoisted to the top of voiceJoinComplete, moving a read across the tail supersession guard. The read is inert, but it was the one statement in that commit whose position relative to a security guard changed; it now sits at its use, as before. - ws/*_test.go: three test comments cited voice_join.go line numbers that the split invalidated. They now cite the helper by name instead. - service/message_reactions.go: reactionAudience's doc claimed to enforce "every gate on reacting"; it enforces the channel-scoped ones, and the doc now says which gates stay with the caller. - api/emoji_handler.go: the readEmojiUpload call reused the outer `ok` from the auth check by assignment; it gets its own readOK. - admin/setup_handler.go: a moved comment kept a "the response above" deictic that no longer had a response above it. No behaviour change. Build, vet, full tests and -race on five packages green. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(ws): clear the remaining complexity budgets across the hub Eight files, thirteen findings. Each function is split at the stages it already had; no branch is reordered, merged or inverted. - handlers.go handleMessage (cyclop 28, 88 stmts): session re-check, frame decode and result application become handleMessageSessionRecheck, handleMessageDecode and handleMessageApply. The V2 constructor lookup -> DispatchV2 -> Result resolution order is untouched. - serve_ready.go buildReady (cyclop 26, 61 stmts): the per-section fetches split out, readyChannelPayloads among them. Every visibility predicate is preserved verbatim — this is the payload that decides what a client may see. - serve_pumps.go writePump (cyclop 31): writePumpWrite, writePumpDeliver, writePumpDrainChannel and writePumpDrainAndClose. Every channel receive stays in the same select statement, so scheduling is unchanged. - hub_sweep.go sweepStaleVoiceStates (cyclop 22, 56 stmts): the staleness predicate, the hub-lock ordering and the position of the race hook are all as they were — handleVoiceJoin's BUG-088 ordering depends on them. - hub_broadcast.go channelReadAudienceImpl and RefreshChannelVisibility (cyclop 22 each, 57 stmts): channelReadAudienceDM and refreshChannelVisibilityCanSend. The audience predicate is the OC-0090 group-DM leak surface, so it is extracted, never simplified. - livekit_webhook.go (nestif 13 and 14): webhookJoinedEnforceVoiceState, webhookLeftCleanupClient and webhookLeftFinishLeave. DB delete still precedes broadcast on every path. - livekit_download.go EnsureLiveKitBinary (52 stmts): one extraction, ensureLiveKitStageBinary, keeping every archive path check intact. - voice_moderation.go (nestif 8): voiceModDeafenRollback. The persisted server_muted flag remains the authority. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(api): clear the remaining complexity budgets across the HTTP layer - router.go NewRouter (cyclop 28, 84 stmts): split by wiring concern into routerTOTPKey, routerHealthDeps, routerMiddleware, routerUploadRoutes, routerPluginWiring, routerVoiceRoutes and routerMetricsRoutes. Middleware ORDER is a security property (auth before handler, WAF before body parse, rate limit before work) and is unchanged; the returned cleanup func still closes over and releases everything it did before. - auth_handler.go handleRegister (133 lines) and handleLogin (cyclop 21, 152 lines): registerPolicyGate, registerReadRequest, loginReadRequest and loginAuthenticate. The always-compare posture, every rate-limit key, every counter reset and the ban-check-versus-password-compare order are all preserved — including loginUserFailureThreshold staying unscaled by scaledAuthLimit, which is deliberate and commented. - upload_handler.go handleServeFile (cyclop 31, 128 lines): serveFileResolve and serveFileAuthorize. Every header this sets — Content-Disposition included, which is what stops a stored file being served as active content — is still set with the same value in the same circumstances. - profile_handler.go handleUploadAvatar (120 lines): avatarUploadReadImage, mirroring readEmojiUpload in shape but with the avatar caps and MIME set. The two deliberately do not share a helper. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor: clear the last complexity budgets in db and admin - db/account.go DeleteAccount (cyclop 28, 55 stmts): grouped by subsystem into deleteAccountAdminGuard, deleteAccountDMChannels and deleteAccountCloseDMChannels, each taking the same transaction. The transaction boundary, the delete ORDER (which foreign keys depend on) and the rollback path are unchanged. - admin/logstream.go handleLogStream (cyclop 24): logStreamAuthorize. Flush cadence, heartbeat and disconnect detection untouched. - admin/setup_wizard.go validateWizard (cyclop 23): grouped by section into wizardValidateIdentity, wizardValidateNetwork and wizardValidateMedia. Every message and bound is unchanged — this is the first input-validation boundary on a fresh server, before any auth exists. With this the tree is at zero: golangci-lint run reports 0 issues against the budgets set in #1384 (funlen 100/50, cyclop 20, nestif 8, dupl 150), with no //nolint and no exclusion added anywhere. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
629 lines
22 KiB
Go
629 lines
22 KiB
Go
package api
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/base64"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"log/slog"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
"time"
|
|
"unicode"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
"github.com/google/uuid"
|
|
"github.com/owncord/server/auth"
|
|
"github.com/owncord/server/db"
|
|
"github.com/owncord/server/service"
|
|
"github.com/owncord/server/ws"
|
|
)
|
|
|
|
// ─── Request / Response types ────────────────────────────────────────────────
|
|
|
|
// updateProfileRequest is the JSON body for PATCH /api/v1/users/me.
|
|
// identity_public_key, when present, publishes the client's long-term E2EE
|
|
// identity public key (F3 voice E2EE TOFU); omitted = leave unchanged.
|
|
type updateProfileRequest struct {
|
|
Username string `json:"username"`
|
|
Avatar *string `json:"avatar"`
|
|
IdentityPublicKey *string `json:"identity_public_key"`
|
|
// DisplayName and About are omitted = unchanged, "" = cleared. Both are
|
|
// sanitized and length-checked in UserService, which is also the path a
|
|
// non-REST caller would take.
|
|
DisplayName *string `json:"display_name"`
|
|
About *string `json:"about"`
|
|
}
|
|
|
|
// changePasswordRequest is the JSON body for PUT /api/v1/users/me/password.
|
|
type changePasswordRequest struct {
|
|
OldPassword string `json:"old_password"`
|
|
NewPassword string `json:"new_password"`
|
|
}
|
|
|
|
// sessionResponse is the JSON shape for a single session in list responses.
|
|
type sessionResponse struct {
|
|
ID int64 `json:"id"`
|
|
Device string `json:"device"`
|
|
IP string `json:"ip"`
|
|
CreatedAt string `json:"created_at"`
|
|
LastUsed string `json:"last_used"`
|
|
IsCurrent bool `json:"is_current"`
|
|
}
|
|
|
|
// sessionsListResponse is the JSON envelope for GET /api/v1/users/me/sessions.
|
|
type sessionsListResponse struct {
|
|
Sessions []sessionResponse `json:"sessions"`
|
|
}
|
|
|
|
// ─── Route mounting ──────────────────────────────────────────────────────────
|
|
|
|
// ProfileBroadcaster is the interface the profile handler uses to notify
|
|
// connected WebSocket clients about profile changes.
|
|
type ProfileBroadcaster interface {
|
|
BroadcastUserUpdate(u ws.UserUpdate)
|
|
}
|
|
|
|
// MountProfileRoutes registers user profile management endpoints.
|
|
// All routes require authentication. trustedProxies is used for rate limiting.
|
|
//
|
|
// store may be nil, in which case the avatar-upload route is not registered —
|
|
// a server with no storage backend has nowhere to put the bytes, and a route
|
|
// that 500s on every call is worse than one that 404s.
|
|
func MountProfileRoutes(r chi.Router, database *db.DB, svc *service.Services, store FileStore, limiter *auth.RateLimiter, trustedProxies []string, broadcaster ProfileBroadcaster) {
|
|
r.Route("/api/v1/users/me", func(r chi.Router) {
|
|
r.Use(AuthMiddleware(database))
|
|
|
|
r.With(RateLimitMiddleware(limiter, "profile:", profileUpdateRateLimitPerMinute, time.Minute, trustedProxies)).
|
|
Patch("/", handleUpdateProfile(svc, broadcaster))
|
|
|
|
r.With(RateLimitMiddleware(limiter, "pw:", profilePasswordRateLimitPerMinute, time.Minute, trustedProxies)).
|
|
Put("/password", handleChangePassword(svc, limiter))
|
|
|
|
if store != nil {
|
|
r.With(MaxBodySize(avatarMaxBodySize)).
|
|
Post("/avatar", handleUploadAvatar(database, svc, store, limiter, broadcaster))
|
|
}
|
|
|
|
r.Get("/sessions", handleListSessions(svc))
|
|
r.Delete("/sessions/{id}", handleRevokeSession(svc))
|
|
})
|
|
}
|
|
|
|
// ─── Helpers ─────────────────────────────────────────────────────────────────
|
|
|
|
// validateIdentityKey checks that key is non-empty, at most 128 characters and
|
|
// valid standard-alphabet base64 (padded or unpadded) — the same posture as
|
|
// the WS voice_e2ee_announce public_key validation.
|
|
func validateIdentityKey(key string) error {
|
|
if key == "" {
|
|
return fmt.Errorf("identity_public_key must not be empty")
|
|
}
|
|
if len(key) > 128 {
|
|
return fmt.Errorf("identity_public_key too large (max 128 characters)")
|
|
}
|
|
if _, err := base64.StdEncoding.DecodeString(key); err == nil {
|
|
return nil
|
|
}
|
|
if _, err := base64.RawStdEncoding.DecodeString(key); err != nil {
|
|
return fmt.Errorf("identity_public_key is not valid base64")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// validateAvatarURL checks that avatar is either empty or a valid https:// URL
|
|
// no longer than maxAvatarURLLen characters.
|
|
func validateAvatarURL(avatar string) error {
|
|
if avatar == "" {
|
|
return nil
|
|
}
|
|
if len(avatar) > maxAvatarURLLen {
|
|
return fmt.Errorf("avatar URL too long (max %d characters)", maxAvatarURLLen)
|
|
}
|
|
parsed, err := url.Parse(avatar)
|
|
if err != nil || parsed.Scheme != "https" || parsed.Host == "" {
|
|
return fmt.Errorf("avatar URL must use https://")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// validateDisplayName rejects a nickname that would render as something other
|
|
// than what it says. Length and emptiness are the service's job (empty clears
|
|
// the field); this is the character-class check auth.ValidateUsername applies
|
|
// for the same reason — a display name stands in for a username on every
|
|
// message row, so a bidi override or a control character in one is a spoof.
|
|
func validateDisplayName(name string) error {
|
|
for _, r := range name {
|
|
if unicode.IsControl(r) || unicode.In(r, unicode.Cf) {
|
|
return fmt.Errorf("display_name must not contain control or invisible characters")
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// allowedAvatarMIME is the set of image types an avatar may be, matched against
|
|
// the type sniffed from the file's own bytes. GIF is absent (an animated
|
|
// avatar in every message row is a distraction the renderer cannot opt out of)
|
|
// and so is SVG, for the same reason emoji refuse it: it is markup with script
|
|
// and external-fetch capability, and an avatar is rendered inline by
|
|
// definition.
|
|
var allowedAvatarMIME = map[string]bool{
|
|
"image/png": true,
|
|
"image/jpeg": true,
|
|
"image/webp": true,
|
|
}
|
|
|
|
// ─── Handlers ────────────────────────────────────────────────────────────────
|
|
|
|
// handleUpdateProfile processes PATCH /api/v1/users/me.
|
|
func handleUpdateProfile(svc *service.Services, broadcaster ProfileBroadcaster) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
user, ok := r.Context().Value(UserKey).(*db.User)
|
|
if !ok || user == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED", Message: "not authenticated",
|
|
})
|
|
return
|
|
}
|
|
|
|
var req updateProfileRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: "malformed request body",
|
|
})
|
|
return
|
|
}
|
|
|
|
// Use the fixpoint sanitizer (service.SanitizeText), not the bare
|
|
// sanitizer.Sanitize below — Sanitize's output is always
|
|
// HTML-escaped, so a plain apostrophe would be persisted as '
|
|
// and login (which never re-escapes) would look the account up
|
|
// under a name that no longer matches. See service.SanitizeText's
|
|
// doc comment and the register path (auth_handler.go), which
|
|
// already canonicalizes the same way.
|
|
req.Username = strings.TrimSpace(service.SanitizeText(req.Username))
|
|
if req.Username == "" {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: "username is required",
|
|
})
|
|
return
|
|
}
|
|
if err := auth.ValidateUsername(req.Username); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
|
|
// Sanitize and validate avatar if provided.
|
|
if req.Avatar != nil {
|
|
trimmed := strings.TrimSpace(sanitizer.Sanitize(*req.Avatar))
|
|
if err := validateAvatarURL(trimmed); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
req.Avatar = &trimmed
|
|
}
|
|
|
|
// display_name gets the same username-shaped scrutiny beyond length:
|
|
// it is rendered wherever a username is, so control characters and
|
|
// bidi overrides are exactly as unwelcome here. Length, sanitization
|
|
// and the empty-clears-it rule live in UserService.
|
|
if req.DisplayName != nil {
|
|
if err := validateDisplayName(*req.DisplayName); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
}
|
|
|
|
// Validate the identity key before any write so the request is
|
|
// all-or-nothing.
|
|
if req.IdentityPublicKey != nil {
|
|
trimmed := strings.TrimSpace(*req.IdentityPublicKey)
|
|
if err := validateIdentityKey(trimmed); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
req.IdentityPublicKey = &trimmed
|
|
}
|
|
|
|
updated, err := svc.Users.UpdateProfile(r.Context(), user.ID, service.ProfilePatch{
|
|
Username: req.Username,
|
|
Avatar: req.Avatar,
|
|
DisplayName: req.DisplayName,
|
|
About: req.About,
|
|
})
|
|
if err != nil {
|
|
writeServiceError(r.Context(), w, err)
|
|
return
|
|
}
|
|
|
|
if req.IdentityPublicKey != nil {
|
|
// Captured into a separate variable rather than reassigned into
|
|
// updated: on failure below, updated still holds the profile
|
|
// snapshot that DID commit, so it can still be broadcast instead
|
|
// of discarded.
|
|
withKey, keyErr := svc.Users.UpdateIdentityKey(r.Context(), user.ID, *req.IdentityPublicKey)
|
|
if keyErr != nil {
|
|
// The username/avatar/display_name/about write above already
|
|
// committed — only the identity key failed. Broadcasting the
|
|
// committed half keeps every other connected client in sync
|
|
// even though this request reports failure; leaving it
|
|
// unbroadcast would strand them on the old profile until
|
|
// their next ready.
|
|
broadcastUserUpdate(broadcaster, updated)
|
|
writeServiceError(r.Context(), w, keyErr)
|
|
return
|
|
}
|
|
updated = withKey
|
|
}
|
|
|
|
broadcastUserUpdate(broadcaster, updated)
|
|
|
|
writeJSON(w, http.StatusOK, toUserResponse(updated))
|
|
}
|
|
}
|
|
|
|
// broadcastUserUpdate pushes a profile snapshot to every connected client.
|
|
// Every profile mutation goes through it so a new one cannot ship half the
|
|
// fields — user_update replaces the client's copy wholesale.
|
|
func broadcastUserUpdate(broadcaster ProfileBroadcaster, u *db.User) {
|
|
if broadcaster == nil || u == nil {
|
|
return
|
|
}
|
|
broadcaster.BroadcastUserUpdate(ws.UserUpdate{
|
|
UserID: u.ID,
|
|
Username: u.Username,
|
|
Avatar: u.Avatar,
|
|
DisplayName: u.DisplayName,
|
|
About: u.About,
|
|
IdentityPublicKey: u.IdentityPublicKey,
|
|
})
|
|
}
|
|
|
|
// handleChangePassword processes PUT /api/v1/users/me/password.
|
|
func handleChangePassword(svc *service.Services, limiter *auth.RateLimiter) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
user, ok := r.Context().Value(UserKey).(*db.User)
|
|
if !ok || user == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED", Message: "not authenticated",
|
|
})
|
|
return
|
|
}
|
|
|
|
// BUG-111: Per-user lockout to prevent password brute-force via stolen session.
|
|
lockKey := auth.Key("pw_confirm_lock", user.ID)
|
|
if limiter.IsLockedOut(lockKey) {
|
|
writeJSON(w, http.StatusTooManyRequests, errorResponse{
|
|
Error: "RATE_LIMITED", Message: "too many failed attempts, try again later",
|
|
})
|
|
return
|
|
}
|
|
|
|
var req changePasswordRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: "malformed request body",
|
|
})
|
|
return
|
|
}
|
|
|
|
if req.OldPassword == "" || req.NewPassword == "" {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: "old_password and new_password are required",
|
|
})
|
|
return
|
|
}
|
|
|
|
// Verify old password using constant-time bcrypt comparison.
|
|
failKey := auth.Key("pw_confirm_fail", user.ID)
|
|
if !auth.CheckPassword(user.PasswordHash, req.OldPassword) {
|
|
if !limiter.Allow(failKey, pwConfirmFailureThreshold, pwConfirmFailureWindow) {
|
|
limiter.Lockout(r.Context(), lockKey, pwConfirmLockoutDuration)
|
|
}
|
|
writeJSON(w, http.StatusForbidden, errorResponse{
|
|
Error: "FORBIDDEN", Message: "incorrect password",
|
|
})
|
|
return
|
|
}
|
|
limiter.Reset(r.Context(), failKey)
|
|
|
|
// Reject same old/new password.
|
|
if req.OldPassword == req.NewPassword {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: "new password must be different from old password",
|
|
})
|
|
return
|
|
}
|
|
|
|
// Validate new password strength.
|
|
if err := auth.ValidatePasswordStrength(req.NewPassword); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
|
|
// Hash new password.
|
|
hash, err := auth.HashPassword(req.NewPassword)
|
|
if err != nil {
|
|
writeJSON(w, http.StatusInternalServerError, errorResponse{
|
|
Error: "INTERNAL_ERROR", Message: "failed to process password change",
|
|
})
|
|
return
|
|
}
|
|
|
|
// Delegate to service for password update + session revocation.
|
|
sess, _ := r.Context().Value(SessionKey).(*db.Session)
|
|
keepSessionID := int64(0)
|
|
if sess != nil {
|
|
keepSessionID = sess.ID
|
|
}
|
|
|
|
res, err := svc.Users.ChangePassword(r.Context(), user.ID, hash, keepSessionID)
|
|
if err != nil {
|
|
// Only reachable when the password itself failed to commit.
|
|
writeServiceError(r.Context(), w, err)
|
|
return
|
|
}
|
|
if res.RevokeFailed {
|
|
// Partial success: the password IS changed; only revoking the
|
|
// other sessions failed. A 5xx here would tell the user to retry
|
|
// with a password that no longer works.
|
|
writeJSON(w, http.StatusOK, map[string]any{
|
|
"warning": "password changed, but other sessions could not be revoked; revoke them from the sessions list",
|
|
"sessions_revoked": res.SessionsRevoked,
|
|
})
|
|
return
|
|
}
|
|
|
|
w.WriteHeader(http.StatusNoContent)
|
|
}
|
|
}
|
|
|
|
// handleListSessions processes GET /api/v1/users/me/sessions.
|
|
func handleListSessions(svc *service.Services) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
user, ok := r.Context().Value(UserKey).(*db.User)
|
|
if !ok || user == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED", Message: "not authenticated",
|
|
})
|
|
return
|
|
}
|
|
|
|
// An API-token principal has a nil session (middleware.go); the list
|
|
// still works — no row is marked current. Only IsCurrent needs it.
|
|
sess, _ := r.Context().Value(SessionKey).(*db.Session)
|
|
|
|
sessions, err := svc.Users.ListSessions(r.Context(), user.ID)
|
|
if err != nil {
|
|
writeServiceError(r.Context(), w, err)
|
|
return
|
|
}
|
|
|
|
resp := sessionsListResponse{
|
|
Sessions: make([]sessionResponse, 0, len(sessions)),
|
|
}
|
|
for _, s := range sessions {
|
|
resp.Sessions = append(resp.Sessions, sessionResponse{
|
|
ID: s.ID,
|
|
Device: s.Device,
|
|
IP: s.IP,
|
|
CreatedAt: s.CreatedAt,
|
|
LastUsed: s.LastUsed,
|
|
IsCurrent: sess != nil && s.ID == sess.ID,
|
|
})
|
|
}
|
|
|
|
writeJSON(w, http.StatusOK, resp)
|
|
}
|
|
}
|
|
|
|
// handleRevokeSession processes DELETE /api/v1/users/me/sessions/{id}.
|
|
func handleRevokeSession(svc *service.Services) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
user, ok := r.Context().Value(UserKey).(*db.User)
|
|
if !ok || user == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED", Message: "not authenticated",
|
|
})
|
|
return
|
|
}
|
|
|
|
sessionID, ok := parseIDParam(w, r, "id")
|
|
if !ok {
|
|
return
|
|
}
|
|
|
|
if err := svc.Users.RevokeSession(r.Context(), user.ID, sessionID); err != nil {
|
|
writeServiceError(r.Context(), w, err)
|
|
return
|
|
}
|
|
|
|
w.WriteHeader(http.StatusNoContent)
|
|
}
|
|
}
|
|
|
|
// handleUploadAvatar processes POST /api/v1/users/me/avatar (multipart: `file`).
|
|
//
|
|
// The bytes land in the ordinary attachments table with no channel, and the
|
|
// user's avatar column is pointed at /api/v1/files/{id}. That is what makes
|
|
// the picture readable: an unlinked attachment is private to its uploader, and
|
|
// handleServeFile additionally admits one that some user's avatar currently
|
|
// points at — so an avatar is public exactly while it is in use and stops
|
|
// being readable the moment it is replaced.
|
|
//
|
|
// PATCH /users/me still takes an https:// URL; this route is the other way to
|
|
// set the same field, and both end at the same column.
|
|
func handleUploadAvatar(
|
|
database *db.DB,
|
|
svc *service.Services,
|
|
store FileStore,
|
|
limiter *auth.RateLimiter,
|
|
broadcaster ProfileBroadcaster,
|
|
) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
user, ok := r.Context().Value(UserKey).(*db.User)
|
|
if !ok || user == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED", Message: "not authenticated",
|
|
})
|
|
return
|
|
}
|
|
|
|
if limiter != nil && !limiter.Allow(auth.Key("avatar_upload", user.ID), avatarUploadRateLimitPerMinute, time.Minute) {
|
|
writeJSON(w, http.StatusTooManyRequests, errorResponse{
|
|
Error: "RATE_LIMITED", Message: "avatar upload rate limit exceeded, try again later",
|
|
})
|
|
return
|
|
}
|
|
|
|
// Bound the body before the multipart parser touches it: the route
|
|
// carries MaxBodySize too, but the parser is what turns an unbounded
|
|
// body into heap, so the handler states its own limit.
|
|
r.Body = http.MaxBytesReader(w, r.Body, avatarMaxBodySize)
|
|
if err := r.ParseMultipartForm(avatarMultipartMemoryLimit); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "BAD_REQUEST", Message: "invalid multipart form",
|
|
})
|
|
return
|
|
}
|
|
|
|
file, header, err := r.FormFile("file")
|
|
if err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "BAD_REQUEST", Message: "missing file field",
|
|
})
|
|
return
|
|
}
|
|
defer file.Close() //nolint:errcheck
|
|
|
|
raw, mimeType, width, height, ok := avatarUploadReadImage(w, file)
|
|
if !ok {
|
|
return
|
|
}
|
|
|
|
fileID := uuid.New().String()
|
|
written, saveErr := store.Save(fileID, bytes.NewReader(raw))
|
|
if saveErr != nil {
|
|
writeStorageSaveError(w, saveErr, "avatar upload")
|
|
return
|
|
}
|
|
|
|
filename := sanitizeUploadFilename(header.Filename)
|
|
if err := database.CreateAttachment(r.Context(), fileID, user.ID, filename, fileID, mimeType, written, &width, &height); err != nil {
|
|
if delErr := store.Delete(fileID); delErr != nil {
|
|
slog.Error("failed to clean up orphaned avatar file", "stored_as", fileID, "error", delErr)
|
|
}
|
|
slog.Error("failed to create avatar attachment record", "error", err)
|
|
writeJSON(w, http.StatusInternalServerError, errorResponse{
|
|
Error: "INTERNAL_ERROR", Message: "failed to save avatar",
|
|
})
|
|
return
|
|
}
|
|
|
|
avatarURL := service.AvatarFileURL(fileID)
|
|
// Username is deliberately omitted (left at its zero value): user
|
|
// here is a snapshot AuthMiddleware read at the start of the
|
|
// request, before the multipart parse / image decode / disk write
|
|
// above — all of which take long enough for a concurrent
|
|
// PATCH /users/me rename to land first. Sending that stale value
|
|
// would revert the rename; UpdateProfile treats an empty Username
|
|
// as "leave it alone", the same contract DisplayName/About already
|
|
// have via nil.
|
|
updated, err := svc.Users.UpdateProfile(r.Context(), user.ID, service.ProfilePatch{
|
|
Avatar: &avatarURL,
|
|
})
|
|
if err != nil {
|
|
// The column never moved, so the file and its row are orphans.
|
|
if delErr := store.Delete(fileID); delErr != nil {
|
|
slog.Error("failed to clean up orphaned avatar file", "stored_as", fileID, "error", delErr)
|
|
}
|
|
writeServiceError(r.Context(), w, err)
|
|
return
|
|
}
|
|
|
|
// The previous avatar's bytes are deliberately left on disk: a message
|
|
// that was rendered with it may still be cached client-side, and a
|
|
// blind delete here would race any request already in flight for it.
|
|
// Reclaiming them is an operator-side sweep, not a request-path action.
|
|
broadcastUserUpdate(broadcaster, updated)
|
|
|
|
slog.Info("avatar uploaded", "user_id", user.ID, "id", fileID, "size", written, "mime", mimeType)
|
|
writeJSON(w, http.StatusCreated, uploadResponse{
|
|
ID: fileID,
|
|
Filename: filename,
|
|
Size: written,
|
|
Mime: mimeType,
|
|
URL: avatarURL,
|
|
Width: &width,
|
|
Height: &height,
|
|
})
|
|
}
|
|
}
|
|
|
|
// avatarUploadReadImage is the bytes stage of handleUploadAvatar: read the
|
|
// uploaded file under its cap, sniff its type and measure it. It writes its own
|
|
// 400 and reports ok=false when the upload is not an acceptable avatar, so the
|
|
// caller only has to return. Deliberately not shared with the emoji route: the
|
|
// two carry different caps and a different allowed MIME set.
|
|
func avatarUploadReadImage(w http.ResponseWriter, file io.Reader) (raw []byte, mimeType string, width, height int, ok bool) {
|
|
// Read one byte past the cap so "exactly at the limit" passes and "one
|
|
// byte over" is caught, without buffering an unbounded body.
|
|
raw, err := io.ReadAll(io.LimitReader(file, maxAvatarFileBytes+1))
|
|
if err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "BAD_REQUEST", Message: "failed to read uploaded file",
|
|
})
|
|
return nil, "", 0, 0, false
|
|
}
|
|
if int64(len(raw)) > maxAvatarFileBytes {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "BAD_REQUEST",
|
|
Message: fmt.Sprintf("avatar must be at most %d KB", maxAvatarFileBytes>>10),
|
|
})
|
|
return nil, "", 0, 0, false
|
|
}
|
|
|
|
// Never trust the client's Content-Type — sniff the bytes.
|
|
mimeType = http.DetectContentType(raw)
|
|
if !allowedAvatarMIME[mimeType] {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "BAD_REQUEST", Message: "avatar must be a PNG, JPEG or WebP image",
|
|
})
|
|
return nil, "", 0, 0, false
|
|
}
|
|
|
|
width, height, err = imageDimensions(raw, mimeType)
|
|
if err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "BAD_REQUEST", Message: "could not read image dimensions",
|
|
})
|
|
return nil, "", 0, 0, false
|
|
}
|
|
// Measured from the sniffed image, not from anything the client said.
|
|
// The client crops to a square before uploading; the server does not
|
|
// re-encode (that would mean decoding and re-compressing every upload
|
|
// to change nothing a CSS circle mask does not already do), it just
|
|
// refuses a picture too big to be an avatar.
|
|
if width <= 0 || height <= 0 || width > maxAvatarDimension || height > maxAvatarDimension {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "BAD_REQUEST",
|
|
Message: fmt.Sprintf("avatar must be at most %dx%d pixels (got %dx%d)", maxAvatarDimension, maxAvatarDimension, width, height),
|
|
})
|
|
return nil, "", 0, 0, false
|
|
}
|
|
|
|
return raw, mimeType, width, height, true
|
|
}
|