fix: dns name pattern revisited

This commit is contained in:
Qiu Jian
2020-04-24 21:55:43 +08:00
parent c573880cc7
commit fa820b8740
2 changed files with 12 additions and 2 deletions
+1 -1
View File
@@ -115,7 +115,7 @@ func GenerateName2(manager IModelManager, ownerId mcclient.IIdentityProvider, hi
}
var (
dnsNameREG = regexp.MustCompile(`^[a-zA-Z][a-zA-Z0-9-]*$`)
dnsNameREG = regexp.MustCompile(`^[a-z][a-z0-9-]*$`)
)
type SDnsNameValidatorManager struct{}
+11 -1
View File
@@ -69,7 +69,6 @@ type SGuestManager struct {
db.SVirtualResourceBaseManager
db.SExternalizedResourceBaseManager
SDeletePreventableResourceBaseManager
db.SDnsNameValidatorManager
SHostResourceBaseManager
SBillingResourceBaseManager
@@ -5226,3 +5225,14 @@ func (guest *SGuest) GetUsages() []db.IUsage {
&regionUsage,
}
}
var (
serverNameREG = regexp.MustCompile(`^[a-z$][a-z0-9-${}.]*$`)
)
func (manager *SGuestManager) ValidateName(name string) error {
if serverNameREG.MatchString(name) {
return nil
}
return httperrors.NewInputParameterError("name starts with letter, and contains letter, number and - only")
}