backport of commit 88cbf25afb (#19900)

Co-authored-by: John-Michael Faircloth <fairclothjm@users.noreply.github.com>
This commit is contained in:
hc-github-team-secure-vault-core
2023-04-17 14:56:24 -04:00
committed by GitHub
parent 004abbfd2a
commit 8fc7490d6e
2 changed files with 12 additions and 2 deletions

3
changelog/19875.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
helper/random: Fix race condition in string generator helper
```

View File

@@ -7,6 +7,7 @@ import (
"io"
"math"
"sort"
"sync"
"time"
"unicode"
@@ -76,7 +77,8 @@ type StringGenerator struct {
Rules serializableRules `mapstructure:"-" json:"rule"` // This is "rule" in JSON so it matches the HCL property type
// CharsetRule to choose runes from. This is computed from the rules, not directly configurable
charset runes
charset runes
charsetLock sync.RWMutex
}
// Generate a random string from the charset and adhering to the provided rules.
@@ -116,7 +118,10 @@ func (g *StringGenerator) generate(rng io.Reader) (str string, err error) {
// If performance improvements need to be made, this can be changed to read a batch of
// potential strings at once rather than one at a time. This will significantly
// improve performance, but at the cost of added complexity.
candidate, err := randomRunes(rng, g.charset, g.Length)
g.charsetLock.RLock()
charset := g.charset
g.charsetLock.RUnlock()
candidate, err := randomRunes(rng, charset, g.Length)
if err != nil {
return "", fmt.Errorf("unable to generate random characters: %w", err)
}
@@ -229,6 +234,8 @@ func (g *StringGenerator) validateConfig() (err error) {
merr = multierror.Append(merr, fmt.Errorf("specified rules require at least %d characters but %d is specified", minLen, g.Length))
}
g.charsetLock.Lock()
defer g.charsetLock.Unlock()
// Ensure we have a charset & all characters are printable
if len(g.charset) == 0 {
// Yes this is mutating the generator but this is done so we don't have to compute this on every generation