mirrors/acme-dns
1
0
Fork 0
mirror of https://github.com/joohoi/acme-dns.git synced 2024-12-22 15:43:45 +07:00
Code Issues Packages Projects Releases Wiki Activity

relax subdomain validation from UUID to actual subdomain (#243)

Browse Source
This commit is contained in:
Jonathan Vanasco 2021-01-11 07:55:31 -05:00 committed by GitHub
parent d573f771a8
commit 9c6ca258e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
validation.go
View File

@ -5,6 +5,8 @@ import (
"github.com/google/uuid"
"golang.org/x/crypto/bcrypt"
"regexp"
)
func getValidUsername(u string) (uuid.UUID, error) {
@ -25,13 +27,12 @@ func validKey(k string) bool {
}
func validSubdomain(s string) bool {
_, err := uuid.Parse(s)
if err == nil {
return true
}
return false
// URL safe base64 alphabet without padding as defined in ACME
RegExp := regexp.MustCompile("^[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?$")
return RegExp.MatchString(s)
}
func validTXT(s string) bool {
sn := sanitizeString(s)
if utf8.RuneCountInString(s) == 43 && utf8.RuneCountInString(sn) == 43 {

4
validation_test.go
View File

@ -55,7 +55,9 @@ func TestGetValidSubdomain(t *testing.T) {
output bool
}{
{"a097455b-52cc-4569-90c8-7a4b97c6eba8", true},
{"a-97455b-52cc-4569-90c8-7a4b97c6eba8", false},
{"a-97455b-52cc-4569-90c8-7a4b97c6eba8", true},
{"foo.example.com", false},
{"foo-example-com", true},
{"", false},
{"&!#!25123!%!'%", false},
} {