GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — fix(commons): skip prototype-polluting keys in _.merge by marshallswain · Pull Request #3690 · feathersjs/feathers

Conversation

@marshallswain

@marshallswain marshallswain commented Jun 4, 2026

Copy link
Copy Markdown
Member

Summary

The recursive _.merge helper in @feathersjs/commons iterates Object.keys(source). When the source came from JSON.parse('{"__proto__":...}'), __proto__ is returned as an own-enumerable key, so the recursive call resolves target['__proto__'] to Object.prototype and writes onto it.

This adds the standard guard to skip __proto__, constructor, and prototype keys during iteration.

Changes

  • src/index.ts: skip the three prototype-mutating keys in the merge loop.
  • test/utils.test.ts: regression test confirming a JSON-parsed __proto__/constructor.prototype source no longer mutates Object.prototype, fresh objects, or the target.

Notes

  • No public API change — merge still works for all documented input shapes.
  • Reported by Andrew Ridings (@ridingsa). Reimplemented here as a maintainer commit (supersedes fix(commons): skip __proto__ / constructor / prototype keys in _.merge #3687) so the change lands under a reviewed, verified commit.

Reported-by: Andrew Ridings (@ridingsa)

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@marshallswain
fix(commons): skip prototype-polluting keys in _.merge
f551a0c
Object.keys() returns __proto__ as an own enumerable key for
JSON-parsed sources, causing the recursive merge to write onto
Object.prototype. Skip __proto__/constructor/prototype keys.

Reported-by: Andrew Ridings (@ridingsa)
@marshallswain marshallswain mentioned this pull request Jun 4, 2026
fix(feathers): skip prototype-polluting keys in _.merge #3689
Merged
@marshallswain
marshallswain merged commit 28b3c03 into dove Jun 4, 2026
4 checks passed

Uh oh!

There was an error while loading. Please reload this page.

@marshallswain
marshallswain deleted the fix/commons-merge-proto-pollution-dove branch June 4, 2026 02:12
@tjenkinson

tjenkinson commented Jun 4, 2026

Copy link
Copy Markdown

Maybe a better alternative is https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty as this will never touch the prototype? Then we wouldn't need to add the exclusions?

Unlike accessor properties, data properties are always set on the object itself, not on a prototype. However, if a non-writable data property is inherited, it is still prevented from being modified on the object.

https://claude.ai/share/609aae22-2720-40e6-8479-04e023e37776

Cc @ridingsa

WDYT?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@marshallswain marshallswain mentioned this pull request Aug 10, 2026
fix(commons): skip prototype-polluting keys in _.merge #3695
Merged
3 tasks done
marshallswain added a commit that referenced this pull request Aug 10, 2026
@marshallswain
fix(commons): skip prototype-polluting keys in _.merge (#3695)
88794cc
Object.keys() returns __proto__ as an own enumerable key for
JSON-parsed sources, causing the recursive merge to write onto
Object.prototype. Skip __proto__/constructor/prototype keys.

Same remediation as dove #3690 / @feathersjs/[email protected]
(GHSA-28xv-ph75-77wh / CVE-2026-54335).

Reported-by: Andrew Ridings (@ridingsa)
@marshallswain marshallswain mentioned this pull request Aug 16, 2026
Improve GHSA-28xv-ph75-77wh: add Crow 4.x patched range github/advisory-database#9137
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

2 participants

@marshallswain @tjenkinson
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.