Filter cnb credentials from log output (#3864)

Co-authored-by: Ralf Pannemans <[email protected]> Co-authored-by: Sam Gunaratne <[email protected]>
cloudfoundry · Jul 17, 2024 · 2aeb04f · 2aeb04f
1 parent c3ab524
commit 2aeb04f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/messages/app_manifest_message.rb b/app/messages/app_manifest_message.rb
@@ -118,8 +118,9 @@ def manifest_routes_update_message
     end
 
     def audit_hash
-      overrides = original_yaml['env'] ? { 'env' => Presenters::Censorship::PRIVATE_DATA_HIDDEN } : {}
-      original_yaml.merge(overrides)
+      override_env = original_yaml['env'] ? { 'env' => Presenters::Censorship::PRIVATE_DATA_HIDDEN } : {}
+      override_cnb = original_yaml['cnb-credentials'] ? { 'cnb-credentials' => Presenters::Censorship::PRIVATE_DATA_HIDDEN } : {}
+      original_yaml.merge(override_env).merge(override_cnb)
     end
 
     def app_lifecycle_hash

diff --git a/spec/unit/messages/app_manifest_message_spec.rb b/spec/unit/messages/app_manifest_message_spec.rb
@@ -1323,6 +1323,12 @@ module VCAP::CloudController
             { 'route' => 'existing.example.com' },
             { 'route' => 'another.example.com' }
           ],
+          'cnb-credentials' => {
+            'example.org' => {
+              'username' => 'foo',
+              'password' => 'bar'
+            }
+          },
           'processes' => [{
             'type' => 'type',
             'command' => 'command',
@@ -1349,6 +1355,7 @@ module VCAP::CloudController
             { 'route' => 'existing.example.com' },
             { 'route' => 'another.example.com' }
           ],
+          'cnb-credentials' => '[PRIVATE DATA HIDDEN]',
           'processes' => [{
             'type' => 'type',
             'command' => 'command',