From cf9e3f0f753e69c5bfa0838787e1c9833a060646 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Fri, 6 Feb 2026 16:17:17 -0800 Subject: Keep redirect query param on incorrect password This makes it a little less weird when you enter an incorrect password and the URL changes. --- roseh.moe.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'roseh.moe.go') diff --git a/roseh.moe.go b/roseh.moe.go index f385899..cd443a6 100644 --- a/roseh.moe.go +++ b/roseh.moe.go @@ -554,8 +554,7 @@ var ( ) type loginTemplateArgs struct { - Redirect string - Error bool + Error bool } func redirectLogin(w http.ResponseWriter, r *http.Request, redirect string) { @@ -564,7 +563,7 @@ func redirectLogin(w http.ResponseWriter, r *http.Request, redirect string) { } func serveLogin(w http.ResponseWriter, r *http.Request) { - if err := loginTemplate.Execute(w, loginTemplateArgs{Redirect: r.FormValue("redirect")}); err != nil { + if err := loginTemplate.Execute(w, loginTemplateArgs{}); err != nil { log.Printf("Warning: login: %s", err) } } @@ -587,10 +586,7 @@ func verifyRedirect(redirect string) (string, bool) { func login(w http.ResponseWriter, r *http.Request) { if !checkPassword(r.FormValue("password"), r.FormValue("auth")) { - if err := loginTemplate.Execute(w, loginTemplateArgs{ - Redirect: r.FormValue("redirect"), - Error: true, - }); err != nil { + if err := loginTemplate.Execute(w, loginTemplateArgs{Error: true}); err != nil { log.Printf("Warning: login: %s", err) } return -- cgit v1.3.1