Skip to content
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.

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

[24.05] gh: 2.49.2 -> 2.63.0 #359431

Merged
merged 15 commits into from
Dec 10, 2024

Conversation

LeSuisse
Copy link
Contributor

@LeSuisse LeSuisse commented Nov 26, 2024

Fixes GHSA-p2h2-3vg9-4p87 and GHSA-jwcm-9g39-pmcw

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@LeSuisse LeSuisse added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Nov 26, 2024
@Pandapip1 Pandapip1 added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 26, 2024
@ofborg ofborg bot requested a review from zowoq November 27, 2024 18:38
@afh
Copy link
Member

afh commented Nov 27, 2024

Result of nixpkgs-review pr 359431 run on aarch64-darwin 1

3 packages built:
  • gh (github-cli)
  • gh-f
  • gh-notify

Copy link
Member

@afh afh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this, @LeSuisse, very helpful 👍

@afh afh added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Nov 27, 2024
@afh
Copy link
Member

afh commented Nov 27, 2024

⚠️ Please note that gh 2.63.0 has been released containing a security fix for GHSA-jwcm-9g39-pmcw

Edit: Merged PR for update of gh nixpkg: #359702

afh and others added 15 commits November 30, 2024 12:42
(cherry picked from commit 7d4f2aa)
(cherry picked from commit 2cf330c)
(cherry picked from commit f67d66a)
(cherry picked from commit bb750cd)
(cherry picked from commit 908882d)
(cherry picked from commit 7b432e3)
Diff: cli/cli@v2.56.0...v2.57.0
Changelog: https://github.com/cli/cli/releases/tag/v2.57.0
Signed-off-by: Muhammad Falak R Wani <[email protected]>
(cherry picked from commit 20e25eb)
(cherry picked from commit 79284a1)
(cherry picked from commit 1e3da2d)
(cherry picked from commit 8b77143)
(cherry picked from commit b5394df)
(cherry picked from commit 52b48e2)
(cherry picked from commit 64d681a)
@LeSuisse LeSuisse force-pushed the gh-CVE-2024-52308-24.05 branch from e0411bb to 1b199d0 Compare November 30, 2024 11:44
@LeSuisse
Copy link
Contributor Author

I changed the approach and backported the version bumps, looking at the changelogs I did not see an explicit breaking change.

I went this way because the changes for GHSA-jwcm-9g39-pmcw seems to be split in various patches and do not seem to apply cleanly.

@LeSuisse LeSuisse removed the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Nov 30, 2024
@LeSuisse LeSuisse requested a review from afh November 30, 2024 11:48
@LeSuisse LeSuisse changed the title [24.05] gh: apply patches for CVE-2024-52308 [24.05] gh: 2.49.2 -> 2.63.0 Nov 30, 2024
@LeSuisse LeSuisse requested a review from Pandapip1 November 30, 2024 11:48
Copy link
Member

@afh afh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this, @LeSuisse. LGMT! 👍

@wegank wegank added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Dec 1, 2024
@leona-ya leona-ya merged commit 22a40f6 into NixOS:release-24.05 Dec 10, 2024
35 of 37 checks passed
@LeSuisse LeSuisse deleted the gh-CVE-2024-52308-24.05 branch December 11, 2024 07:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants