Merge pull request #17986 from lfu/password_log_1619385

Add regex for dialog password fields. (cherry picked from commit cadcbc7) https://bugzilla.redhat.com/show_bug.cgi?id=1634808
ManageIQ · Oct 1, 2018 · 043a181 · 043a181
1 parent c096f2f
commit 043a181
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/models/miq_request_workflow.rb b/app/models/miq_request_workflow.rb
@@ -27,7 +27,7 @@ def self.encrypted_options_fields
   end
 
   def self.encrypted_options_field_regs
-    encrypted_options_fields.map { |f| /\[:#{f}\]/ }
+    encrypted_options_fields.map { |f| /\[:#{f}\]/ } + [/password::/]
   end
 
   def self.all_encrypted_options_fields

diff --git a/spec/models/miq_request_workflow_spec.rb b/spec/models/miq_request_workflow_spec.rb
@@ -638,4 +638,10 @@
       expect(workflow.storage_to_hash_struct(storage).storage_clusters).to be_nil
     end
   end
+
+  context '.encrypted_options_field_regs' do
+    it 'includes "password::"' do
+      expect(MiqRequestWorkflow.encrypted_options_field_regs).to include(/password::/)
+    end
+  end
 end