diff --git a/.golangci.toml b/.golangci.toml index 205c9e3..548f0b2 100644 --- a/.golangci.toml +++ b/.golangci.toml @@ -3,14 +3,13 @@ # SPDX-License-Identifier: CC0-1.0 [run] -go = "1.20" +go = "1.22" tests = true -skip-dirs = ["ui/"] [linters] enable = ["stylecheck", "whitespace", "containedctx", "contextcheck", "decorder", "errname", "errorlint", "gofmt", "gofumpt", "goimports"] [linters-settings.goimports] -local-prefixes = "git.cgn.cleverbridge.com/infosec/vulnmon" +local-prefixes = "src.neessen.cloud/wneessen/apg-go" diff --git a/koremutake.go b/koremutake.go index 0eea139..cefcf78 100644 --- a/koremutake.go +++ b/koremutake.go @@ -6,7 +6,8 @@ package apg // KoremutakeSyllables is a slightly modified Koremutake syllables list based on // the mechanism described on https://shorl.com/koremutake.php -var KoremutakeSyllables = []string{"ba", "be", "bi", "bo", "bu", "by", "da", "de", "di", +var KoremutakeSyllables = []string{ + "ba", "be", "bi", "bo", "bu", "by", "da", "de", "di", "do", "du", "dy", "fe", "fi", "fo", "fu", "fy", "ga", "ge", "gi", "go", "gu", "gy", "ha", "he", "hi", "ho", "hu", "hy", "ja", "je", "ji", "jo", "ju", "jy", "ka", "ke", "ko", "ku", "ky", "la", "le", "li", "lo", "lu", "ly", "ma", @@ -23,4 +24,5 @@ var KoremutakeSyllables = []string{"ba", "be", "bi", "bo", "bu", "by", "da", "de "col", "ful", "get", "low", "son", "tle", "day", "pen", "pre", "ten", "tor", "ver", "ber", "can", "ple", "fer", "gen", "den", "mag", "sub", "sur", "men", "min", "out", "tal", "but", "cit", "cle", "cov", "dif", "ern", - "eve", "hap", "ket", "nal", "sup", "ted", "tem", "tin", "tro", "tro"} + "eve", "hap", "ket", "nal", "sup", "ted", "tem", "tin", "tro", "tro", +} diff --git a/random.go b/random.go index 9949fdd..776fc5d 100644 --- a/random.go +++ b/random.go @@ -318,7 +318,7 @@ func (g *Generator) generatePronounceable() (string, error) { for int64(len(password)) < length { randNum, err := g.RandNum(int64(characterSetLength)) if err != nil { - return "", fmt.Errorf("failed to generate a random number for Koremutake syllable generation: %s", + return "", fmt.Errorf("failed to generate a random number for Koremutake syllable generation: %w", err) } nextSyllable := characterSet[randNum] @@ -326,7 +326,7 @@ func (g *Generator) generatePronounceable() (string, error) { syllableLength := len(nextSyllable) characterPosition, err := g.RandNum(int64(syllableLength)) if err != nil { - return "", fmt.Errorf("failed to generate a random number for Koremutake syllable generation: %s", + return "", fmt.Errorf("failed to generate a random number for Koremutake syllable generation: %w", err) } randomChar := string(nextSyllable[characterPosition]) diff --git a/random_test.go b/random_test.go index e013497..e537123 100644 --- a/random_test.go +++ b/random_test.go @@ -322,7 +322,6 @@ func TestGeneratePronounceable(t *testing.T) { if foundSylables < 100 { t.Errorf("generatePronounceable() failed, expected at least 1 sylable, got none") } - } func TestCheckMinimumRequirements(t *testing.T) {