Mirrors/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-01-23 02:24:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

util/dns: fix variable redeclaration in ValidateDNSName

Browse source
This commit is contained in:
Kristoffer Dalby 2026-01-14 12:21:45 +00:00
parent 00f22a8443
commit a6696582a4
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hscontrol/util/dns.go
View file

@ -43,6 +43,7 @@ func ValidateUsername(username string) error {
} }
atCount := 0 atCount := 0
for _, char := range username { for _, char := range username {
switch { switch {
case unicode.IsLetter(char), case unicode.IsLetter(char),
@ -87,18 +88,21 @@ func ValidateHostname(name string) error {
strings.ToLower(name), strings.ToLower(name),
) )
} }
if strings.HasPrefix(name, "-") || strings.HasSuffix(name, "-") { if strings.HasPrefix(name, "-") || strings.HasSuffix(name, "-") {
return fmt.Errorf( return fmt.Errorf(
"hostname %q cannot start or end with a hyphen", "hostname %q cannot start or end with a hyphen",
name, name,
) )
} }
if strings.HasPrefix(name, ".") || strings.HasSuffix(name, ".") { if strings.HasPrefix(name, ".") || strings.HasSuffix(name, ".") {
return fmt.Errorf( return fmt.Errorf(
"hostname %q cannot start or end with a dot", "hostname %q cannot start or end with a dot",
name, name,
) )
} }
if invalidDNSRegex.MatchString(name) { if invalidDNSRegex.MatchString(name) {
return fmt.Errorf( return fmt.Errorf(
"hostname %q contains invalid characters, only lowercase letters, numbers, hyphens and dots are allowed", "hostname %q contains invalid characters, only lowercase letters, numbers, hyphens and dots are allowed",
@ -120,7 +124,8 @@ func ValidateHostname(name string) error {
// After transformation, validates the result. // After transformation, validates the result.
func NormaliseHostname(name string) (string, error) { func NormaliseHostname(name string) (string, error) {
// Early return if already valid // Early return if already valid
if err := ValidateHostname(name); err == nil { err := ValidateHostname(name)
if err == nil {
return name, nil return name, nil
} }
@ -136,7 +141,8 @@ func NormaliseHostname(name string) (string, error) {
} }
// Validate result after transformation // Validate result after transformation
if err := ValidateHostname(name); err != nil { err = ValidateHostname(name)
if err != nil {
return "", fmt.Errorf( return "", fmt.Errorf(
"hostname invalid after normalisation: %w", "hostname invalid after normalisation: %w",
err, err,