mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
* fix(identity): 2 defect(s) (OC-0192, OC-0197)
OC-0192: bound raw display_name/about/avatar bytes before the quadratic
fixpoint sanitizer runs, in both the REST handler and UserService.UpdateProfile.
OC-0197: sanitize display_name before validateDisplayName so an
HTML-entity-encoded bidi override (e.g. "‮") can no longer pass
validation as ASCII and be decoded into the real character on the way to
storage.
* fix(ws): 1 defect(s) (OC-0196)
A transient DB error during WebSocket auth (session or user lookup) was
collapsed into the terminal auth_error frame, which the client treats as
non-recoverable: it stops reconnecting and clears stored credentials. A
sub-second SQLite hiccup therefore force-logged-out every reconnecting
client with a perfectly valid session. Send a non-terminal INTERNAL error
frame instead so normal backoff/reconnect retries.
* fix(api): 1 defect(s) (OC-0198)
* fix(ws): 1 defect(s) (OC-0200)
normalizeHostForCertCompare now unwraps a bracketed IPv6 literal after the
trailing-":443" strip and before lowercasing, matching tofu::cert_store_key's
normalization order. Without the unwrap, every cert-tofu host equality guard
took the "unrelated host" branch for bracketed-IPv6 servers.
* fix(api): 1 defect(s) (OC-0202)
* fix(admin): 1 defect(s) (OC-0203)
Channel permission override handlers applied requireGrantableOverride only
to the bits being written, so an all-zero PUT or a DELETE could clear a
deny bit the actor's own role does not hold — EffectivePerms =
(rolePerm &^ deny) | allow makes removing a deny an escalation. Both the
role-layer and per-user handlers now check the guard against the bits
already on the row.
* fix(client): 1 defect(s) (OC-0205)
* fix(client): 3 defect(s) (OC-0207, OC-0227, OC-0235)
* fix(client): 1 defect(s) (OC-0208)
* fix(voice): 3 defect(s) (OC-0209, OC-0212, OC-0213)
OC-0209: reject a replayed retired-key announce before verifyPeerAnnounce
runs, so the replay cannot overwrite the peer's displayed verification
status/session fingerprint with the retired key's before being rejected.
OC-0212: buffer an announce blocked as a TOFU pin mismatch and replay it
after a successful rePinPeerIdentity, so re-pinning actually restores the
peer for the live call instead of clearing the badge and leaving them
un-keyed (a mid-call peer never re-announces on its own).
OC-0213: skip retiring a departing peer's key when the local voice roster
still lists them as present — a rejoin announce published straight into
the send queue can overtake the buffered, stale voice_leave, and retiring
a still-live key would reject every later genuine re-announce as a replay.
* fix(ws): 1 defect(s) (OC-0211)
* fix(identity): 1 defect(s) (OC-0214)
The delete-account admin guard counted remaining admins with a raw
`banned = 0` filter, so an admin whose temporary ban had already lapsed
was treated as unusable. Use the shared notBannedClause, appended outside
the Sprintf format string because its strftime verbs (%Y, %H) would
otherwise be parsed as fmt directives.
* fix(client): 1 defect(s) (OC-0215)
* fix(voice): 1 defect(s) (OC-0216)
* fix(client): 1 defect(s) (OC-0217)
* fix(voice): 1 defect(s) (OC-0219)
rollbackVoiceJoin cleared the client's in-memory voiceChID but left its
VoiceTopic subscription in place, so a socket whose join failed after
voiceJoinComplete's Subscribe kept receiving that room's E2EE relays for
the rest of the connection. Use clearVoiceAndUnsubscribe instead, matching
every other path that takes a client out of voice while its WS stays up.
* fix(client): 2 defect(s) (OC-0220, OC-0224)
dmDisplayName: a group DM whose other members have all left keeps a live
is_group row, but the server leaves `recipient` zero-valued, so the empty
username fell through as a blank label. Fall back to a non-empty placeholder.
updateDmLastMessage: a queued chat_message redelivered for an id already
reflected in the `ready` snapshot double-counted the unread badge. Only
increment when the message id advances past lastMessageId.
* fix(client): 1 defect(s) (OC-0221)
Cap queued attachments at the server's 10-attachment limit in the message
composer. Past that the server rejects the whole chat_send frame as a
generic parse error, orphaning already-uploaded attachments; refusing
before the upload starts keeps composer state and the send in sync.
* fix(ws): 1 defect(s) (OC-0222)
handleReconnect built the resume auth_ok before applyConnectStatus settled
c.user.Status, so a resumed client was told its disconnect-time status
(routinely "offline") instead of the status it was coming online as.
Move applyConnectStatus ahead of reconnectWriteReplay, matching
handleFreshConnect's ordering.
* fix(mentions): 1 defect(s) (OC-0223)
* fix(admin): 1 defect(s) (OC-0225)
* fix(client): 1 defect(s) (OC-0226)
* fix(client): 1 defect(s) (OC-0228)
* fix(client): 1 defect(s) (OC-0230)
Route the Logs tab entry counter through renderLogEntries so every render path (filter change, Clear, Refresh, live entry) keeps the count in sync with the list.
* fix(voice): 1 defect(s) (OC-0231)
* fix(client): 1 defect(s) (OC-0232)
Reduce Motion toggle wrote the reduced-motion class directly, fighting the
OS-sync media-query listener that owns it when Sync with OS is on. Route the
side effect through syncOsMotionListener so whichever source owns the class
re-derives it.
* fix(client): 1 defect(s) (OC-0233)
notifyIncomingMessage titled the desktop notification with the raw
payload username, so the popup named the sender differently from the
message row it points at. Resolve the author the same way the message
list does (resolveAuthor over the live membersStore, then
resolveDisplayName).
* fix(client): 1 defect(s) (OC-0234)
* fix(client): 1 defect(s) (OC-0236)
* fix(ws): 1 defect(s) (OC-0237)
* fix(client): 4 defect(s) (OC-0193, OC-0201, OC-0204, OC-0218)
* fix(identity): 1 defect(s) (OC-0195)
Bound free-text profile fields by raw byte length before cleanText's
quadratic sanitizeToFixpoint pass runs, generalizing OC-0192's guard into
cleanTextBounded and applying it to HandlePresenceUpdate's custom_status,
SetCustomStatus, and group DM names.
* fix(dm): 1 defect(s) (OC-0199)
handleCreateDM now broadcasts dm_channel_open to the recipient when a 1:1 DM is newly created, matching handleCreateGroupDM. GetOrCreateDMChannel pre-seeds dm_open_state for both users, so the recipient's later OpenDM reported opened=false and nothing ever told them the DM existed.
* fix(voice): 1 defect(s) (OC-0206)
vad-worklet.js gate timing constants were copied from the setTimeout
fallback's ~16ms poll cadence, but AudioWorkletProcessor.process() runs
once per 128-sample render quantum (~2.667ms at the 48kHz AudioContext).
The mic gate therefore closed ~6x faster than intended (~32ms of silence
instead of ~200ms), with the startup grace and RMS post interval off by
the same factor. Scale the frame counts to render quanta.
* fix(client): 1 defect(s) (OC-0229)
* test(client): assert the real TOFU re-pin outcome and make the pin mock faithful
The e2e journey test asserted that "Trust New Key" makes the peer's verify
badge disappear. That is the behaviour OC-0212 identifies as the defect: a
mid-call peer never re-announces, so clearing the badge left the peer
un-keyed for the rest of the call with nothing on screen. Re-pinning now
replays the announce that was blocked as a mismatch and re-verifies it
against the pin just stored, so assert the peer actually lands verified.
The mock's store_identity_pin was a no-op recorder while get_identity_pin
served a static seed map, so the replayed announce re-read the stale pin and
re-failed — a mismatch the real keyring never produces. Back the pins with a
mutable map so a write is visible to the next read. The unreadable-store
(DC-08) and reject-keeps-blocked paths are unchanged and still pass.
* fix(dm): 1 defect(s) (OC-0194)
Add regression tests pinning the raw-byte bound on group DM names, for
both CreateGroupDM and RenameGroupDM.
The Server/service/dm.go source fix for OC-0194 already landed in
bdbd5ac (fix(identity): 1 defect(s) (OC-0195)), which generalized the
guard into cleanTextBounded and applied it to the group DM name paths
alongside the profile fields. This commit therefore carries the OC-0194
tests only; dm.go is unchanged.
Revert-proof: with dm.go restored to bdbd5ac^ (cleanText before the
rune-count check) both new tests fail — CreateGroupDM returns "recipient
not found" after 222ms and RenameGroupDM accepts the name after 251ms,
against a 150ms budget. With the fix in place both pass in 0.03s.
* fix(ws): 1 defect(s) (OC-0210)
* chore(findings): record the 2026-08-20 hunt's 46 findings as fixed
Appends OC-0192..OC-0237 from the 2026-08-20 converging hunt and marks each
fixed with its commit and the test that pins it. Pre-existing records are
byte-identical; nextId moves 192 -> 238 so the next hunt cannot collide with
these ids.
Every fix was independently revert-proofed: the commit's own source diff is
reverse-applied, its test must go red, and must return green once restored.
43 of 46 carry revertProof "pass" from that mechanical run. Three could not be
checked at file level and were proved by hand at hunk level instead, recorded
as "pass (hand-proved)": OC-0200, whose ws.ts edit no longer reverse-applies
because the merge kept main's equivalent implementation; OC-0215, whose Rust
tests live in-file under #[cfg(test)]; and OC-0194, which stacks on a helper
introduced by an earlier commit. No fix was found to rest on a vacuous test.
OC-0200 additionally carries a note: main fixed that same normalizer
independently while this branch was in flight, so the branch is no longer the
only thing closing it.
* docs: record the dm_channel_open emission on 1:1 DM creation
POST /api/v1/dms now emits dm_channel_open to the recipient when it creates a
channel (it previously emitted nothing on that path), so api.md states it the
way the sibling DM endpoints already state theirs.
The channels/members/DMs UX spec claimed the server broadcast the event "to
both parties" on this flow. That was never true — nothing was broadcast before,
and now only the recipient is sent it; the creator learns the channel from the
response body. This doc lists dispatcher.ts, dm.store.ts, ChannelSidebar.ts,
service/channel.go and dm.go among its sources of truth, all touched here, so
it is corrected in the same change per its maintenance rule.
---------
Co-authored-by: Claude <noreply@anthropic.com>
694 lines
26 KiB
Go
694 lines
26 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
|
|
// length-checked in UserService, which is also the path a non-REST
|
|
// caller would take; DisplayName is additionally sanitized in this
|
|
// handler (before validateDisplayName runs — see the OC-0197 comment at
|
|
// the call site) and UserService's own sanitize of it is then a no-op.
|
|
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.
|
|
// parseUpdateProfileRequest decodes the PATCH /users/me body and applies the
|
|
// bound-then-sanitize-then-validate pass to every field, in the same order the
|
|
// register path canonicalizes them. On any failure it writes the error response
|
|
// and returns ok=false, and the caller must return without writing anything
|
|
// further. Split out of handleUpdateProfile only to keep that handler under the
|
|
// funlen limit; the field logic is unchanged.
|
|
func parseUpdateProfileRequest(w http.ResponseWriter, r *http.Request) (updateProfileRequest, bool) {
|
|
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 req, false
|
|
}
|
|
|
|
// OC-0151: bound the raw field before it ever reaches the fixpoint
|
|
// sanitizer below, for the same reason as the register path
|
|
// (auth_handler.go's registerReadRequest) — sanitizeToFixpoint's
|
|
// cost is quadratic in input length, and nothing bounds this field
|
|
// before it runs. This is a cheap byte-length pre-check — *4 still
|
|
// admits any legitimate 32-rune UTF-8 username.
|
|
if len(req.Username) > maxLoginUsernameLen*4 {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: "username is too long",
|
|
})
|
|
return req, false
|
|
}
|
|
|
|
// Use the fixpoint sanitizer (service.SanitizeText), not a bare
|
|
// bluemonday.StrictPolicy().Sanitize call — 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 req, false
|
|
}
|
|
if err := auth.ValidateUsername(req.Username); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: err.Error(),
|
|
})
|
|
return req, false
|
|
}
|
|
|
|
// OC-0192: bound the raw field before it reaches the fixpoint
|
|
// sanitizer below, same reasoning as the username bound above —
|
|
// sanitizeToFixpoint's cost is quadratic in input length. Unlike
|
|
// username, an oversized avatar was previously only caught *after*
|
|
// sanitizing, by validateAvatarURL's maxAvatarURLLen check.
|
|
if req.Avatar != nil && len(*req.Avatar) > maxAvatarURLLen*4 {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: "avatar URL is too long",
|
|
})
|
|
return req, false
|
|
}
|
|
|
|
// Sanitize and validate avatar if provided. Use the fixpoint
|
|
// sanitizer (service.SanitizeText), not a bare
|
|
// bluemonday.StrictPolicy().Sanitize call — Sanitize's output is always HTML-escaped, so a URL with more
|
|
// than one query parameter would have its "&" separators rewritten
|
|
// to "&" and be persisted (and served) broken. Same reasoning as
|
|
// the username path above.
|
|
if req.Avatar != nil {
|
|
trimmed := strings.TrimSpace(service.SanitizeText(*req.Avatar))
|
|
if err := validateAvatarURL(trimmed); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: err.Error(),
|
|
})
|
|
return req, false
|
|
}
|
|
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 and the
|
|
// empty-clears-it rule still live in UserService, but sanitizing has
|
|
// to happen *before* validateDisplayName, not after: OC-0197 found
|
|
// that validating the raw JSON string let an HTML-entity-encoded
|
|
// control or bidi character (e.g. "‮") pass this check as
|
|
// harmless ASCII, only to be turned into the real character
|
|
// afterwards by UserService.UpdateProfile's cleanText call — the
|
|
// same sanitize-then-validate order the username path above already
|
|
// uses. OC-0192's raw-byte bound applies here too, now that
|
|
// sanitizing happens in this handler (UserService.UpdateProfile
|
|
// still bounds DisplayName/About the same way before its own
|
|
// cleanText calls, for any non-REST caller; cleanText's fixpoint
|
|
// output is stable, so that re-sanitize is a no-op here).
|
|
if req.DisplayName != nil {
|
|
if len(*req.DisplayName) > service.MaxDisplayNameLen*4 {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: "display_name is too long",
|
|
})
|
|
return req, false
|
|
}
|
|
trimmed := strings.TrimSpace(service.SanitizeText(*req.DisplayName))
|
|
if err := validateDisplayName(trimmed); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT", Message: err.Error(),
|
|
})
|
|
return req, false
|
|
}
|
|
req.DisplayName = &trimmed
|
|
}
|
|
|
|
// 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, false
|
|
}
|
|
req.IdentityPublicKey = &trimmed
|
|
}
|
|
return req, true
|
|
}
|
|
|
|
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
|
|
}
|
|
|
|
req, ok := parseUpdateProfileRequest(w, r)
|
|
if !ok {
|
|
return
|
|
}
|
|
|
|
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
|
|
}
|