Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

chore(security) : upgrade src-cli version to address CVE#63750

Merged
shivasurya merged 4 commits into
mainfrom
shiva/upgrade-src-tooling-fix-cve
Jul 10, 2024
Merged

chore(security) : upgrade src-cli version to address CVE#63750
shivasurya merged 4 commits into
mainfrom
shiva/upgrade-src-tooling-fix-cve

Conversation

@shivasurya

Copy link
Copy Markdown
Contributor

Docker images executor, executor-kubernetes, bundled-executor has reported high/critical CVE-2024-24790 , CVE-2023-45288 reported on golang stdlib. Upon testing, src version 5.3.0 was using 1.20.x as per sourcegraph/src-cli@e8e79e0

This pull request attempts to upgrade src version to 5.4.0

Test plan

  • CI 🟢
  • src version should report 5.4.0 (I built the image locally and tested it)
    docker run --platform linux/amd64 -it --entrypoint /bin/sh executor:candidate

Changelog

Upgrade src-cli version to 5.4.0 to address CVE-2024-24790 , CVE-2023-45288

@shivasurya shivasurya requested review from a team and BolajiOlajide July 10, 2024 12:11
@shivasurya shivasurya self-assigned this Jul 10, 2024
@cla-bot cla-bot Bot added the cla-signed label Jul 10, 2024
@shivasurya shivasurya merged commit 9e95499 into main Jul 10, 2024
@shivasurya shivasurya deleted the shiva/upgrade-src-tooling-fix-cve branch July 10, 2024 13:57
@sourcegraph-release-bot

Copy link
Copy Markdown
Collaborator

The backport to 5.5.x failed at https://github.com/sourcegraph/sourcegraph/actions/runs/10079833138:

The process '/usr/bin/git' failed with exit code 1

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 5.5.x -p 63750
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.5.x 5.5.x
# Navigate to the new working tree
cd .worktrees/backport-5.5.x
# Create a new branch
git switch --create backport-63750-to-5.5.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9e95499625c41c684f5e149f708d612cbdc107cb
# Push it to GitHub
git push --set-upstream origin backport-63750-to-5.5.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.5.x

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-63750-to-5.5.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.5.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 5.5.x and the compare/head branch is backport-63750-to-5.5.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

@sourcegraph-release-bot sourcegraph-release-bot added backports failed-backport-to-5.5.x release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases labels Jul 24, 2024
@willdollman willdollman removed release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases failed-backport-to-5.5.x labels Jul 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants