Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"resolutions": {
"protobufjs": "^7.6.5",
"qs": "^6.16.0",
"proxy-addr": "^2.0.8"
"proxy-addr": "^2.0.8",
"@grpc/grpc-js": "^1.14.5"
}
}
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
enabled "2.0.x"
kuler "^2.0.0"

"@grpc/grpc-js@^1.14.3":
version "1.14.4"
resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.14.4.tgz#e73ff57d97802f063999545f43ebb2b1eca65d9d"
integrity sha512-k9Dj3DV/itK9D06Y8f190Qgop7/Ui+D0njFV3LHMPwPT75DpXLQohE9Wmz0QElrJnzsjB7KPWiKJbOl7IPDArQ==
"@grpc/grpc-js@^1.14.3", "@grpc/grpc-js@^1.14.5":
version "1.14.5"

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.

This fix exists only in the lockfile. The range ^1.14.3 still allows the vulnerable 1.14.3 and 1.14.4, so a later lockfile edit or merge-conflict resolution could quietly bring back 1.14.4 (GHSA-m9gg-hp2v-232j). Could you add a resolutions entry for @grpc/grpc-js (e.g. ^1.14.5), the same way protobufjs, qs and proxy-addr are already pinned?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Added "@grpc/grpc-js": "^1.14.5" to resolutions in 6b34357. The lock entry is now "@grpc/grpc-js@^1.14.3", "@grpc/grpc-js@^1.14.5" → 1.14.5, so a re-lock can't fall back to 1.14.4.

resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.14.5.tgz#12f97bd9f716358e377ffaa768195d1219eb76a3"
integrity sha512-7VZM+SVdEcUUqSQeNI3zM8Qs/BhQKZndPo2h5VkYkAM8Iz0wJIa8mKV5ekQGqG8UUsnkQ0NMxIxwkIHYvj0qOw==
dependencies:
"@grpc/proto-loader" "^0.8.0"
"@js-sdsl/ordered-map" "^4.4.2"
Expand Down
Loading