Skip to content

Conversation

@debarshiray
Copy link
Member

... for CVE-2025-65637 or GHSA-4f99-4q7p-p3gh.

The src/go.sum file was updated with go mod tidy.

#1503
https://github.com/containers/toolbox/security/dependabot/26
(cherry picked from commits 3de56c0 and efa8da9)

@softwarefactory-project-zuul
Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/containers/toolbox for 1738,ee2b964b35cdee0f8b248cee44322f3cfd757153

@gemini-code-assist
Copy link

Summary of Changes

Hello @debarshiray, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request performs a crucial dependency upgrade for the logrus logging library in the project. The primary motivation is to mitigate a reported security vulnerability, ensuring the application remains secure and up-to-date with its third-party components. This is a standard maintenance task to enhance the project's security posture.

Highlights

  • Dependency Update: The github.com/sirupsen/logrus dependency has been updated from version 1.8.1 to 1.9.3.
  • Security Fix: This update addresses a known security vulnerability, specifically CVE-2025-65637 or GHSA-4f99-4q7p-p3gh.
  • Go Module Updates: The src/go.sum file was automatically updated using go mod tidy to reflect the new dependency version and its transitive dependencies.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@debarshiray debarshiray changed the base branch from main to 0.0.99.5.x January 21, 2026 20:24
Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request correctly bumps the github.com/sirupsen/logrus dependency to version 1.9.3, which mitigates the security vulnerability GHSA-4f99-4q7p-p3gh. The changes in src/go.mod and src/go.sum are correct and reflect the dependency update and the execution of go mod tidy. The changes are sound and address the intended purpose of the pull request.

debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 21, 2026
@debarshiray debarshiray force-pushed the wip/rishi/0.0.99.5.x-CVE-2025-65637 branch from ee2b964 to 41b71bc Compare January 21, 2026 20:37
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 21, 2026
@debarshiray
Copy link
Member Author

Hey @TristanCacqueray @morucci @nhicher ! Just now I created a new branch called 0.0.99.5.x from main to fix a CVE in an old release, and the SoftwareFactory CI is not getting triggered for this pull request meant for the new branch. This is the first time we are creating a branch for stable releases in this project, so I might be missing something.

I thought adding job.branches attributes will do the trick; so, I added them in this PR; but it didn't make any difference. Any idea about what might be missing?

@TristanCacqueray
Copy link
Contributor

Hey @debarshiray, perhaps the branch is not protected? In the config, toolbox CI excludes unprotected branch, see: https://softwarefactory-project.io/cgit/config/tree/resources/toolbox.yaml

@debarshiray debarshiray force-pushed the wip/rishi/0.0.99.5.x-CVE-2025-65637 branch from 95bcee1 to cda60e3 Compare January 25, 2026 13:35
@debarshiray debarshiray changed the base branch from 0.0.99.5.x to release-0.0.99.5 January 25, 2026 13:35
@debarshiray debarshiray force-pushed the wip/rishi/0.0.99.5.x-CVE-2025-65637 branch from 95bcee1 to 8c8f9f4 Compare January 25, 2026 13:54
@debarshiray
Copy link
Member Author

Hey @debarshiray, perhaps the branch is not protected? In the config, toolbox CI excludes unprotected branch, see: https://softwarefactory-project.io/cgit/config/tree/resources/toolbox.yaml

Thanks for the hint - it did the trick!

@softwarefactory-project-zuul
Copy link

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/da0ccf5422494ba4b7de01db53463af3

unit-test FAILURE in 1m 38s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 03s
unit-test-restricted FAILURE in 1m 40s
system-test-fedora-rawhide FAILURE in 31m 06s
✔️ system-test-fedora-39 SUCCESS in 36m 20s
system-test-fedora-38 NODE_FAILURE Node request 200-0008144796 failed in 0s

@debarshiray debarshiray changed the title [0.0.99.5.x] build: Bump github.com/sirupsen/logrus to 1.9.3 [release-0.0.99.5] build: Bump github.com/sirupsen/logrus to 1.9.3 Jan 26, 2026
@debarshiray debarshiray force-pushed the wip/rishi/0.0.99.5.x-CVE-2025-65637 branch from 8c8f9f4 to 9341a89 Compare January 27, 2026 00:05
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
@debarshiray debarshiray force-pushed the wip/rishi/0.0.99.5.x-CVE-2025-65637 branch 2 times, most recently from 4ccc2ff to 96561b3 Compare January 27, 2026 00:13
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
@softwarefactory-project-zuul
Copy link

Build succeeded.
https://softwarefactory-project.io/zuul/t/local/buildset/4a8faa3062bc49e2b8f2336553637bb4

✔️ unit-test SUCCESS in 1m 42s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 20s
✔️ unit-test-restricted SUCCESS in 1m 42s
✔️ system-test-fedora-rawhide SUCCESS in 2h 20m 38s
✔️ system-test-fedora-43 SUCCESS in 2h 16m 47s
✔️ system-test-fedora-42 SUCCESS in 2h 20m 54s

debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
@softwarefactory-project-zuul
Copy link

Build succeeded.
https://softwarefactory-project.io/zuul/t/local/buildset/e71aaea4e65e4162968606fce0c5d9f5

✔️ unit-test SUCCESS in 1m 39s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 13s
✔️ unit-test-restricted SUCCESS in 1m 52s
✔️ system-test-fedora-rawhide SUCCESS in 2h 04m 01s
✔️ system-test-fedora-43 SUCCESS in 2h 07m 00s
✔️ system-test-fedora-42 SUCCESS in 2h 12m 01s

debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
... for CVE-2025-65637 or GHSA-4f99-4q7p-p3gh.

The src/go.sum file was updated with 'go mod tidy'.

containers#1503
containers#1738
https://github.com/containers/toolbox/security/dependabot/26
(cherry picked from commit efa8da9)
(cherry picked from commit 90f3bf281ee743e296da1332b4649fed85e1e579)
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
... for CVE-2025-65637 or GHSA-4f99-4q7p-p3gh.

The src/go.sum file was updated with 'go mod tidy'.

containers#1503
containers#1738
https://github.com/containers/toolbox/security/dependabot/26
(cherry picked from commit 3de56c0)
(cherry picked from commit 67e469515d2dbcb8538755a538b40695b52d40e6)
The working directory from which bats(1) is invoked might not be part of
the Toolbx container.  eg., the downstream Fedora CI invokes the tests
as:
  $ cd /path/to/toolbox/test/system
  $ bats .

... and it led to:
  not ok 8 help: Try unknown command (forwarded to host)
  # tags: commands-options
  # (from function `assert_line' in file
      ./libs/bats-assert/src/assert.bash, line 488,
  #  in test file ./002-help.bats, line 135)
  #   `assert_line --index 0
        "Error: unknown command \"foo\" for \"toolbox\""' failed
  #
  # -- line differs --
  # index    : 0
  # expected : Error: unknown command "foo" for "toolbox"
  # actual   : Error: crun: chdir to `/usr/share/toolbox/test/system`:
      No such file or directory: OCI runtime attempted to invoke a
      command that was not found
  # --
  #

containers#1560
containers#1745
(backported from commit 1e90c72)
The system tests can be very I/O intensive, because many of them copy
OCI images from the test suite's image cache directory to its local
container/storage store, create containers, and then delete everything
to run the next test with a clean slate.  This makes them slow.

In the case of these two particular tests, toolbox(1) is supposed to
validate the command line options before trying to find the image.  So,
there's no need to copy the image from the test suite's image cache
directory to its local container/storage store.

Fallout from 32b147b

containers#1595
containers#1745
(backported from commit adc8650)
Fedora 39 reached End of Life on 26th November 2024:
https://docs.fedoraproject.org/en-US/releases/eol/

containers#1602
containers#1745
(backported from commit 0bb4ff8)
The system tests can be very I/O intensive, because many of them copy
OCI images from the test suite's image cache directory to its local
container/storage store, create containers, and then delete everything
to run the next test with a clean slate.  This makes them slow.

The runtime environment tests, which includes the group and user tests,
are particularly slow because they don't skip the I/O even when testing
error handling.  This makes them a good target for optimizations.

The group and user tests check the group and user configuration in
different containers without changing their state.  Therefore, a lot of
disk I/O can be avoided by creating these containers only once for all
the tests.

This can reduce the time needed to run the group and user tests from
almost 22 minutes to almost 5 minutes.

containers#1635
containers#1746
(backported from commit 3017a46)
Fedora 41 reached End of Life on 15th December 2025:
https://docs.fedoraproject.org/en-US/releases/eol/

containers#1733
containers#1746
(backported from commit 36605d8)
The GitHub Actions workflows for building and publishing the images were
removed because the image definitions were removed from this branch [1].

[1] Commit f2b2a18
    containers@f2b2a18ddef288a3
    containers#1739

containers#1746
@debarshiray debarshiray force-pushed the wip/rishi/0.0.99.5.x-CVE-2025-65637 branch from 4cd5fb5 to b307bd9 Compare January 27, 2026 18:44
@softwarefactory-project-zuul
Copy link

Build succeeded.
https://softwarefactory-project.io/zuul/t/local/buildset/3f01ecd97d504449809842703ed505c4

✔️ unit-test SUCCESS in 1m 45s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 29s
✔️ unit-test-restricted SUCCESS in 1m 47s
✔️ system-test-fedora-rawhide SUCCESS in 1h 27m 53s
✔️ system-test-fedora-43 SUCCESS in 1h 26m 10s
✔️ system-test-fedora-42 SUCCESS in 1h 57m 57s

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants