Skip to content

🛡️ Sentinel: [CRITICAL] Fix TOCTOU vulnerability in archive command - #305

Open
matta wants to merge 1 commit into
mainfrom
fix/archive-toctou-7113757338564012841
Open

🛡️ Sentinel: [CRITICAL] Fix TOCTOU vulnerability in archive command#305
matta wants to merge 1 commit into
mainfrom
fix/archive-toctou-7113757338564012841

Conversation

@matta

@matta matta commented Mar 17, 2026

Copy link
Copy Markdown
Owner

Resolves a Time-of-Check to Time-of-Use (TOCTOU) vulnerability in the archive command where a task was moved using a non-atomic p.exists() check followed by fs::rename().

  • Replaced with an atomic safe_move_file helper utilizing fs::hard_link().
  • Provides a robust fallback mechanism using fs::OpenOptions::new().create_new(true) if hard_link fails (e.g., across file systems).
  • Removed the separate get_archive_path function and inlined the loop into run_archive.

PR created automatically by Jules for task 7113757338564012841 started by @matta

Co-authored-by: matta <37314+matta@users.noreply.github.com>
@google-labs-jules

Copy link
Copy Markdown
Contributor

👋 Jules, reporting for duty! I'm here to lend a hand with this pull request.

When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down.

I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job!

For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with @jules. You can find this option in the Pull Request section of your global Jules UI settings. You can always switch back!

New to Jules? Learn more at jules.google/docs.


For security, I will only act on instructions from the user who triggered this task.

@trunk-io

trunk-io Bot commented Mar 17, 2026

Copy link
Copy Markdown
Contributor

Merging to main in this repository is managed by Trunk.

  • To merge this pull request, check the box to the left or comment /trunk merge below.

@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, 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 resolves a critical Time-of-Check to Time-of-Use (TOCTOU) vulnerability within the archive command. By introducing an atomic file movement mechanism, it significantly enhances the security and reliability of archiving tasks, ensuring that files are moved safely and consistently, even under race conditions. The changes improve the robustness of the system by preventing potential data integrity issues.

Highlights

  • Vulnerability Fix: Addressed a critical Time-of-Check to Time-of-Use (TOCTOU) vulnerability in the archive command, preventing potential race conditions during file movement.
  • Atomic File Movement: Implemented a new safe_move_file helper function that uses fs::hard_link() to ensure atomic file operations, enhancing the security and reliability of the archiving process.
  • Robust Fallback Mechanism: Included a robust fallback in safe_move_file using fs::OpenOptions::new().create_new(true) and io::copy to handle scenarios where hard linking is not feasible (e.g., across different filesystems).
  • Code Refactoring: Refactored the run_archive function by inlining the logic for generating unique archive paths and removing the redundant get_archive_path function and its associated tests.
Changelog
  • crates/pebble/src/commands_archive.rs
    • Added safe_move_file function for atomic file operations.
    • Modified run_archive to utilize safe_move_file and integrate path generation logic.
    • Removed get_archive_path function and its associated tests.
Activity
  • No human activity has been recorded on this pull request yet.
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.

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

Copy link
Copy Markdown
Contributor

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 effectively resolves a critical Time-of-Check to Time-of-Use (TOCTOU) vulnerability in the archive command. The introduction of the safe_move_file helper, which uses fs::hard_link with a fallback to an atomic copy-and-delete, is a robust solution. My feedback focuses on enhancing the error handling within this new helper function to prevent silent failures that could lead to file duplication.

Comment on lines +11 to +12
let _ = fs::remove_file(src);
Ok(())

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

high

Silently ignoring the result of fs::remove_file(src) could leave the original file behind if the deletion fails (e.g., due to permissions). This would result in two hard links to the same file data instead of a clean move. It's better to propagate the error from remove_file to make the failure explicit and ensure the 'move' operation fully completes as expected.

Suggested change
let _ = fs::remove_file(src);
Ok(())
fs::remove_file(src)

Comment on lines +25 to +26
let _ = fs::remove_file(src);
Ok(())

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

high

Similar to the hard_link path, ignoring the result of fs::remove_file(src) here can lead to silent data duplication if the source file cannot be deleted after being copied. Propagating the error is safer to ensure the move operation behaves as expected.

Suggested change
let _ = fs::remove_file(src);
Ok(())
fs::remove_file(src)

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.

1 participant