mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
Fixes all 109 golangci-lint findings (106 contextcheck, 1 gocritic,
2 gosec) that accumulated after D2 wired dbgen (whose queries take ctx)
under ctx-less db.DB wrappers while CI lint was quota-dead. No nolint
comments added; every finding fixed by genuinely threading context.
- db: all 138 hand-written db.DB methods take ctx first; the dbCtx()
Background shim is deleted; raw Query/QueryRow/Exec/Begin use their
Context variants; the four redundant ctx-less passthroughs removed.
db.Auditor/WriteAudit gain ctx.
- Seams: permissions.Checker (DB iface, HasChannelPerm,
RequireChannelAccess) and the service.Store interface mirror the new
signatures (ws.EventStore and plugin.PluginStore already did).
- Callers: api/admin handlers use r.Context(); ws per-message paths use
the connection ctx via DispatchV2; hub loops and startup wiring use
context.Background(); service methods thread ctx where they have one
and Background where no ctx exists. Public service surface reached by
ctx-holding chains (PermissionService.HasChannelPerm/GetRoleForUser/
RequireChannelAccess, message/dm/block/invite/profile methods) is now
ctx-first.
- Detached (context.WithoutCancel) where cancellation would break an
invariant, found by a 3-lens adversarial review of the diff:
* voice-leave background retries (a dead webhook/connection ctx killed
retry 2 before it ran, leaving ghost capacity-holding voice rows)
* rollbackVoiceJoin's compensating delete (its trigger IS the cancel)
* post-2FA-change DeleteOtherSessions and logout DeleteSession (the
security tail of a committed change must not die with the request)
* all api/ws audit writes (a banned user could suppress their own
login_blocked_banned row by aborting the request mid-bcrypt)
* admin backup VACUUM INTO (an interrupt left a truncated .db that
the backup list presented as restorable)
* post-commit message/edit refetches (a committed message must still
fan out when the sender disconnects)
* hub settings-cache refresh (one dead connection could pin stale
values for the 30s TTL)
- gocritic rangeValCopy fixed (index iteration); gosec G306 excluded in
config with justification (generated source must stay world-readable)
instead of flipping genprotocol output to 0o600.
Verified: gofmt/vet, all four build-tag variants, full suite, deadlock
pass, full -race pass, golangci-lint 0 issues uncapped.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
393 lines
13 KiB
Go
393 lines
13 KiB
Go
package api
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"log/slog"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/owncord/server/auth"
|
|
"github.com/owncord/server/db"
|
|
)
|
|
|
|
// ─── TOTP request/response types ─────────────────────────────────────────────
|
|
|
|
type verifyTotpRequest struct {
|
|
Code string `json:"code"`
|
|
}
|
|
|
|
type passwordConfirmationRequest struct {
|
|
Password string `json:"password"`
|
|
}
|
|
|
|
type totpConfirmationRequest struct {
|
|
Password string `json:"password"`
|
|
Code string `json:"code"`
|
|
}
|
|
|
|
type totpEnableResponse struct {
|
|
QRURI string `json:"qr_uri"`
|
|
BackupCodes []string `json:"backup_codes"`
|
|
}
|
|
|
|
// ─── Handlers ────────────────────────────────────────────────────────────────
|
|
|
|
func handleVerifyTOTP(database *db.DB, partialStore *auth.PartialAuthStore, limiter *auth.RateLimiter, usedTOTPCodes *auth.UsedTOTPCodeStore, totpKey []byte) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
partialToken, ok := auth.ExtractBearerToken(r)
|
|
if !ok {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED",
|
|
Message: "missing or invalid authorization header",
|
|
})
|
|
return
|
|
}
|
|
|
|
challenge, ok := partialStore.Lookup(partialToken)
|
|
if !ok {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED",
|
|
Message: "invalid or expired two-factor challenge",
|
|
})
|
|
return
|
|
}
|
|
|
|
var req verifyTotpRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT",
|
|
Message: "malformed request body",
|
|
})
|
|
return
|
|
}
|
|
|
|
totpRateLimitKey := fmt.Sprintf("totp_fail:%d", challenge.UserID)
|
|
// Atomically record this attempt and reject once the per-user failure cap
|
|
// is reached. Recording up-front — rather than a read-only Check now and
|
|
// Allow only on failure — closes a TOCTOU where many concurrent requests
|
|
// reusing one valid partial token all pass the read-only check before any
|
|
// failure is recorded, defeating the per-user brute-force cap (the only
|
|
// cross-IP defence). A successful verification resets the counter below,
|
|
// so legitimate retries are not penalised.
|
|
if !limiter.Allow(totpRateLimitKey, totpFailureRateLimit, totpFailureWindow) {
|
|
writeJSON(w, http.StatusTooManyRequests, errorResponse{
|
|
Error: "RATE_LIMITED",
|
|
Message: "too many failed attempts, try again later",
|
|
})
|
|
return
|
|
}
|
|
|
|
user, err := database.GetUserByID(r.Context(), challenge.UserID)
|
|
if err != nil || user == nil || user.TOTPSecret == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED",
|
|
Message: "invalid or expired two-factor challenge",
|
|
})
|
|
return
|
|
}
|
|
|
|
secret, decErr := auth.DecryptTOTPSecret(totpKey, *user.TOTPSecret)
|
|
if decErr != nil {
|
|
slog.Error("failed to decrypt TOTP secret", "user_id", user.ID, "error", decErr)
|
|
writeJSON(w, http.StatusInternalServerError, errorResponse{
|
|
Error: "INTERNAL_ERROR",
|
|
Message: "failed to verify two-factor code",
|
|
})
|
|
return
|
|
}
|
|
|
|
if !auth.VerifyTOTPCodeOnce(secret, strings.TrimSpace(req.Code), time.Now().UTC(), user.ID, usedTOTPCodes) {
|
|
// The attempt was already recorded atomically up-front via
|
|
// limiter.Allow; only the per-partial-token counter is advanced here.
|
|
partialStore.RegisterFailure(partialToken, partialAuthMaxFailures)
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED",
|
|
Message: "invalid two-factor code",
|
|
})
|
|
return
|
|
}
|
|
|
|
limiter.Reset(r.Context(), totpRateLimitKey)
|
|
|
|
if _, ok := partialStore.Consume(partialToken); !ok {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED",
|
|
Message: "invalid or expired two-factor challenge",
|
|
})
|
|
return
|
|
}
|
|
|
|
token, err := issueSession(r.Context(), database, user.ID, challenge.Device, challenge.IP)
|
|
if err != nil {
|
|
writeJSON(w, http.StatusInternalServerError, errorResponse{
|
|
Error: "INTERNAL_ERROR",
|
|
Message: "failed to create session",
|
|
})
|
|
return
|
|
}
|
|
|
|
slog.Info("totp verified", "user_id", user.ID, "ip", challenge.IP)
|
|
db.WriteAudit(context.WithoutCancel(r.Context()), database, user.ID, "totp_verified", "user", user.ID,
|
|
"two-factor verification completed from "+challenge.IP)
|
|
|
|
writeJSON(w, http.StatusOK, authSuccessResponse{
|
|
Token: token,
|
|
Requires2FA: false,
|
|
User: toUserResponse(user),
|
|
})
|
|
}
|
|
}
|
|
|
|
func handleEnableTOTP(pendingStore *auth.PendingTOTPStore, 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 for password confirmation.
|
|
lockKey := fmt.Sprintf("pw_confirm_lock:%d", user.ID)
|
|
if limiter.IsLockedOut(lockKey) {
|
|
writeJSON(w, http.StatusTooManyRequests, errorResponse{
|
|
Error: "RATE_LIMITED",
|
|
Message: "too many failed attempts, try again later",
|
|
})
|
|
return
|
|
}
|
|
|
|
if user.TOTPSecret != nil && *user.TOTPSecret != "" {
|
|
writeJSON(w, http.StatusConflict, errorResponse{
|
|
Error: "TOTP_ALREADY_ENABLED",
|
|
Message: "disable 2FA before re-enabling",
|
|
})
|
|
return
|
|
}
|
|
|
|
var req passwordConfirmationRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT",
|
|
Message: "malformed request body",
|
|
})
|
|
return
|
|
}
|
|
failKey := fmt.Sprintf("pw_confirm_fail:%d", user.ID)
|
|
if err := requirePasswordConfirmation(user, req.Password); err != nil {
|
|
if !limiter.Allow(failKey, pwConfirmFailureThreshold, pwConfirmFailureWindow) {
|
|
limiter.Lockout(r.Context(), lockKey, pwConfirmLockoutDuration)
|
|
}
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT",
|
|
Message: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
limiter.Reset(r.Context(), failKey)
|
|
|
|
secret, err := auth.GenerateTOTPSecret()
|
|
if err != nil {
|
|
writeJSON(w, http.StatusInternalServerError, errorResponse{
|
|
Error: "INTERNAL_ERROR",
|
|
Message: "failed to generate two-factor secret",
|
|
})
|
|
return
|
|
}
|
|
|
|
pendingStore.Put(user.ID, secret)
|
|
writeJSON(w, http.StatusOK, totpEnableResponse{
|
|
QRURI: auth.BuildTOTPURI(user.Username, secret, "OwnCord"),
|
|
BackupCodes: []string{},
|
|
})
|
|
}
|
|
}
|
|
|
|
func handleConfirmTOTP(database *db.DB, pendingStore *auth.PendingTOTPStore, usedTOTPCodes *auth.UsedTOTPCodeStore, limiter *auth.RateLimiter, totpKey []byte) 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 for password confirmation.
|
|
lockKey := fmt.Sprintf("pw_confirm_lock:%d", 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 totpConfirmationRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT",
|
|
Message: "malformed request body",
|
|
})
|
|
return
|
|
}
|
|
failKey := fmt.Sprintf("pw_confirm_fail:%d", user.ID)
|
|
if err := requirePasswordConfirmation(user, req.Password); err != nil {
|
|
if !limiter.Allow(failKey, pwConfirmFailureThreshold, pwConfirmFailureWindow) {
|
|
limiter.Lockout(r.Context(), lockKey, pwConfirmLockoutDuration)
|
|
}
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT",
|
|
Message: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
limiter.Reset(r.Context(), failKey)
|
|
|
|
secret, ok := pendingStore.Lookup(user.ID)
|
|
if !ok {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "BAD_REQUEST",
|
|
Message: "no pending two-factor enrollment found",
|
|
})
|
|
return
|
|
}
|
|
|
|
if !auth.VerifyTOTPCodeOnce(secret, strings.TrimSpace(req.Code), time.Now().UTC(), user.ID, usedTOTPCodes) {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED",
|
|
Message: "invalid two-factor code",
|
|
})
|
|
return
|
|
}
|
|
|
|
encryptedSecret, encErr := auth.EncryptTOTPSecret(totpKey, secret)
|
|
if encErr != nil {
|
|
slog.Error("failed to encrypt TOTP secret", "user_id", user.ID, "error", encErr)
|
|
writeJSON(w, http.StatusInternalServerError, errorResponse{
|
|
Error: "INTERNAL_ERROR",
|
|
Message: "failed to enable two-factor authentication",
|
|
})
|
|
return
|
|
}
|
|
|
|
if err := database.UpdateUserTOTPSecret(r.Context(), user.ID, &encryptedSecret); err != nil {
|
|
writeJSON(w, http.StatusInternalServerError, errorResponse{
|
|
Error: "INTERNAL_ERROR",
|
|
Message: "failed to enable two-factor authentication",
|
|
})
|
|
return
|
|
}
|
|
pendingStore.Delete(user.ID)
|
|
|
|
// BUG-108: Revoke all other sessions after 2FA state change.
|
|
if sess, ok := r.Context().Value(SessionKey).(*db.Session); ok && sess != nil {
|
|
// Security tail of the 2FA change: once the secret update committed,
|
|
// revoking the other sessions must not be aborted by a dead request.
|
|
n, _ := database.DeleteOtherSessions(context.WithoutCancel(r.Context()), user.ID, sess.ID)
|
|
if n > 0 {
|
|
slog.Info("revoked other sessions after totp enable", "user_id", user.ID, "revoked", n)
|
|
}
|
|
}
|
|
|
|
slog.Info("totp enabled", "user_id", user.ID)
|
|
db.WriteAudit(context.WithoutCancel(r.Context()), database, user.ID, "totp_enabled", "user", user.ID,
|
|
"two-factor authentication enrolled")
|
|
|
|
w.WriteHeader(http.StatusNoContent)
|
|
}
|
|
}
|
|
|
|
func handleDisableTOTP(database *db.DB, pendingStore *auth.PendingTOTPStore, 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 for password confirmation.
|
|
lockKey := fmt.Sprintf("pw_confirm_lock:%d", 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 passwordConfirmationRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil && !errors.Is(err, io.EOF) {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT",
|
|
Message: "malformed request body",
|
|
})
|
|
return
|
|
}
|
|
failKey := fmt.Sprintf("pw_confirm_fail:%d", user.ID)
|
|
if err := requirePasswordConfirmation(user, req.Password); err != nil {
|
|
if !limiter.Allow(failKey, pwConfirmFailureThreshold, pwConfirmFailureWindow) {
|
|
limiter.Lockout(r.Context(), lockKey, pwConfirmLockoutDuration)
|
|
}
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "INVALID_INPUT",
|
|
Message: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
limiter.Reset(r.Context(), failKey)
|
|
|
|
require2FA, err := isRequire2FAEnabled(r.Context(), database)
|
|
if err != nil {
|
|
writeJSON(w, http.StatusInternalServerError, errorResponse{
|
|
Error: "INTERNAL_ERROR",
|
|
Message: "failed to load authentication policy",
|
|
})
|
|
return
|
|
}
|
|
if require2FA {
|
|
writeJSON(w, http.StatusForbidden, errorResponse{
|
|
Error: "FORBIDDEN",
|
|
Message: "two-factor authentication is required for this server",
|
|
})
|
|
return
|
|
}
|
|
|
|
pendingStore.Delete(user.ID)
|
|
if err := database.UpdateUserTOTPSecret(r.Context(), user.ID, nil); err != nil {
|
|
writeJSON(w, http.StatusInternalServerError, errorResponse{
|
|
Error: "INTERNAL_ERROR",
|
|
Message: "failed to disable two-factor authentication",
|
|
})
|
|
return
|
|
}
|
|
|
|
// BUG-108: Revoke all other sessions after 2FA state change.
|
|
if sess, ok := r.Context().Value(SessionKey).(*db.Session); ok && sess != nil {
|
|
// Security tail of the 2FA change: once the secret update committed,
|
|
// revoking the other sessions must not be aborted by a dead request.
|
|
n, _ := database.DeleteOtherSessions(context.WithoutCancel(r.Context()), user.ID, sess.ID)
|
|
if n > 0 {
|
|
slog.Info("revoked other sessions after totp disable", "user_id", user.ID, "revoked", n)
|
|
}
|
|
}
|
|
|
|
slog.Info("totp disabled", "user_id", user.ID)
|
|
db.WriteAudit(context.WithoutCancel(r.Context()), database, user.ID, "totp_disabled", "user", user.ID,
|
|
"two-factor authentication disabled")
|
|
|
|
w.WriteHeader(http.StatusNoContent)
|
|
}
|
|
}
|