Skip to content

Add extra safety checks for proto pollution#20396

Merged
jacob314 merged 2 commits intomainfrom
deep_merge
Mar 4, 2026
Merged

Add extra safety checks for proto pollution#20396
jacob314 merged 2 commits intomainfrom
deep_merge

Conversation

@jacob314
Copy link
Contributor

@jacob314 jacob314 commented Feb 26, 2026

Summary

Add defensive checks to make the object deep merge safer.

@jacob314 jacob314 requested a review from a team as a code owner February 26, 2026 06:01
@gemini-cli
Copy link
Contributor

gemini-cli bot commented Feb 26, 2026

Hi @jacob314, thank you so much for your contribution to Gemini CLI! We really appreciate the time and effort you've put into this.

We're making some updates to our contribution process to improve how we track and review changes. Please take a moment to review our recent discussion post: Improving Our Contribution Process & Introducing New Guidelines.

Key Update: Starting January 26, 2026, the Gemini CLI project will require all pull requests to be associated with an existing issue. Any pull requests not linked to an issue by that date will be automatically closed.

Thank you for your understanding and for being a part of our community!

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @jacob314, 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 enhances the security of the deepMerge utility by introducing robust checks to prevent various forms of prototype pollution. The changes ensure that malicious input attempting to modify object prototypes via __proto__, constructor, or prototype keys is safely ignored, thereby protecting the application from potential vulnerabilities. Comprehensive tests have been added to validate these new safeguards.

Highlights

  • Security Enhancement: Implemented additional checks in the deepMerge utility to prevent prototype pollution by explicitly ignoring constructor and prototype keys during the merge process.
  • Test Coverage: Expanded the existing prototype pollution test suite to include new test cases specifically targeting constructor and prototype keys, ensuring the new safety measures are effective.
Changelog
  • packages/cli/src/utils/deepMerge.test.ts
    • Expanded prototype pollution test to cover constructor and prototype keys.
  • packages/cli/src/utils/deepMerge.ts
    • Added checks to skip constructor and prototype keys during deep merging to prevent prototype pollution.
Activity
  • No activity has been recorded for 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.

@jacob314 jacob314 enabled auto-merge February 26, 2026 06:03
@gemini-cli
Copy link
Contributor

gemini-cli bot commented Feb 26, 2026

Hi there! Thank you for your contribution to Gemini CLI.

To improve our contribution process and better track changes, we now require all pull requests to be associated with an existing issue, as announced in our recent discussion and as detailed in our CONTRIBUTING.md.

This pull request is being closed because it is not currently linked to an issue. Once you have updated the description of this PR to link an issue (e.g., by adding Fixes #123 or Related to #123), it will be automatically reopened.

How to link an issue:
Add a keyword followed by the issue number (e.g., Fixes #123) in the description of your pull request. For more details on supported keywords and how linking works, please refer to the GitHub Documentation on linking pull requests to issues.

Thank you for your understanding and for being a part of our community!

@gemini-cli gemini-cli bot closed this Feb 26, 2026
auto-merge was automatically disabled February 26, 2026 06:03

Pull request was closed

@github-actions
Copy link

github-actions bot commented Feb 26, 2026

Size Change: +46 B (0%)

Total Size: 25.9 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 25.4 MB +46 B (0%)
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js 221 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js 227 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js 11.5 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js 132 B 0 B
./bundle/sandbox-macos-permissive-open.sb 890 B 0 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB 0 B
./bundle/sandbox-macos-restrictive-open.sb 3.36 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB 0 B
./bundle/sandbox-macos-strict-open.sb 4.82 kB 0 B
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB 0 B

compressed-size-action

Copy link
Contributor

@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 enhances security by adding extra checks to prevent prototype pollution in the customDeepMerge utility. The changes block merging of constructor and prototype properties, in addition to the existing __proto__ check. Corresponding unit tests have been added to verify this behavior. The implementation is correct and follows security best practices.

@galz10 galz10 reopened this Mar 3, 2026
@jacob314 jacob314 enabled auto-merge March 3, 2026 23:55
@gemini-cli gemini-cli bot added the status/need-issue Pull requests that need to have an associated issue. label Mar 3, 2026
@jacob314 jacob314 added this pull request to the merge queue Mar 4, 2026
Merged via the queue into main with commit af424ae Mar 4, 2026
27 checks passed
@jacob314 jacob314 deleted the deep_merge branch March 4, 2026 00:36
BryanBradfo pushed a commit to BryanBradfo/gemini-cli that referenced this pull request Mar 5, 2026
Co-authored-by: Gal Zahavi <38544478+galz10@users.noreply.github.com>
struckoff pushed a commit to struckoff/gemini-cli that referenced this pull request Mar 6, 2026
Co-authored-by: Gal Zahavi <38544478+galz10@users.noreply.github.com>
liamhelmer pushed a commit to badal-io/gemini-cli that referenced this pull request Mar 12, 2026
Co-authored-by: Gal Zahavi <38544478+galz10@users.noreply.github.com>
yashodipmore pushed a commit to yashodipmore/geemi-cli that referenced this pull request Mar 21, 2026
Co-authored-by: Gal Zahavi <38544478+galz10@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/need-issue Pull requests that need to have an associated issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants