Skip to content

Commit d2fa2b9

Browse files
committed
db,web: check crypto/rand failures when generating secrets
Salt, session key, token and in-memory database name generation ignored the error from rand.Read. On the rare occasion the random source fails, this would silently produce a predictable or empty secret. Fail loudly instead: panic where no error can be returned, and return or report the error where the call already can. Signed-off-by: Robin Jarry <robin@jarry.cc>
1 parent 3207cd6 commit d2fa2b9

4 files changed

Lines changed: 13 additions & 4 deletions

File tree

‎pkg/db/db.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ func Open(cfg *config.Config) (*bun.DB, error) {
8787
}
8888
if path == ":memory:" {
8989
var buf [8]byte
90-
rand.Read(buf[:])
90+
if _, err := rand.Read(buf[:]); err != nil {
91+
return nil, err
92+
}
9193
name := hex.EncodeToString(buf[:])
9294
dsn = "file:" + name + "?mode=memory&cache=shared&_pragma=foreign_keys(1)"
9395
} else {

‎pkg/db/password.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ const (
2626

2727
func HashPassword(password string) string {
2828
salt := make([]byte, saltLen)
29-
rand.Read(salt)
29+
if _, err := rand.Read(salt); err != nil {
30+
panic("generate password salt: " + err.Error())
31+
}
3032
saltStr := base64.RawURLEncoding.EncodeToString(salt)
3133

3234
dk := pbkdf2.Key(

‎pkg/db/session.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ const sessionMaxAge = 14 * 24 * time.Hour // 2 weeks
1515

1616
func (q *Queries) CreateSession(userID int) (string, error) {
1717
key := make([]byte, 20)
18-
rand.Read(key)
18+
if _, err := rand.Read(key); err != nil {
19+
return "", err
20+
}
1921
sessionKey := hex.EncodeToString(key)
2022

2123
session := Session{

‎pkg/web/profile.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,10 @@ func (h *webHandler) GenerateToken(w http.ResponseWriter, r *http.Request) {
310310
}
311311

312312
key := make([]byte, 20)
313-
rand.Read(key)
313+
if _, err := rand.Read(key); err != nil {
314+
serverErrorPage(w, "generate token", err)
315+
return
316+
}
314317
token := hex.EncodeToString(key)
315318

316319
if err := q.Insert(&db.AuthToken{

0 commit comments

Comments
 (0)