test / test (push) Canceled after 0s
Expiry (assumptions A-8). Postfix 3.7.11 logs the end of a message's queue lifetime once per message, "<id>: from=<..>, status=expired, returned to sender" (src/qmgr/qmgr_active.c, qmgr_active_done_25_generic()), with no line per recipient; the tailer waited for "to=..., status=expired", which no Postfix writes, and the sweep closed only queued rows, so such rows stayed deferred. The tailer now reads qmgr's line (ExpireMessage: each recipient's newest open row of the id becomes bounced); the sweep closes a deferred row too when Postfix no longer holds the message, and counts as missed only a final line (sent, bounced, expiry). The queue listing's '#' (forced expiry, showq_compat.c showq_message()) is read as a flag (B-PQ1). Time values (B-PQ10, B-PQ11): conv_time() ported - one number, one lower-case unit, the parameter's default unit when none (get_def_time_unit: d for the lifetimes, h for delay_warning_time), the rest ignored; postconf -h -x expands $name; bounce_queue_lifetime capped at maximal_queue_lifetime as qmgr_post_init() caps it, so LongestLifetime is the queue lifetime. Refusals (A-21, A-23, A-24, A-15): smtpd_whatsup() ends the NOQUEUE line with sasl_username=<login> on an authenticated session; the line is now matched to its row by client, login and sender, and a line without a login is no application's. The client= line's login ends at the comma. The "IPv6:" trim goes (namaddr is built from state->addr). A row recovered from cleanup's line says that line names the last recipient only. Stand (2026-10-14, make e2e, exit 0): new expired_message_is_closed - defer_transports=smtp makes the retry service defer the message, postsuper -e and postqueue -i force its expiry; mail.log has "<id>: from=<alerts@sender.e2e.test>, status=force-expired, returned to sender" and the row goes deferred -> bounced; refusals_show_postfixs_line passes with the login match. go vet and go test ./... pass on the server. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
115 lines
3.9 KiB
Go
115 lines
3.9 KiB
Go
package store
|
|
|
|
import (
|
|
"database/sql"
|
|
"errors"
|
|
"fmt"
|
|
"time"
|
|
)
|
|
|
|
// SessionRow is a persisted login session, keyed by the SHA-256 of its token
|
|
// (see internal/web, which owns the token itself). It belongs to a user by id:
|
|
// deleting the user deletes their sessions, and renaming them keeps them.
|
|
type SessionRow struct {
|
|
UserID int64
|
|
ExpiresAt time.Time
|
|
}
|
|
|
|
// CreateSession inserts a new session row for a user.
|
|
func (s *Store) CreateSession(tokenHash string, userID int64, expiresAt time.Time) error {
|
|
now := time.Now().UTC().Format(time.RFC3339)
|
|
_, err := s.db.Exec(
|
|
`INSERT INTO sessions (token_hash, user_id, created_at, expires_at) VALUES (?, ?, ?, ?)`,
|
|
tokenHash, userID, now, expiresAt.UTC().Format(time.RFC3339),
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("insert session: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// LookupSession returns the session for tokenHash, if any. It does not check
|
|
// expiry itself — callers compare ExpiresAt against time.Now() and call
|
|
// DeleteSession on an expired row, keeping the read side lock-free: in WAL
|
|
// mode a reader takes no write lock and is not blocked by a writer
|
|
// (https://sqlite.org/wal.html § 2.2). Within this process it still waits for
|
|
// the one pooled connection (Open).
|
|
func (s *Store) LookupSession(tokenHash string) (SessionRow, bool, error) {
|
|
var (
|
|
row SessionRow
|
|
expiresAt string
|
|
)
|
|
err := s.db.QueryRow(
|
|
`SELECT user_id, expires_at FROM sessions WHERE token_hash = ?`,
|
|
tokenHash,
|
|
).Scan(&row.UserID, &expiresAt)
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return SessionRow{}, false, nil
|
|
}
|
|
if err != nil {
|
|
return SessionRow{}, false, fmt.Errorf("lookup session: %w", err)
|
|
}
|
|
row.ExpiresAt, err = time.Parse(time.RFC3339, expiresAt)
|
|
if err != nil {
|
|
return SessionRow{}, false, fmt.Errorf("parse session expiry: %w", err)
|
|
}
|
|
return row, true, nil
|
|
}
|
|
|
|
// RenewSession pushes a session's expiry forward, implementing the sliding
|
|
// idle timeout.
|
|
func (s *Store) RenewSession(tokenHash string, expiresAt time.Time) error {
|
|
_, err := s.db.Exec(
|
|
`UPDATE sessions SET expires_at = ? WHERE token_hash = ?`,
|
|
expiresAt.UTC().Format(time.RFC3339), tokenHash,
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("renew session: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// DeleteSession removes a session row (logout, or a lookup finding it
|
|
// expired).
|
|
func (s *Store) DeleteSession(tokenHash string) error {
|
|
if _, err := s.db.Exec(`DELETE FROM sessions WHERE token_hash = ?`, tokenHash); err != nil {
|
|
return fmt.Errorf("delete session: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// DeleteOtherSessions removes every session of the user except keepHash. It is
|
|
// called when the user changes their password: a stolen cookie issued under the
|
|
// old password must stop working, while the session performing the change
|
|
// stays signed in. Other users' sessions are not touched.
|
|
func (s *Store) DeleteOtherSessions(userID int64, keepHash string) error {
|
|
if _, err := s.db.Exec(`DELETE FROM sessions WHERE user_id = ? AND token_hash != ?`, userID, keepHash); err != nil {
|
|
return fmt.Errorf("delete other sessions: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// DeleteUserSessions removes every session of the user, for when somebody else
|
|
// has set their password.
|
|
func (s *Store) DeleteUserSessions(userID int64) error {
|
|
if _, err := s.db.Exec(`DELETE FROM sessions WHERE user_id = ?`, userID); err != nil {
|
|
return fmt.Errorf("delete user sessions: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// DeleteExpiredSessions prunes rows whose expiry has already passed, so an
|
|
// abandoned session (cookie never presented again) does not sit in the table
|
|
// forever. It piggybacks on session creation rather than running as its own
|
|
// background loop.
|
|
// expires_at is RFC3339 UTC text, so < compares moments (see
|
|
// ListOpenOlderThan).
|
|
func (s *Store) DeleteExpiredSessions(now time.Time) (int64, error) {
|
|
res, err := s.db.Exec(`DELETE FROM sessions WHERE expires_at < ?`, now.UTC().Format(time.RFC3339))
|
|
if err != nil {
|
|
return 0, fmt.Errorf("prune sessions: %w", err)
|
|
}
|
|
n, _ := res.RowsAffected()
|
|
return n, nil
|
|
}
|