guillaume/sshm
1
0
Fork 0
mirror of https://github.com/Gu1llaum-3/sshm.git synced 2026-01-27 03:04:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: problems with quotes from Host names and support SSH tokens (issue #32)

Browse Source
This commit is contained in:
Gu1llaum-3
2026-01-04 22:21:13 +01:00
parent 8f780e288c
commit 87f8fb9c6c
4 changed files with 119 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/validation/ssh.go
View File

@@ -11,6 +11,7 @@ import (
)
// ValidateHostname checks if a hostname is valid
// Accepts regular hostnames, IP addresses, and SSH tokens like %h, %p, %r, %u, %n, %C, %d, %i, %k, %L, %l, %T
func ValidateHostname(hostname string) bool {
if len(hostname) == 0 || len(hostname) > 253 {
return false
@@ -22,7 +23,18 @@ func ValidateHostname(hostname string) bool {
return false
}
hostnameRegex := regexp.MustCompile(`^[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?)*$`)
// Check if hostname contains SSH tokens (e.g., %h, %p, %r, %u, %n, etc.)
// SSH tokens are documented in ssh_config(5) man page
sshTokenRegex := regexp.MustCompile(`%[hprunCdiklLT]`)
if sshTokenRegex.MatchString(hostname) {
// If it contains SSH tokens, it's a valid SSH config construct
return true
}
// RFC 1123: each label must start with alphanumeric, end with alphanumeric,
// and contain only alphanumeric and hyphens. Labels are 1-63 chars.
// A hostname is one or more labels separated by dots.
hostnameRegex := regexp.MustCompile(`^[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]|[a-zA-Z0-9]{0,62})?(\.[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]|[a-zA-Z0-9]{0,62})?)*$`)
return hostnameRegex.MatchString(hostname)
}

13
internal/validation/ssh_test.go
View File

@@ -24,6 +24,19 @@ func TestValidateHostname(t *testing.T) {
{"hostname ending with dot", "example.com.", false},
{"hostname with hyphen", "my-server.com", true},
{"hostname starting with number", "1example.com", true},
{"multiple hyphens and subdomains", "my-host-name-01.cwd.pub.domain.net", true},
{"multiple hyphens", "my-host-name-01", true},
{"complex hostname with hyphens", "server-01-prod.data-center.example.com", true},
{"hostname with consecutive hyphens", "my--server.com", true},
{"single char labels", "a.b.c.d.com", true},
// SSH tokens support (issue #32 comment)
{"SSH token %h", "%h.server.com", true},
{"SSH token %p", "server.com:%p", true},
{"SSH token %r", "%r@server.com", true},
{"SSH token %u", "%u.example.com", true},
{"SSH token %n", "%n.domain.net", true},
{"SSH token %C", "host-%C.com", true},
{"multiple SSH tokens", "%h.%u.server.com", true},
}
for _, tt := range tests {