From 937ec342010894f7a6239883b10f6a107ff82c9f Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Sat, 31 Oct 2020 10:51:05 -0600 Subject: caddyauth: Prevent user enumeration by timing Always follow the code path of hashing and comparing a plaintext password even if the account is not found by the given username; this ensures that similar CPU cycles are spent for both valid and invalid usernames. Thanks to @tylerlm for helping and looking into this! --- modules/caddyhttp/caddyauth/command.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'modules/caddyhttp/caddyauth/command.go') diff --git a/modules/caddyhttp/caddyauth/command.go b/modules/caddyhttp/caddyauth/command.go index a0e971e..f445f67 100644 --- a/modules/caddyhttp/caddyauth/command.go +++ b/modules/caddyhttp/caddyauth/command.go @@ -25,8 +25,6 @@ import ( "github.com/caddyserver/caddy/v2" caddycmd "github.com/caddyserver/caddy/v2/cmd" - "golang.org/x/crypto/bcrypt" - "golang.org/x/crypto/scrypt" "golang.org/x/crypto/ssh/terminal" ) @@ -116,11 +114,11 @@ func cmdHashPassword(fs caddycmd.Flags) (int, error) { var hash []byte switch algorithm { case "bcrypt": - hash, err = bcrypt.GenerateFromPassword(plaintext, 14) + hash, err = BcryptHash{}.Hash(plaintext, nil) case "scrypt": def := ScryptHash{} def.SetDefaults() - hash, err = scrypt.Key(plaintext, salt, def.N, def.R, def.P, def.KeyLength) + hash, err = def.Hash(plaintext, salt) default: return caddy.ExitCodeFailedStartup, fmt.Errorf("unrecognized hash algorithm: %s", algorithm) } -- cgit v1.2.3