Suppress nested causes for sensitive exceptions

This will prevent sensitive data from leaking into debug_stacktrace output.

Signed-off-by: John Snow <thelunaticscripter@outlook.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/chef/application.rb b/lib/chef/application.rb
index b8acf41557..0d221ec878 100644
--- a/lib/chef/application.rb
+++ b/lib/chef/application.rb
@@ -360,10 +360,12 @@ class Chef
       def debug_stacktrace(e)
         message = "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
 
-        cause = e.cause if e.respond_to?(:cause)
-        until cause.nil?
-          message << "\n\n>>>> Caused by #{cause.class}: #{cause}\n#{cause.backtrace.join("\n")}"
-          cause = cause.respond_to?(:cause) ? cause.cause : nil
+        unless (e.message =~ /suppressed for sensitive resource/)
+          cause = e.cause if e.respond_to?(:cause)
+          until cause.nil?
+            message << "\n\n>>>> Caused by #{cause.class}: #{cause}\n#{cause.backtrace.join("\n")}"
+            cause = cause.respond_to?(:cause) ? cause.cause : nil
+          end
         end
 
         chef_stacktrace_out = "Generated at #{Time.now}\n"