server name enable upper case

yunionio · Jun 23, 2020 · 6f20638 · 6f20638
1 parent 965b51c
commit 6f20638
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go
@@ -1029,7 +1029,7 @@ func (manager *SGuestManager) validateCreateData(
 		if len(input.LoginAccount) > 32 {
 			return nil, httperrors.NewInputParameterError("login_account is longer than 32 chars")
 		}
-		if err := manager.ValidateName(input.LoginAccount); err != nil {
+		if err := manager.ValidateNameLoginAccount(input.LoginAccount); err != nil {
 			return nil, err
 		}
 	}
@@ -5309,7 +5309,9 @@ func (guest *SGuest) GetUsages() []db.IUsage {
 }
 
 var (
-	serverNameREG = regexp.MustCompile(`^[a-z$][a-z0-9-${}.]*$`)
+	// `^[a-zA-Z][a-zA-Z0-9._@-]*$`)
+	serverNameREG = regexp.MustCompile(`^[a-zA-Z$][a-zA-Z0-9-${}.]*$`)
+	hostnameREG   = regexp.MustCompile(`^[a-z$][a-z0-9-${}.]*$`)
 )
 
 func (manager *SGuestManager) ValidateName(name string) error {
@@ -5318,3 +5320,10 @@ func (manager *SGuestManager) ValidateName(name string) error {
 	}
 	return httperrors.NewInputParameterError("name starts with letter, and contains letter, number and - only")
 }
+
+func (manager *SGuestManager) ValidateNameLoginAccount(name string) error {
+	if hostnameREG.MatchString(name) {
+		return nil
+	}
+	return httperrors.NewInputParameterError("name starts with letter, and contains letter, number and - only")
+}