Skip to content

[pull] main from containerd:main #219

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

Merged
pull merged 2 commits into from
Jan 21, 2026
+16 −8
Merged

[pull] main from containerd:main #219

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b11d6c
fix: sanitize error before gRPC return to prevent credential leak in …
aadhar-agarwal Jan 20, 2026
207bf2b
Merge pull request #12801 from aadhar-agarwal/aadagarwal/sanitize-grp…
mxpv Jan 21, 2026
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
24 changes: 16 additions & 8 deletions internal/cri/instrument/instrumented_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,6 @@ func (in *instrumentedService) PullImage(ctx context.Context, r *runtime.PullIma
log.G(ctx).Infof("PullImage %q", r.GetImage().GetImage())
defer func() {
if err != nil {
// Sanitize error to remove sensitive information
err = ctrdutil.SanitizeError(err)
log.G(ctx).WithError(err).Errorf("PullImage %q failed", r.GetImage().GetImage())
} else {
log.G(ctx).Infof("PullImage %q returns image reference %q",
Expand All @@ -364,6 +362,10 @@ func (in *instrumentedService) PullImage(ctx context.Context, r *runtime.PullIma
span.RecordError(err)
}()
res, err = in.c.PullImage(ctrdutil.WithNamespace(ctx), r)
// Sanitize error to remove sensitive information from both logs and returned gRPC error
if err != nil {
err = ctrdutil.SanitizeError(err)
}
return res, errgrpc.ToGRPC(err)
}

Expand All @@ -374,15 +376,17 @@ func (in *instrumentedService) ListImages(ctx context.Context, r *runtime.ListIm
log.G(ctx).Tracef("ListImages with filter %+v", r.GetFilter())
defer func() {
if err != nil {
// Sanitize error to remove sensitive information
err = ctrdutil.SanitizeError(err)
log.G(ctx).WithError(err).Errorf("ListImages with filter %+v failed", r.GetFilter())
} else {
log.G(ctx).Tracef("ListImages with filter %+v returns image list %+v",
r.GetFilter(), res.GetImages())
}
}()
res, err = in.c.ListImages(ctrdutil.WithNamespace(ctx), r)
// Sanitize error to remove sensitive information from both logs and returned gRPC error
if err != nil {
err = ctrdutil.SanitizeError(err)
}
return res, errgrpc.ToGRPC(err)
}

Expand All @@ -393,15 +397,17 @@ func (in *instrumentedService) ImageStatus(ctx context.Context, r *runtime.Image
log.G(ctx).Tracef("ImageStatus for %q", r.GetImage().GetImage())
defer func() {
if err != nil {
// Sanitize error to remove sensitive information
err = ctrdutil.SanitizeError(err)
log.G(ctx).WithError(err).Errorf("ImageStatus for %q failed", r.GetImage().GetImage())
} else {
log.G(ctx).Tracef("ImageStatus for %q returns image status %+v",
r.GetImage().GetImage(), res.GetImage())
}
}()
res, err = in.c.ImageStatus(ctrdutil.WithNamespace(ctx), r)
// Sanitize error to remove sensitive information from both logs and returned gRPC error
if err != nil {
err = ctrdutil.SanitizeError(err)
}
return res, errgrpc.ToGRPC(err)
}

Expand All @@ -413,15 +419,17 @@ func (in *instrumentedService) RemoveImage(ctx context.Context, r *runtime.Remov
log.G(ctx).Infof("RemoveImage %q", r.GetImage().GetImage())
defer func() {
if err != nil {
// Sanitize error to remove sensitive information
err = ctrdutil.SanitizeError(err)
log.G(ctx).WithError(err).Errorf("RemoveImage %q failed", r.GetImage().GetImage())
} else {
log.G(ctx).Infof("RemoveImage %q returns successfully", r.GetImage().GetImage())
}
span.RecordError(err)
}()
res, err := in.c.RemoveImage(ctrdutil.WithNamespace(ctx), r)
// Sanitize error to remove sensitive information from both logs and returned gRPC error
if err != nil {
err = ctrdutil.SanitizeError(err)
}
return res, errgrpc.ToGRPC(err)
}

Expand Down
Loading