From 534b5624af239d56672f761c0137b87ed3e1c764 Mon Sep 17 00:00:00 2001 From: Untone Date: Fri, 5 Jan 2024 01:41:52 +0300 Subject: [PATCH] sha256-fix --- server/crypto/common.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/server/crypto/common.go b/server/crypto/common.go index 9671398..d91e33a 100644 --- a/server/crypto/common.go +++ b/server/crypto/common.go @@ -137,24 +137,17 @@ func getSHA256(input string) string { // VerifyPassword compares a stored hashed password with a user-provided password func VerifyPassword(storedHashedPassword, userProvidedPassword string) error { // CompareHashAndPassword returns nil on success - err := bcrypt.CompareHashAndPassword([]byte(storedHashedPassword), []byte(userProvidedPassword)) - if err != nil { - passwordSHA256 := getSHA256(userProvidedPassword) - err = bcrypt.CompareHashAndPassword([]byte(storedHashedPassword), []byte(passwordSHA256)) - } + passwordSHA256 := getSHA256(userProvidedPassword) + err := bcrypt.CompareHashAndPassword([]byte(storedHashedPassword), []byte(passwordSHA256)) return err } // EncryptPassword is used for encrypting password func EncryptPassword(password string) (string, error) { - pw, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) + passwordSHA256 := getSHA256(password) + pw, err := bcrypt.GenerateFromPassword([]byte(passwordSHA256), bcrypt.DefaultCost) if err != nil { - password = getSHA256(password) - pw, err = bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) - if err != nil { - return "", err - } + return "", err } - return string(pw), nil }