mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-09-19 10:46:58 +08:00
fix: dns name pattern revisited
This commit is contained in:
@@ -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{}
|
||||
|
||||
@@ -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 {
|
||||
®ionUsage,
|
||||
}
|
||||
}
|
||||
|
||||
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")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user