From 1d1011ebc461974a9a26513e05faa191aa3560f8 Mon Sep 17 00:00:00 2001 From: teru Date: Mon, 1 Aug 2016 13:53:10 +0900 Subject: [PATCH] Change regexp pattern --- valid.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/valid.go b/valid.go index f2e828a..8061cd3 100644 --- a/valid.go +++ b/valid.go @@ -18,35 +18,35 @@ var ( // validDomainName returns true if the input is correct format. func validDomainName(name string) bool { - return regexp.MustCompile(`^([A-Za-z0-9][A-Za-z0-9\-]{1,61}[A-Za-z0-9]\.)*[A-Za-z]+$`).MatchString(name) + return regexp.MustCompile(`^([A-Za-z0-9\-]+\.)*[A-Za-z]+$`).MatchString(name) } // validAliasDomainName returns true if the input is correct format. func validAliasDomainName(name string) bool { - return regexp.MustCompile(`^([A-Za-z0-9][A-Za-z0-9\-]{1,61}[A-Za-z0-9]\.)*[A-Za-z]+$`).MatchString(name) + return regexp.MustCompile(`^([A-Za-z0-9\-]+\.)*[A-Za-z]+$`).MatchString(name) } // validAliasDomainTarget returns true if the input is correct format. func validAliasDomainTarget(target string) bool { - return regexp.MustCompile(`^([A-Za-z0-9][A-Za-z0-9\-]{1,61}[A-Za-z0-9]\.)*[A-Za-z]+$`).MatchString(target) + return regexp.MustCompile(`^([A-Za-z0-9\-]+\.)*[A-Za-z]+$`).MatchString(target) } // validUserName returns true if the input is correct format. func validUserName(name string) bool { - return regexp.MustCompile(`^[^\s]+$`).MatchString(name) + return regexp.MustCompile(`^[^\s@]+$`).MatchString(name) } // validAliasUserName returns true if the input is correct format. func validAliasUserName(name string) bool { - return regexp.MustCompile(`^[^\s]+$`).MatchString(name) + return regexp.MustCompile(`^[^\s@]+$`).MatchString(name) } // validAliasUserTarget returns true if the input is correct format. func validAliasUserTarget(target string) bool { - return regexp.MustCompile(`^[^\s]+@([A-Za-z0-9][A-Za-z0-9\-]{1,61}[A-Za-z0-9]\.)*[A-Za-z]+$`).MatchString(target) + return regexp.MustCompile(`^[^\s@]+@([A-Za-z0-9\-]+\.)*[A-Za-z]+$`).MatchString(target) } // validCatchAllUserName returns true if the input is correct format. func validCatchAllUserName(name string) bool { - return regexp.MustCompile(`^[^\s]+$`).MatchString(name) + return regexp.MustCompile(`^[^\s@]+$`).MatchString(name) }