diff --git a/pkg/services/twofactor_authorizations.go b/pkg/services/twofactor_authorizations.go index 8ba72815..e74797ba 100644 --- a/pkg/services/twofactor_authorizations.go +++ b/pkg/services/twofactor_authorizations.go @@ -159,7 +159,7 @@ func (s *TwoFactorAuthorizationService) GenerateTwoFactorRecoveryCodes() ([]stri recoveryCodes := make([]string, twoFactorRecoveryCodeCount) for i := 0; i < twoFactorRecoveryCodeCount; i++ { - recoveryCode, err := utils.GetRandomNumberOrLetter(twoFactorRecoveryCodeLength) + recoveryCode, err := utils.GetRandomNumberOrLowercaseLetter(twoFactorRecoveryCodeLength) if err != nil { return nil, err diff --git a/pkg/utils/strings.go b/pkg/utils/strings.go index 22d6d688..71bc1ae0 100644 --- a/pkg/utils/strings.go +++ b/pkg/utils/strings.go @@ -16,10 +16,10 @@ import ( ) const ( - availableCharacters = "!#$&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{|}~" - availableNumberAndLetters = "0123456789abcdefghijklmnopqrstuvwxyz" - availableCharactersLength = len(availableCharacters) - availableNumberAndLettersLength = len(availableNumberAndLetters) + availableCharacters = "!#$&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{|}~" + availableNumberAndLowercaseLetters = "0123456789abcdefghijklmnopqrstuvwxyz" + availableCharactersLength = len(availableCharacters) + availableNumberAndLowercaseLettersLength = len(availableNumberAndLowercaseLetters) ) // SubString returns part of the source string according to start index and length @@ -90,18 +90,18 @@ func GetRandomString(n int) (string, error) { return string(result), nil } -// GetRandomNumberOrLetter returns a random string which only contains number or letter characters -func GetRandomNumberOrLetter(n int) (string, error) { +// GetRandomNumberOrLowercaseLetter returns a random string which only contains number or letter characters +func GetRandomNumberOrLowercaseLetter(n int) (string, error) { var result = make([]byte, n) for i := 0; i < n; i++ { - index, err := GetRandomInteger(availableNumberAndLettersLength) + index, err := GetRandomInteger(availableNumberAndLowercaseLettersLength) if err != nil { return "", err } - result[i] = availableNumberAndLetters[index] + result[i] = availableNumberAndLowercaseLetters[index] } return string(result), nil diff --git a/pkg/utils/strings_test.go b/pkg/utils/strings_test.go index 39f99b9e..45ba0e36 100644 --- a/pkg/utils/strings_test.go +++ b/pkg/utils/strings_test.go @@ -78,8 +78,8 @@ func TestGetRandomString(t *testing.T) { assert.Len(t, actualValue, 10) } -func TestGetRandomNumberOrLetter(t *testing.T) { - actualValue, err := GetRandomNumberOrLetter(10) +func TestGetRandomNumberOrLowercaseLetter(t *testing.T) { + actualValue, err := GetRandomNumberOrLowercaseLetter(10) assert.Equal(t, nil, err) assert.Len(t, actualValue, 10) }