wneessen/apg-go
1
1
Fork 0
mirror of https://github.com/wneessen/apg-go.git synced 2024-11-22 13:50:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor character counting logic in password validation

Browse source 
The repetitive code used for password character counting in different scenarios has been consolidated into a single function, matchesMinimumAmount(). This extraction simplifies the main function and makes the code more maintainable, while maintaining the functionality of checking whether the password meets certain character count criteria.
This commit is contained in:
Winni Neessen 2024-03-14 22:54:36 +01:00
parent cc45ec1119
commit 4ee6b6651b
Signed by: wneessen
GPG key ID: 5F3AF39B820C119D
1 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
random.go
View file

@ -229,13 +229,7 @@ func (g *Generator) checkMinimumRequirements(password string) bool {
charRange = CharRangeAlphaLower charRange = CharRangeAlphaLower
} }
count := 0 matchesMinimumAmount(charRange, password, g.config.MinLowerCase, &ok)
for _, char := range charRange {
count += strings.Count(password, string(char))
}
if int64(count) < g.config.MinLowerCase {
ok = false
}
} }
if g.config.MinNumeric > 0 { if g.config.MinNumeric > 0 {
var charRange string var charRange string
@ -246,13 +240,7 @@ func (g *Generator) checkMinimumRequirements(password string) bool {
charRange = CharRangeNumeric charRange = CharRangeNumeric
} }
count := 0 matchesMinimumAmount(charRange, password, g.config.MinNumeric, &ok)
for _, char := range charRange {
count += strings.Count(password, string(char))
}
if int64(count) < g.config.MinNumeric {
ok = false
}
} }
if g.config.MinSpecial > 0 { if g.config.MinSpecial > 0 {
var charRange string var charRange string
@ -263,13 +251,7 @@ func (g *Generator) checkMinimumRequirements(password string) bool {
charRange = CharRangeSpecial charRange = CharRangeSpecial
} }
count := 0 matchesMinimumAmount(charRange, password, g.config.MinSpecial, &ok)
for _, char := range charRange {
count += strings.Count(password, string(char))
}
if int64(count) < g.config.MinSpecial {
ok = false
}
} }
if g.config.MinUpperCase > 0 { if g.config.MinUpperCase > 0 {
var charRange string var charRange string
@ -280,13 +262,7 @@ func (g *Generator) checkMinimumRequirements(password string) bool {
charRange = CharRangeAlphaUpper charRange = CharRangeAlphaUpper
} }
count := 0 matchesMinimumAmount(charRange, password, g.config.MinUpperCase, &ok)
for _, char := range charRange {
count += strings.Count(password, string(char))
}
if int64(count) < g.config.MinUpperCase {
ok = false
}
} }
return ok return ok
} }
@ -359,3 +335,16 @@ func (g *Generator) generateRandom() (string, error) {
return password, nil return password, nil
} }
// matchesMinimumAmount checks if the number of occurrences of characters in
// charRange in the password is less than minAmount and updates the
// value of ok accordingly.
func matchesMinimumAmount(charRange, password string, minAmount int64, ok *bool) {
count := 0
for _, char := range charRange {
count += strings.Count(password, string(char))
}
if int64(count) < minAmount {
*ok = false
}
}