From e7110491d3ee0f357a7d4918b3b052e5321c67fb Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 7 Oct 2023 10:20:01 -0400 Subject: [PATCH] more --- auth.go | 7 ++++++- meta.go | 2 +- recovery.go | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/auth.go b/auth.go index a37dd82..8f6dea3 100644 --- a/auth.go +++ b/auth.go @@ -16,7 +16,12 @@ func Login(username, password string) bool { } if bcrypt.CompareHashAndPassword([]byte(u.Password), []byte(password)) != nil { rc, ok := u.Get("recoverycode") - if !ok || bcrypt.CompareHashAndPassword([]byte(u.Password), []byte(rc)) != nil { + if !ok { + log.Println("No recovery code") + return false + } + log.Printf("Checking against recovery code %s", rc) + if bcrypt.CompareHashAndPassword([]byte(u.Password), []byte(rc)) != nil { log.Printf("scsusers.Login: Failed password for " + username) return false } diff --git a/meta.go b/meta.go index 64bf837..14ae305 100644 --- a/meta.go +++ b/meta.go @@ -12,7 +12,7 @@ type Metadata struct { } func (u *UserData) LoadMeta() bool { - q:= fmt.Sprintf("select meta_key, meta_value, id from %s_meta where user=?", c.TablePrefix) + q := fmt.Sprintf("select meta_key, meta_value, id from %s_meta where user=?", c.TablePrefix) rows, err := c.db.Query(q, u.UserID) if err != nil && err != sql.ErrNoRows { log.Printf("scsuser.Get: select: %s", err.Error()) diff --git a/recovery.go b/recovery.go index 30ce4b4..a9a0745 100644 --- a/recovery.go +++ b/recovery.go @@ -8,7 +8,6 @@ import ( "golang.org/x/crypto/bcrypt" ) - func RecoverByEmail(email string) { u, ok := Get(email) if !ok {