Assclaw/jfa-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use typescript for form.html in separate file, allow customization of

Browse Source 
requirement strings

Password requirement text is now loaded by the typescript, and can be
customized by changing the validationStrings variable. See wiki for more
info.
This commit is contained in:
Harvey Tindall
2020-10-20 23:00:30 +01:00
parent 2f9965bcda
commit 9abb177427
6 changed files with 220 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pwval.go
+15 -23
View File
@@ -1,8 +1,6 @@
package main
import (
"fmt"
"strings"
"unicode"
)
@@ -21,11 +19,11 @@ func (vd *Validator) init(criteria ValidatorConf) {
// This isn't used, its for swagger
type PasswordValidation struct {
Characters bool `json:"characters,omitempty"` // Number of characters
Lowercase bool `json:"lowercase characters,omitempty"` // Number of lowercase characters
Uppercase bool `json:"uppercase characters,omitempty"` // Number of uppercase characters
Numbers bool `json:"numbers,omitempty"` // Number of numbers
Specials bool `json:"special characters,omitempty"` // Number of special characters
Characters bool `json:"length,omitempty"` // Number of characters
Lowercase bool `json:"lowercase,omitempty"` // Number of lowercase characters
Uppercase bool `json:"uppercase,omitempty"` // Number of uppercase characters
Numbers bool `json:"number,omitempty"` // Number of numbers
Specials bool `json:"special,omitempty"` // Number of special characters
}
func (vd *Validator) validate(password string) map[string]bool {
@@ -34,17 +32,17 @@ func (vd *Validator) validate(password string) map[string]bool {
count[key] = 0
}
for _, c := range password {
count["characters"] += 1
count["length"] += 1
if unicode.IsUpper(c) {
count["uppercase characters"] += 1
count["uppercase"] += 1
} else if unicode.IsLower(c) {
count["lowercase characters"] += 1
count["lowercase"] += 1
} else if unicode.IsNumber(c) {
count["numbers"] += 1
} else {
for _, s := range vd.specialChars {
if c == s {
count["special characters"] += 1
count["special"] += 1
}
}
}
@@ -60,18 +58,12 @@ func (vd *Validator) validate(password string) map[string]bool {
return results
}
func (vd *Validator) getCriteria() map[string]string {
lines := map[string]string{}
for criterion, min := range vd.criteria {
if min > 0 {
text := fmt.Sprintf("Must have at least %d ", min)
if min == 1 {
text += strings.TrimSuffix(criterion, "s")
} else {
text += criterion
}
lines[criterion] = text
func (vd *Validator) getCriteria() ValidatorConf {
criteria := ValidatorConf{}
for key, num := range vd.criteria {
if num != 0 {
criteria[key] = num
}
}
return lines
return criteria
}