Merge pull request #12967 from djberg96/service_dialog_root_password

Add root password validation regex for Azure dialog
ManageIQ · Dec 5, 2016 · 3fe2410 · 3fe2410
2 parents 556c643 + 28210c1
commit 3fe2410
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/models/manageiq/providers/cloud_manager/provision_workflow.rb b/app/models/manageiq/providers/cloud_manager/provision_workflow.rb
@@ -69,7 +69,7 @@ def set_or_default_hardware_field_values(_vm)
   end
 
   def update_field_visibility
-    show_dialog(:customize, :show, "disabled")
+    show_dialog(:customize, :show, "enabled")
     super(:force_platform => 'linux')
   end
 

diff --git a/product/dialogs/miq_dialogs/miq_provision_azure_dialogs_template.yaml b/product/dialogs/miq_dialogs/miq_provision_azure_dialogs_template.yaml
@@ -355,9 +355,14 @@
           :data_type: :string
         :root_password:
           :description: Password
+          :required_method: :validate_regex
+          :required_regex: !ruby/regexp /[(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])[\W\D].*?]{12,72}$/
+          :required_regex_fail_details: The password must be 12-72 characters, contain at least one lowercase English character, one uppercase English character, and one number.
           :required: true
           :display: :edit
           :data_type: :string
+          :min_length: 12
+          :max_length: 72
         :hostname:
           :description: Host Name
           :required: false