IAmChrisAMA
/
rogueserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move argon2 functions to its own file

fasthttp
maru 2024-04-14 19:05:04 -04:00
parent c41784f4c8
commit 2d5f777efd
No known key found for this signature in database
GPG Key ID: 37689350E9CD0F0D
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/account.go
View File

@ -12,16 +12,11 @@ import (
"time" "time"
"github.com/Flashfyre/pokerogue-server/db" "github.com/Flashfyre/pokerogue-server/db"
"golang.org/x/crypto/argon2"
) )
const ( const (
UUIDSize = 16 UUIDSize = 16
ArgonTime = 1 TokenSize = 32
ArgonMemory = 256 * 1024
ArgonThreads = 4
ArgonKeySize = 32
ArgonSaltSize = 16
) )
var isValidUsername = regexp.MustCompile(`^\w{1,16}$`).MatchString var isValidUsername = regexp.MustCompile(`^\w{1,16}$`).MatchString
@ -79,7 +74,7 @@ func handleAccountRegister(request AccountRegisterRequest) error {
return fmt.Errorf(fmt.Sprintf("failed to generate salt: %s", err)) return fmt.Errorf(fmt.Sprintf("failed to generate salt: %s", err))
} }
err = db.AddAccountRecord(uuid, request.Username, argon2.IDKey([]byte(request.Password), salt, ArgonTime, ArgonMemory, ArgonThreads, ArgonKeySize), salt) err = db.AddAccountRecord(uuid, request.Username, deriveArgon2IDKey([]byte(request.Password), salt), salt)
if err != nil { if err != nil {
return fmt.Errorf("failed to add account record: %s", err) return fmt.Errorf("failed to add account record: %s", err)
} }
@ -109,11 +104,11 @@ func handleAccountLogin(request AccountLoginRequest) (AccountLoginResponse, erro
return AccountLoginResponse{}, err return AccountLoginResponse{}, err
} }
if !bytes.Equal(key, argon2.IDKey([]byte(request.Password), salt, ArgonTime, ArgonMemory, ArgonThreads, ArgonKeySize)) { if !bytes.Equal(key, deriveArgon2IDKey([]byte(request.Password), salt)) {
return AccountLoginResponse{}, fmt.Errorf("password doesn't match") return AccountLoginResponse{}, fmt.Errorf("password doesn't match")
} }
token := make([]byte, 32) token := make([]byte, TokenSize)
_, err = rand.Read(token) _, err = rand.Read(token)
if err != nil { if err != nil {
return AccountLoginResponse{}, fmt.Errorf("failed to generate token: %s", err) return AccountLoginResponse{}, fmt.Errorf("failed to generate token: %s", err)
@ -129,7 +124,7 @@ func handleAccountLogin(request AccountLoginRequest) (AccountLoginResponse, erro
// /account/logout - log out of account // /account/logout - log out of account
func handleAccountLogout(token []byte) error { func handleAccountLogout(token []byte) error {
if len(token) != 32 { if len(token) != TokenSize {
return fmt.Errorf("invalid token") return fmt.Errorf("invalid token")
} }

15
api/argon2.go Normal file
View File

@ -0,0 +1,15 @@
package api
import "golang.org/x/crypto/argon2"
const (
ArgonTime = 1
ArgonMemory = 256 * 1024
ArgonThreads = 4
ArgonKeySize = 32
ArgonSaltSize = 16
)
func deriveArgon2IDKey(password, salt []byte) []byte {
return argon2.IDKey(password, salt, ArgonTime, ArgonMemory, ArgonThreads, ArgonKeySize)
}