[BUGFIX] Fix RandString typo bug. (Vonage#242)

* Bump version * Fix RandString typo bug * Rename constant --------- Co-authored-by: nicolaasuni-vonage <nicola.asuni@vonage.com>
tecnickcom · May 3, 2024 · 4a197fb · 4a197fb
1 parent 134fa91
commit 4a197fb
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.90.0
+1.90.1
diff --git a/examples/service/go.mod b/examples/service/go.mod
@@ -7,7 +7,7 @@ toolchain go1.22.2
 replace github.com/Vonage/gosrvlib => ../..
 
 require (
-	github.com/Vonage/gosrvlib v1.90.0
+	github.com/Vonage/gosrvlib v1.90.1
 	github.com/golang/mock v1.6.0
 	github.com/jstemmer/go-junit-report v1.0.0
 	github.com/prometheus/client_golang v1.19.0

diff --git a/pkg/random/options.go b/pkg/random/options.go
@@ -9,7 +9,7 @@ type Option func(c *Rnd)
 func WithByteToCharMap(cm []byte) Option {
 	switch d := len(cm); {
 	case d == 0:
-		cm = []byte(chrMap)
+		cm = []byte(chrMapDefault)
 	case d > chrMapMaxLen:
 		cm = cm[:chrMapMaxLen]
 	}

diff --git a/pkg/random/options_test.go b/pkg/random/options_test.go
@@ -9,7 +9,7 @@ import (
 func TestWithByteToCharMap(t *testing.T) {
 	t.Parallel()
 
-	want := []byte(chrMap)
+	want := []byte(chrMapDefault)
 	c := &Rnd{}
 
 	WithByteToCharMap(want)(c)

diff --git a/pkg/random/random.go b/pkg/random/random.go
@@ -12,12 +12,12 @@ import (
 )
 
 const (
-	chrDigits    = "0123456789"
-	chrUppercase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	chrLowercase = "abcdefghijklmnopqrstuvwxyz"
-	chrSymbols   = "!#$%&()*+,-./:;<=>?@[]^_{|}~" // (exclude "\"'\\`")
-	chrMap       = chrDigits + chrUppercase + chrLowercase + chrSymbols
-	chrMapMaxLen = 256
+	chrDigits     = "0123456789"
+	chrUppercase  = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	chrLowercase  = "abcdefghijklmnopqrstuvwxyz"
+	chrSymbols    = "!#$%&()*+,-./:;<=>?@[]^_{|}~" // (exclude "\"'\\`")
+	chrMapDefault = chrDigits + chrUppercase + chrLowercase + chrSymbols
+	chrMapMaxLen  = 256
 )
 
 // Rnd defines then random number generator.
@@ -36,7 +36,7 @@ func New(r io.Reader, opts ...Option) *Rnd {
 
 	rnd := &Rnd{
 		reader: r,
-		chrMap: []byte(chrMap),
+		chrMap: []byte(chrMapDefault),
 	}
 
 	for _, applyOpt := range opts {
@@ -89,8 +89,10 @@ func (r *Rnd) RandString(n int) (string, error) {
 		return "", err
 	}
 
+	cmlen := len(r.chrMap)
+
 	for i, v := range b {
-		b[i] = r.chrMap[(int(v)*len(chrMap))>>8]
+		b[i] = r.chrMap[(int(v)*cmlen)>>8]
 	}
 
 	return string(b), nil

diff --git a/pkg/random/random_test.go b/pkg/random/random_test.go
@@ -88,6 +88,13 @@ func TestRandString(t *testing.T) {
 	require.NoError(t, err)
 	require.Len(t, s, 17)
 
+	rc := New(nil, WithByteToCharMap([]byte(chrDigits+chrLowercase)))
+
+	sc, err := rc.RandString(16)
+
+	require.NoError(t, err)
+	require.Len(t, sc, 16)
+
 	re := New(iotest.ErrReader(errors.New("test-randstring-error")))
 
 	s, err = re.RandString(32)