Skip to content

Conversation

@aadhar-agarwal
Copy link
Contributor

@aadhar-agarwal aadhar-agarwal commented Jan 26, 2026

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?

  • Backports a fix for a credential leak vulnerability in containerd2's CRI error handling. When image pulls fail from private registries using URL-based authentication (e.g., Azure Blob Storage with SAS tokens), sensitive query parameters were being exposed in both containerd logs and Kubernetes pod events (visible via kubectl describe pod).
Change Log
  • Adds fix-credential-leak-in-cri-errors.patch containing two upstream commits:
  • Bumps release to 2.0.0-17
Does this affect the toolchain?

NO

Associated issues
Test Methodology
  • Buddy build Pass
  • Tested the containerd fix on an AKS cluster running Azure Linux 3.0. Created an image pull failure scenario by blocking blob storage IPs with iptables REJECT rules, then deployed a pod referencing an ACR image. Both kubectl describe pod events and journalctl -u containerd logs show all SAS token query parameters properly replaced with [REDACTED]. The fix successfully prevents credential exposure in error messages when image pulls fail.
  • Running the pre-release AKS tests

- Add fix-credential-leak-in-cri-errors.patch to sanitize sensitive
  information (query parameters like SAS tokens) from error messages
  in CRI image operations (PullImage, ListImages, ImageStatus, RemoveImage)
- Prevents credentials from leaking into containerd logs and Kubernetes
  pod events visible via kubectl describe pod
- Bump release to 17
@microsoft-github-policy-service microsoft-github-policy-service bot added Packaging 3.0-dev PRs Destined for AzureLinux 3.0 labels Jan 26, 2026
@aadhar-agarwal aadhar-agarwal marked this pull request as ready for review January 27, 2026 00:23
@aadhar-agarwal aadhar-agarwal requested a review from a team as a code owner January 27, 2026 00:23
@andrey-noskov
Copy link
Member

lgtm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3.0-dev PRs Destined for AzureLinux 3.0 Packaging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants