Skip to content

Unmarshall update#21721

Merged
DavidAPierce merged 3 commits intomainfrom
unmarshall_update
Mar 9, 2026
Merged

Unmarshall update#21721
DavidAPierce merged 3 commits intomainfrom
unmarshall_update

Conversation

@DavidAPierce
Copy link
Contributor

Summary

Added an ignore list for object keys when unmarshalling JSON in recursivelyHydrateStrings.

Details

The recursivelyHydrateStrings function now sanitizes object keys by skipping proto, constructor, and prototype.
Added tests to verify this.

Related Issues

Fixes https://github.com/google-gemini/maintainers-gemini-cli/issues/1499

@DavidAPierce DavidAPierce requested a review from a team as a code owner March 9, 2026 16:51
@gemini-cli
Copy link
Contributor

gemini-cli bot commented Mar 9, 2026

Hi @DavidAPierce, 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, 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 addresses a potential security vulnerability by enhancing the recursivelyHydrateStrings function. It introduces a mechanism to filter out specific object keys during JSON unmarshalling, thereby safeguarding against prototype pollution attacks and improving the overall robustness of the application's data processing.

Highlights

  • Security Enhancement: Implemented an ignore list for object keys (__proto__, constructor, prototype) during JSON unmarshalling in recursivelyHydrateStrings to prevent prototype pollution vulnerabilities.
  • Test Coverage: Added new unit tests to verify that the recursivelyHydrateStrings function correctly prevents prototype pollution via __proto__, constructor, and prototype.
Changelog
  • packages/cli/src/config/extensions/variables.test.ts
    • Added three new test cases to validate the prevention of prototype pollution through __proto__, constructor, and prototype keys.
  • packages/cli/src/config/extensions/variables.ts
    • Defined UNMARSHALL_KEY_IGNORE_LIST to hold keys that should be ignored during JSON unmarshalling.
    • Modified recursivelyHydrateStrings to check against this ignore list before processing object keys.
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.

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 introduces a crucial security fix by preventing prototype pollution in the recursivelyHydrateStrings function. The changes include adding an ignore list for specific object keys (__proto__, constructor, prototype) during JSON unmarshalling and updating the recursivelyHydrateStrings function to utilize this list. New test cases have also been added to verify the effectiveness of this fix against prototype pollution. This is a significant improvement for the security posture of the application.

@github-actions
Copy link

github-actions bot commented Mar 9, 2026

Size Change: +145 B (0%)

Total Size: 26 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 25.5 MB +145 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

quick fix to spelling in a comment.

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
@gemini-cli gemini-cli bot added the status/need-issue Pull requests that need to have an associated issue. label Mar 9, 2026
@DavidAPierce DavidAPierce added this pull request to the merge queue Mar 9, 2026
Merged via the queue into main with commit 743d05b Mar 9, 2026
27 checks passed
@DavidAPierce DavidAPierce deleted the unmarshall_update branch March 9, 2026 17:45
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.

3 participants