mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
J3vbandClaude Fable 5
6afa9e974c
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>
79 lines
2.1 KiB
Go
79 lines
2.1 KiB
Go
package db
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
|
|
"database/sql"
|
|
|
|
"github.com/owncord/server/db/dbgen"
|
|
)
|
|
|
|
// BlockUser adds a block from blocker to blocked. Idempotent — re-blocking
|
|
// a user that is already blocked is a no-op (INSERT OR IGNORE).
|
|
func (d *DB) BlockUser(ctx context.Context, blockerID, blockedID int64) error {
|
|
if err := d.q.BlockUser(ctx, dbgen.BlockUserParams{
|
|
BlockerID: blockerID,
|
|
BlockedID: blockedID,
|
|
}); err != nil {
|
|
return fmt.Errorf("BlockUser: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// UnblockUser removes a block. Idempotent — unblocking a non-blocked user is
|
|
// a no-op.
|
|
func (d *DB) UnblockUser(ctx context.Context, blockerID, blockedID int64) error {
|
|
if err := d.q.UnblockUser(ctx, dbgen.UnblockUserParams{
|
|
BlockerID: blockerID,
|
|
BlockedID: blockedID,
|
|
}); err != nil {
|
|
return fmt.Errorf("UnblockUser: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// IsBlocked returns true if blockerID has blocked blockedID.
|
|
func (d *DB) IsBlocked(ctx context.Context, blockerID, blockedID int64) (bool, error) {
|
|
_, err := d.q.IsBlocked(ctx, dbgen.IsBlockedParams{
|
|
BlockerID: blockerID,
|
|
BlockedID: blockedID,
|
|
})
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return false, nil
|
|
}
|
|
if err != nil {
|
|
return false, fmt.Errorf("IsBlocked: %w", err)
|
|
}
|
|
return true, nil
|
|
}
|
|
|
|
// IsEitherBlocked returns true if either user has blocked the other.
|
|
// Used for DM authorization — if either party has blocked the other,
|
|
// messaging is denied.
|
|
func (d *DB) IsEitherBlocked(ctx context.Context, userA, userB int64) (bool, error) {
|
|
_, err := d.q.IsEitherBlocked(ctx, dbgen.IsEitherBlockedParams{
|
|
BlockerID: userA,
|
|
BlockedID: userB,
|
|
BlockerID_2: userB,
|
|
BlockedID_2: userA,
|
|
})
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return false, nil
|
|
}
|
|
if err != nil {
|
|
return false, fmt.Errorf("IsEitherBlocked: %w", err)
|
|
}
|
|
return true, nil
|
|
}
|
|
|
|
// ListBlockedUsers returns the IDs of all users blocked by the given user.
|
|
func (d *DB) ListBlockedUsers(ctx context.Context, blockerID int64) ([]int64, error) {
|
|
ids, err := d.q.ListBlockedUsers(ctx, blockerID)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("ListBlockedUsers: %w", err)
|
|
}
|
|
return ids, nil
|
|
}
|