fixup! fix: user passwords cleanup

coadler · coadler · commit 458c5dc52a40 · 2022-04-28T12:56:17.000-05:00
diff --git a/coderd/userpassword/hashing_bench_test.go b/coderd/userpassword/hashing_bench_test.go
@@ -10,8 +10,8 @@ import (
 )
 
 var (
-	salt   = []byte(cryptorand.MustString(16))
-	secret = []byte(cryptorand.MustString(24))
+	salt   = []byte(must(cryptorand.String(16)))
+	secret = []byte(must(cryptorand.String(24)))
 
 	resBcrypt []byte
 	resPbkdf2 []byte
@@ -60,3 +60,11 @@ func BenchmarkPbkdf2(b *testing.B) {
 
 	resPbkdf2 = r
 }
+
+func must(s string, err error) string {
+	if err != nil {
+		panic(err)
+	}
+
+	return s
+}
diff --git a/coderd/userpassword/userpassword.go b/coderd/userpassword/userpassword.go
@@ -13,8 +13,6 @@ import (
 	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/exp/slices"
 	"golang.org/x/xerrors"
-
-	"github.com/coder/coder/cryptorand"
 )
 
 var (
@@ -40,7 +38,7 @@ var (
 
 	// The simulated hash is used when trying to simulate password checks for
 	// users that don't exist.
-	simulatedHash, _ = Hash(cryptorand.MustString(10))
+	simulatedHash, _ = Hash("hunter2")
 )
 
 // Make password hashing much faster in tests.
diff --git a/cryptorand/strings.go b/cryptorand/strings.go
@@ -4,8 +4,6 @@ import (
 	"crypto/rand"
 	"encoding/binary"
 	"strings"
-
-	"golang.org/x/xerrors"
 )
 
 // Charsets
@@ -34,7 +32,7 @@ const (
 	Human = "23456789abcdefghjkmnpqrstuvwxyz"
 )
 
-// StringCharset generates a random string using the provided charset and size.
+// StringCharset generates a random string using the provided charset and size
 func StringCharset(charSetStr string, size int) (string, error) {
 	charSet := []rune(charSetStr)
 
@@ -69,58 +67,18 @@ func StringCharset(charSetStr string, size int) (string, error) {
 	return buf.String(), nil
 }
 
-// MustStringCharset generates a random string of the given length, using the
-// provided charset. It will panic if an error occurs.
-func MustStringCharset(charSet string, size int) string {
-	s, err := StringCharset(charSet, size)
-	must(err)
-	return s
-}
-
 // String returns a random string using Default.
 func String(size int) (string, error) {
 	return StringCharset(Default, size)
 }
 
-// MustString generates a random string of the given length, using
-// the Default charset. It will panic if an error occurs.
-func MustString(size int) string {
-	s, err := String(size)
-	must(err)
-	return s
-}
-
 // HexString returns a hexadecimal string of given length.
 func HexString(size int) (string, error) {
 	return StringCharset(Hex, size)
 }
 
-// MustHexString generates a random hexadecimal string of the given
-// length. It will panic if an error occurs.
-func MustHexString(size int) string {
-	s, err := HexString(size)
-	must(err)
-	return s
-}
-
-// Sha1String returns a 40-character hexadecimal string, which matches the
-// length of a SHA-1 hash (160 bits).
+// Sha1String returns a 40-character hexadecimal string, which matches
+// the length of a SHA-1 hash (160 bits).
 func Sha1String() (string, error) {
 	return StringCharset(Hex, 40)
 }
-
-// MustSha1String returns a 40-character hexadecimal string, which matches the
-// length of a SHA-1 hash (160 bits). It will panic if an error occurs.
-func MustSha1String() string {
-	s, err := Sha1String()
-	must(err)
-	return s
-}
-
-// must is a utility function that panics with the given error if
-// err is non-nil.
-func must(err error) {
-	if err != nil {
-		panic(xerrors.Errorf("crand: %w", err))
-	}
-}

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@ import (`
`13`	`13`	`"golang.org/x/crypto/pbkdf2"`
`14`	`14`	`"golang.org/x/exp/slices"`
`15`	`15`	`"golang.org/x/xerrors"`
`16`		`-`
`17`		`- "github.com/coder/coder/cryptorand"`
`18`	`16`	`)`
`19`	`17`
`20`	`18`	`var (`
`@@ -40,7 +38,7 @@ var (`
`40`	`38`
`41`	`39`	`// The simulated hash is used when trying to simulate password checks for`
`42`	`40`	`// users that don't exist.`
`43`		`- simulatedHash, _ = Hash(cryptorand.MustString(10))`
	`41`	`+ simulatedHash, _ = Hash("hunter2")`
`44`	`42`	`)`
`45`	`43`
`46`	`44`	`// Make password hashing much faster in tests.`