Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-19 13:29:41 +02:00
Code Issues Releases Activity

fix(validate): refactor validate functions [BE-11574] (#683)

Browse source
This commit is contained in:
Devon Steenberg 2025-04-24 08:59:44 +12:00 • committed by GitHub
parent 1a3df54c04
commit 4e4fd5a4b4
2 changed files with 25 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

45
pkg/validate/validate.go
View file

@ -6,62 +6,33 @@ import (
"regexp"
"strings"
"unicode/utf8"
)
const (
minURLRuneCount = 3
maxURLRuneCount = 2083
ipPattern = `(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))`
urlSchemaPattern = `((ftp|tcp|udp|wss?|https?):\/\/)`
urlUsernamePattern = `(\S+(:\S*)?@)`
urlPathPattern = `((\/|\?|#)[^\s]*)`
urlPortPattern = `(:(\d{1,5}))`
urlIPPattern = `([1-9]\d?|1\d\d|2[01]\d|22[0-3]|24\d|25[0-5])(\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])){2}(?:\.([0-9]\d?|1\d\d|2[0-4]\d|25[0-5]))`
urlSubdomainPattern = `((www\.)|([a-zA-Z0-9]+([-_\.]?[a-zA-Z0-9])*[a-zA-Z0-9]\.[a-zA-Z0-9]+))`
urlPattern = `^` + urlSchemaPattern + `?` + urlUsernamePattern + `?` + `((` + urlIPPattern + `|(\[` + ipPattern + `\])|(([a-zA-Z0-9]([a-zA-Z0-9-_]+)?[a-zA-Z0-9]([-\.][a-zA-Z0-9]+)*)|(` + urlSubdomainPattern + `?))?(([a-zA-Z\x{00a1}-\x{ffff}0-9]+-?-?)*[a-zA-Z\x{00a1}-\x{ffff}0-9]+)(?:\.([a-zA-Z\x{00a1}-\x{ffff}]{1,}))?))\.?` + urlPortPattern + `?` + urlPathPattern + `?$`
"github.com/google/uuid"
)
var (
urlRegex = regexp.MustCompile(urlPattern)
uuidRegex = regexp.MustCompile(`^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$`)
hexadecimalRegex = regexp.MustCompile(`^[0-9a-fA-F]+$`)
whitespaceRegex = regexp.MustCompile(`^[[:space:]]+$`)
dnsNameRegex = regexp.MustCompile(`^([a-zA-Z0-9_]{1}[a-zA-Z0-9_-]{0,62}){1}(\.[a-zA-Z0-9_]{1}[a-zA-Z0-9_-]{0,62})*[\._]?$`)
)
func IsURL(urlString string) bool {
if urlString == "" ||
utf8.RuneCountInString(urlString) >= maxURLRuneCount ||
len(urlString) <= minURLRuneCount ||
strings.HasPrefix(urlString, ".") {
if len(urlString) == 0 {
return false
}
strTemp := urlString
if strings.Contains(urlString, ":") && !strings.Contains(urlString, "://") {
// support no indicated urlscheme but with colon for port number
// http:// is appended so url.Parse will succeed, strTemp used so it does not impact rxURL.MatchString
if !strings.Contains(urlString, "://") {
// support no indicated urlscheme
// http:// is appended so url.Parse will succeed
strTemp = "http://" + urlString
}
u, err := url.Parse(strTemp)
if err != nil {
return false
}
if strings.HasPrefix(u.Host, ".") {
return false
}
if u.Host == "" && (u.Path != "" && !strings.Contains(u.Path, ".")) {
return false
}
return urlRegex.MatchString(urlString)
return err == nil && u.Host != ""
}
func IsUUID(uuidString string) bool {
return uuidRegex.MatchString(uuidString)
return uuid.Validate(uuidString) == nil
}
func IsHexadecimal(hexString string) bool {
@ -69,7 +40,7 @@ func IsHexadecimal(hexString string) bool {
}
func HasWhitespaceOnly(s string) bool {
return len(s) > 0 && whitespaceRegex.MatchString(s)
return len(s) > 0 && strings.TrimSpace(s) == ""
}
func MinStringLength(s string, len int) bool {