mirror of
https://github.com/joohoi/acme-dns.git
synced 2025-07-24 22:58:17 +07:00
Refactoring
This commit is contained in:
@ -6,7 +6,7 @@ import (
|
||||
"unicode/utf8"
|
||||
)
|
||||
|
||||
func GetValidUsername(u string) (uuid.UUID, error) {
|
||||
func getValidUsername(u string) (uuid.UUID, error) {
|
||||
uname, err := uuid.FromString(u)
|
||||
if err != nil {
|
||||
return uuid.UUID{}, err
|
||||
@ -14,8 +14,8 @@ func GetValidUsername(u string) (uuid.UUID, error) {
|
||||
return uname, nil
|
||||
}
|
||||
|
||||
func ValidKey(k string) bool {
|
||||
kn := SanitizeString(k)
|
||||
func validKey(k string) bool {
|
||||
kn := sanitizeString(k)
|
||||
if utf8.RuneCountInString(k) == 40 && utf8.RuneCountInString(kn) == 40 {
|
||||
// Correct length and all chars valid
|
||||
return true
|
||||
@ -23,7 +23,7 @@ func ValidKey(k string) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func ValidSubdomain(s string) bool {
|
||||
func validSubdomain(s string) bool {
|
||||
_, err := uuid.FromString(s)
|
||||
if err == nil {
|
||||
return true
|
||||
@ -31,8 +31,8 @@ func ValidSubdomain(s string) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func ValidTXT(s string) bool {
|
||||
sn := SanitizeString(s)
|
||||
func validTXT(s string) bool {
|
||||
sn := sanitizeString(s)
|
||||
if utf8.RuneCountInString(s) == 43 && utf8.RuneCountInString(sn) == 43 {
|
||||
// 43 chars is the current LE auth key size, but not limited / defined by ACME
|
||||
return true
|
||||
@ -40,7 +40,7 @@ func ValidTXT(s string) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func CorrectPassword(pw string, hash string) bool {
|
||||
func correctPassword(pw string, hash string) bool {
|
||||
if err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(pw)); err == nil {
|
||||
return true
|
||||
}
|
||||
|
Reference in New Issue
Block a user