Skip to content

[release-4.19] OCPBUGS-76831: machine-config-daemon: openshift: Exposure of Sensitive Data in Log Files in the Machine Configuration Daemon. [openshift-4] #5658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
openshift-cherrypick-robot wants to merge 1 commit into
base: release-4.19
Choose a base branch
from
Open

[release-4.19] OCPBUGS-76831: machine-config-daemon: openshift: Exposure of Sensitive Data in Log Files in the Machine Configuration Daemon. [openshift-4] #5658

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkg/daemon/on_disk_validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (

ign2types "github.com/coreos/ignition/config/v2_2/types"
ign3types "github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/google/go-cmp/cmp"
mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common"
"k8s.io/apimachinery/pkg/util/sets"
Expand Down Expand Up @@ -248,7 +247,9 @@ func checkFileContentsAndMode(filePath string, expectedContent []byte, mode os.F
return fmt.Errorf("could not read file %q: %w", filePath, err)
}
if !bytes.Equal(contents, expectedContent) {
klog.Errorf("content mismatch for file %q (-want +got):\n%s", filePath, cmp.Diff(expectedContent, contents))
// Removing file contents logs to prevent accidental exposure of secrets.
klog.Errorf("content mismatch for file %q (expected %d bytes, got %d bytes)",
filePath, len(expectedContent), len(contents))
return fmt.Errorf("content mismatch for file %q", filePath)
}
return nil
Expand Down