From 3c3c1e31c448d6fb69159e40a91119443c844e20 Mon Sep 17 00:00:00 2001 From: Daniel Berger Date: Fri, 2 Dec 2016 09:25:03 -0700 Subject: [PATCH 1/3] Add password validation regex, as well as min and max length. --- .../miq_dialogs/miq_provision_azure_dialogs_template.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/product/dialogs/miq_dialogs/miq_provision_azure_dialogs_template.yaml b/product/dialogs/miq_dialogs/miq_provision_azure_dialogs_template.yaml index 3171b534ca9..5b323f26d5d 100644 --- 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,13 @@ :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: true :display: :edit :data_type: :string + :min_length: 12 + :max_length: 72 :hostname: :description: Host Name :required: false From a8fa7511ebd09d78a46a0e64efaffb1063b556d1 Mon Sep 17 00:00:00 2001 From: Daniel Berger Date: Fri, 2 Dec 2016 15:56:31 -0700 Subject: [PATCH 2/3] Added a regex failure message. --- .../miq_dialogs/miq_provision_azure_dialogs_template.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/product/dialogs/miq_dialogs/miq_provision_azure_dialogs_template.yaml b/product/dialogs/miq_dialogs/miq_provision_azure_dialogs_template.yaml index 5b323f26d5d..7eb8aaf68d4 100644 --- a/product/dialogs/miq_dialogs/miq_provision_azure_dialogs_template.yaml +++ b/product/dialogs/miq_dialogs/miq_provision_azure_dialogs_template.yaml @@ -357,6 +357,7 @@ :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 From 28210c1130f0bab6d682eb412108a30e69ab8f29 Mon Sep 17 00:00:00 2001 From: Daniel Berger Date: Fri, 2 Dec 2016 15:56:50 -0700 Subject: [PATCH 3/3] Enable update field visibility. --- .../manageiq/providers/cloud_manager/provision_workflow.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/manageiq/providers/cloud_manager/provision_workflow.rb b/app/models/manageiq/providers/cloud_manager/provision_workflow.rb index 1c069a9ac0b..7da381ecb5a 100644 --- 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