mirror of
https://github.com/1f349/site-hosting.git
synced 2025-04-12 22:56:02 +01:00
Replace isAlphanumericOrDash with isDomainRune
This commit is contained in:
parent
fee7ed1e28
commit
79912dc5c4
@ -5,7 +5,7 @@ func IsValidSite(site string) bool {
|
||||
return false
|
||||
}
|
||||
return containsOnly(site, func(r rune) bool {
|
||||
return isAlphanumericOrDash(r) || r == '.'
|
||||
return isDomainRune(r) || r == '_'
|
||||
})
|
||||
}
|
||||
|
||||
@ -21,23 +21,12 @@ func IsValidBranch(branch string) bool {
|
||||
return false
|
||||
}
|
||||
return containsOnly(branch, func(r rune) bool {
|
||||
return isAlphanumericOrDash(r) || r == '/' || r == '.'
|
||||
return isDomainRune(r) || (r >= 'A' && r <= 'Z') || r == '_' || r == '/'
|
||||
})
|
||||
}
|
||||
|
||||
func isAlphanumericOrDash(r rune) bool {
|
||||
switch {
|
||||
case r >= '0' && r <= '9':
|
||||
return true
|
||||
case r >= 'a' && r <= 'z':
|
||||
return true
|
||||
case r >= 'A' && r <= 'Z':
|
||||
return true
|
||||
case r == '-', r == '_':
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
func isDomainRune(r rune) bool {
|
||||
return (r >= '0' && r <= '9') || (r >= 'a' && r <= 'z') || r == '-' || r == '.'
|
||||
}
|
||||
|
||||
func containsOnly(s string, f func(r rune) bool) bool {
|
||||
|
Loading…
x
Reference in New Issue
Block a user