even furhter sigh

This commit is contained in:
Roberto Hidalgo 2023-01-03 22:51:35 -06:00
parent 1af237bb2d
commit 9b75094613
3 changed files with 7 additions and 10 deletions

View File

@ -21,14 +21,11 @@ var _db db.Session
var _wan *webauthn.WebAuthn
var _sess *scs.SessionManager
func Initialize(wan *webauthn.WebAuthn, db db.Session) {
sessionManager := scs.New()
sessionManager.Lifetime = 5 * time.Minute
func Route(wan *webauthn.WebAuthn, db db.Session, router http.Handler) http.Handler {
_db = db
_wan = wan
}
func Route(router http.Handler) http.Handler {
_sess = scs.New()
_sess.Lifetime = 5 * time.Minute
return _sess.LoadAndSave(router)
}
@ -47,7 +44,7 @@ func LoginHandler(w http.ResponseWriter, req *http.Request, ps httprouter.Params
password := req.FormValue("password")
user := &user.User{}
if err := _db.Get(user, db.Cond{"name": username}); err != nil {
if err := _db.Get(user, db.Cond{"handle": username}); err != nil {
err := &errors.InvalidCredentials{Status: http.StatusForbidden, Reason: fmt.Sprintf("User not found for name: %s (%s)", username, err)}
err.Log()
http.Error(w, err.Error(), err.Code())

View File

@ -191,8 +191,6 @@ func Initialize(config *Config) (http.Handler, error) {
return nil, err
}
auth.Initialize(wan, _db)
serverRoot, err := fs.Sub(staticFiles, "static")
if err != nil {
log.Fatal(err)
@ -216,7 +214,7 @@ func Initialize(config *Config) (http.Handler, error) {
router.POST("/api/user/:id", allowCORS(auth.RequireAdmin(auth.Enforce2FA(updateUser))))
router.DELETE("/api/user/:id", allowCORS(auth.RequireAdmin(auth.Enforce2FA(deleteUser))))
return auth.Route(router), nil
return auth.Route(wan, _db, router), nil
}
func renderTemplate(template []byte) httprouter.Handle {

View File

@ -1,3 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright © 2022 Roberto Hidalgo <nidito@un.rob.mx>
import * as webauthn from "./webauthn.js"
const host = document.location.protocol + "//" + document.location.host