Let people change their own password, and operators reset a lost one
CI / test (push) Failing after 1m11s
CI / test (push) Failing after 1m11s
The account system shipped without either, which made the first forgotten password an unanswerable support request. Changing it requires the current one. A session is what an attacker gets from a borrowed laptop or a stolen cookie; the password is what they do not have, and without the check the first thing they would do is take the account. Every session is closed, including the browser doing the changing — leaving the others open would mean a password change does nothing about the reason someone is changing it. A new session is then opened for the browser in front of us, so the person who just proved their password is not thrown back to the sign-in page. That response also carries a new CSRF cookie, so the forms it renders take the new token rather than the one the request arrived with; there is a test that posts a form from that exact page. Guessing the current password is bounded the same way sign-in is, because someone holding a stolen session should not get unlimited attempts at the password that would let them keep it. There is no self-service reset: this gateway sends no email, and a reset link with nowhere to send it is not a reset. `llmgw users reset-password` is the operator's answer, and it closes their sessions too — if someone lost their password, the reason might be that somebody else has it. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
216fc9bb03
commit
79e459d9ff
10 files changed
+437
-24
No files matched your search
+113
-17
@@ -26,6 +26,9 @@ type Accounts interface {
|
||||
SignOut(ctx context.Context, token string) error
|
||||
CheckCSRF(sess store.Session, submitted string) bool
|
||||
SignupOpen() bool
|
||||
ChangePassword(ctx context.Context, pw account.PasswordChanger,
|
||||
u store.User, current, next string) error
|
||||
OpenSession(ctx context.Context, userID string) (token, csrf string, err error)
|
||||
}
|
||||
|
||||
// KeyOwner is the store half of the profile page.
|
||||
@@ -39,18 +42,21 @@ type KeyOwner interface {
|
||||
|
||||
// AccountPages serves signup, sign-in and the profile.
|
||||
type AccountPages struct {
|
||||
accounts Accounts
|
||||
keys KeyOwner
|
||||
version string
|
||||
log *slog.Logger
|
||||
accounts Accounts
|
||||
keys KeyOwner
|
||||
passwords account.PasswordChanger
|
||||
version string
|
||||
log *slog.Logger
|
||||
}
|
||||
|
||||
// NewAccountPages builds the handlers.
|
||||
func NewAccountPages(a Accounts, k KeyOwner, version string, log *slog.Logger) *AccountPages {
|
||||
func NewAccountPages(a Accounts, k KeyOwner, pw account.PasswordChanger,
|
||||
version string, log *slog.Logger,
|
||||
) *AccountPages {
|
||||
if log == nil {
|
||||
log = slog.Default()
|
||||
}
|
||||
return &AccountPages{accounts: a, keys: k, version: version, log: log}
|
||||
return &AccountPages{accounts: a, keys: k, passwords: pw, version: version, log: log}
|
||||
}
|
||||
|
||||
// Register mounts the pages. They are all browser surfaces and none of them
|
||||
@@ -67,6 +73,7 @@ func (p *AccountPages) Register(mux *http.ServeMux) {
|
||||
mux.HandleFunc("GET /profile", p.profile)
|
||||
mux.HandleFunc("POST /profile/keys", p.createKey)
|
||||
mux.HandleFunc("POST /profile/keys/{id}/revoke", p.revokeKey)
|
||||
mux.HandleFunc("POST /profile/password", p.changePassword)
|
||||
}
|
||||
|
||||
// --- signup ---
|
||||
@@ -170,11 +177,16 @@ func (p *AccountPages) logout(w http.ResponseWriter, r *http.Request) {
|
||||
type limitRow struct{ Name, Value string }
|
||||
|
||||
type profileData struct {
|
||||
User store.User
|
||||
Keys []store.Key
|
||||
Limits []limitRow
|
||||
NewKey string
|
||||
Error string
|
||||
User store.User
|
||||
Keys []store.Key
|
||||
Limits []limitRow
|
||||
NewKey string
|
||||
Error string
|
||||
|
||||
PasswordChanged bool
|
||||
PasswordError string
|
||||
MinPassword int
|
||||
|
||||
CSRF string
|
||||
BaseURL string
|
||||
Version string
|
||||
@@ -251,12 +263,17 @@ func (p *AccountPages) revokeKey(w http.ResponseWriter, r *http.Request) {
|
||||
func (p *AccountPages) renderProfile(w http.ResponseWriter, r *http.Request,
|
||||
sess store.Session, user store.User, newKey, errMsg string,
|
||||
) {
|
||||
d := profileData{
|
||||
User: user, NewKey: newKey, Error: errMsg,
|
||||
BaseURL: baseURL(r),
|
||||
Version: p.version,
|
||||
Now: time.Now().UTC().Format(time.RFC3339),
|
||||
}
|
||||
p.render(w, r, sess, user, profileData{NewKey: newKey, Error: errMsg})
|
||||
}
|
||||
|
||||
func (p *AccountPages) render(w http.ResponseWriter, r *http.Request,
|
||||
sess store.Session, user store.User, d profileData,
|
||||
) {
|
||||
d.User = user
|
||||
d.MinPassword = account.MinPasswordLen
|
||||
d.BaseURL = baseURL(r)
|
||||
d.Version = p.version
|
||||
d.Now = time.Now().UTC().Format(time.RFC3339)
|
||||
// The form token comes from the cookie, never from whatever the request
|
||||
// happened to carry: echoing a submitted value back into the next form
|
||||
// would let an attacker choose both halves of the comparison.
|
||||
@@ -391,3 +408,82 @@ func noStore(w http.ResponseWriter) {
|
||||
w.Header().Set("X-Content-Type-Options", "nosniff")
|
||||
w.Header().Set("X-Frame-Options", "DENY")
|
||||
}
|
||||
|
||||
func (p *AccountPages) changePassword(w http.ResponseWriter, r *http.Request) {
|
||||
noStore(w)
|
||||
sess, user, ok := p.session(r)
|
||||
if !ok {
|
||||
http.Redirect(w, r, "/login", http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
if !p.accounts.CheckCSRF(sess, r.FormValue("csrf")) {
|
||||
http.Error(w, "bad request", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
err := p.accounts.ChangePassword(r.Context(), p.passwords, user,
|
||||
r.FormValue("current"), r.FormValue("new"))
|
||||
if err != nil {
|
||||
d := profileData{}
|
||||
switch {
|
||||
case errors.Is(err, account.ErrBadCredentials):
|
||||
d.PasswordError = "that is not your current password"
|
||||
case errors.Is(err, account.ErrWeakPassword),
|
||||
errors.Is(err, account.ErrSamePassword),
|
||||
errors.Is(err, account.ErrTooManyTries):
|
||||
d.PasswordError = err.Error()
|
||||
default:
|
||||
p.log.Error("could not change a password", "err", err)
|
||||
d.PasswordError = "something went wrong; try again"
|
||||
}
|
||||
p.render(w, r, sess, user, d)
|
||||
return
|
||||
}
|
||||
|
||||
// The change closed every session including this one, which is the point.
|
||||
// Open a new one for the browser in front of us, so the person who just
|
||||
// proved their password is not thrown back to the sign-in page.
|
||||
token, csrf, err := p.accounts.OpenSession(r.Context(), user.ID)
|
||||
if err != nil {
|
||||
p.log.Error("could not reopen a session", "err", err)
|
||||
clearSessionCookie(w, r)
|
||||
http.Redirect(w, r, "/login", http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
setSessionCookie(w, r, token)
|
||||
setCSRFCookie(w, r, csrf)
|
||||
|
||||
// The new CSRF cookie is set on this response, so the forms rendered now
|
||||
// must carry the same value rather than the one the request arrived with.
|
||||
newSess, newUser, rerr := p.accounts.Resolve(r.Context(), token)
|
||||
if rerr != nil {
|
||||
http.Redirect(w, r, "/profile", http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
d := profileData{PasswordChanged: true}
|
||||
d.CSRF = csrf
|
||||
p.renderWithCSRF(w, r, newSess, newUser, d)
|
||||
}
|
||||
|
||||
// renderWithCSRF is render for the one case where the token in the cookie jar
|
||||
// is not yet the one the browser has: the response that sets a new one.
|
||||
func (p *AccountPages) renderWithCSRF(w http.ResponseWriter, r *http.Request,
|
||||
sess store.Session, user store.User, d profileData,
|
||||
) {
|
||||
csrf := d.CSRF
|
||||
d.User = user
|
||||
d.MinPassword = account.MinPasswordLen
|
||||
d.BaseURL = baseURL(r)
|
||||
d.Version = p.version
|
||||
d.Now = time.Now().UTC().Format(time.RFC3339)
|
||||
d.CSRF = csrf
|
||||
_ = sess
|
||||
|
||||
keys, err := p.keys.KeysForUser(r.Context(), user.ID)
|
||||
if err != nil {
|
||||
p.log.Error("could not list keys", "err", err)
|
||||
}
|
||||
d.Keys = keys
|
||||
d.Limits = p.limitsFor(r.Context(), user)
|
||||
render(w, "profile", d)
|
||||
}
|
||||
@@ -102,6 +102,21 @@ minute. To rotate: create the new key, switch over, wait for "last used" on the
|
||||
old one to stop moving, then revoke it.</p>
|
||||
{{else}}<p class="empty">You have no keys yet.</p>{{end}}
|
||||
|
||||
<h2>Password</h2>
|
||||
{{if .PasswordChanged}}<p>Your password was changed. Any other browser you were
|
||||
signed in on has been signed out.</p>{{end}}
|
||||
{{if .PasswordError}}<p class="error">{{.PasswordError}}</p>{{end}}
|
||||
<form method="post" action="/profile/password" autocomplete="on">
|
||||
<input type="hidden" name="csrf" value="{{.CSRF}}">
|
||||
<label>Current password<input type="password" name="current" required
|
||||
autocomplete="current-password"></label>
|
||||
<label>New password<input type="password" name="new" required
|
||||
minlength="{{.MinPassword}}" autocomplete="new-password"></label>
|
||||
<button type="submit">Change password</button>
|
||||
</form>
|
||||
<p class="note">Changing it signs out every other browser, which is the point if
|
||||
you are changing it because something went wrong.</p>
|
||||
|
||||
<h2>Your limits</h2>
|
||||
{{if .Limits}}
|
||||
<table><tr><th>Limit</th><th class="num">Value</th></tr>
|
||||
|
||||
Reference in new issue
Block a user