Skip to content

fix: user passwords cleanup #1202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 28, 2022
Merged

fix: user passwords cleanup #1202

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44c04ec
fix: user passwords cleanup
coadler Apr 27, 2022
458c5dc
fixup! fix: user passwords cleanup
coadler Apr 28, 2022
449947f
fixup! fix: user passwords cleanup
coadler Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup! fix: user passwords cleanup
  • Loading branch information
@coadler
coadler committed Apr 28, 2022
commit 449947f8c46c303bc623b5f6e3c3fc945ccfafb4
16 changes: 8 additions & 8 deletions coderd/userpassword/userpassword.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
var (
// The base64 encoder used when producing the string representation of
// hashes.
base64Encoder = base64.RawStdEncoding
base64Encoding = base64.RawStdEncoding

// The number of iterations to use when generating the hash. This was chosen
// to make it about as fast as bcrypt hashes. Increasing this causes hashes
Expand All @@ -34,7 +34,7 @@ var (

// A salt size of 16 is the default in passlib. A minimum of 8 can be safely
// used.
saltSize = 16
defaultSaltSize = 16

// The simulated hash is used when trying to simulate password checks for
// users that don't exist.
Expand Down Expand Up @@ -84,7 +84,7 @@ func Compare(hashed string, password string) (bool, error) {
if err != nil {
return false, xerrors.Errorf("parse iter from hash: %w", err)
}
salt, err := base64Encoder.DecodeString(parts[3])
salt, err := base64Encoding.DecodeString(parts[3])
if err != nil {
return false, xerrors.Errorf("decode salt: %w", err)
}
Expand All @@ -99,7 +99,7 @@ func Compare(hashed string, password string) (bool, error) {
// Hash generates a hash using pbkdf2.
// See the Compare() comment for rationale.
func Hash(password string) (string, error) {
salt := make([]byte, saltSize)
salt := make([]byte, defaultSaltSize)
_, err := rand.Read(salt)
if err != nil {
return "", xerrors.Errorf("read random bytes for salt: %w", err)
Expand All @@ -112,12 +112,12 @@ func Hash(password string) (string, error) {
func hashWithSaltAndIter(password string, salt []byte, iter int) string {
var (
hash = pbkdf2.Key([]byte(password), salt, iter, hashLength, sha256.New)
encHash = make([]byte, base64Encoder.EncodedLen(len(hash)))
encSalt = make([]byte, base64Encoder.EncodedLen(len(salt)))
encHash = make([]byte, base64Encoding.EncodedLen(len(hash)))
encSalt = make([]byte, base64Encoding.EncodedLen(len(salt)))
)

base64Encoder.Encode(encHash, hash)
base64Encoder.Encode(encSalt, salt)
base64Encoding.Encode(encHash, hash)
base64Encoding.Encode(encSalt, salt)

return fmt.Sprintf("$%s$%d$%s$%s", hashScheme, iter, encSalt, encHash)
}