fix(REST): strip webhook tokens #9723
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
D4isDAVID
requested review from
ckohen,
vladfrangu,
iCrawl,
kyranet,
didinele and
Jiralite
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
Codecov Report
@@ Coverage Diff @@
## main #9723 +/- ##
=======================================
Coverage 59.67% 59.67%
=======================================
Files 235 235
Lines 16370 16374 +4
Branches 1235 1235
=======================================
+ Hits 9768 9771 +3
Misses 6558 6558
- Partials 44 45 +1
Flags with carried forward coverage won't be shown. Click here to find out more.
📣 Codecov offers a browser extension for seamless coverage viewing on GitHub. Try it in Chrome or Firefox today! |
ImRodry
reviewed
Jul 17, 2023
D4isDAVID
force-pushed
the
fix/rest/strip-webhooks-route-token
branch
from
f28dc41
to
c05565d
Compare
|
⚡️ Lighthouse report for the changes in this PR:
Lighthouse ran on https://discord-js-git-fork-d4isdavid-fix-reststrip-we-326a80-discordjs.vercel.app/ |
D4isDAVID
force-pushed
the
fix/rest/strip-webhooks-route-token
branch
from
c05565d
to
ea7e271
Compare
ckohen
requested changes
Aug 19, 2023
There was a problem hiding this comment.
This actually does change behavior significantly in the supposedly impossible case where two webhooks share an id (since webhooks can be keyed on id + token). Notably this is how interaction followups work (using the application id instead of the interaction id).
What you've done is put all interaction followup requests (with the same method) in the same bucket!
We kinda got lucky with our implementation that happened to split out handlers because the route was different (because it had token in it) rather than because the major id was different.
Bonus to handling this properly would be that we don't create a bunch of duplicate hash entries in our hash cache.
In addition to what you've done (which is in the section that makes a route more generic to match how discord hashes routes), you need to edit the regex used to match major ids to include webhook tokens, so that we don't lose the uniqueness.
D4isDAVID
force-pushed
the
fix/rest/strip-webhooks-route-token
branch
from
ea7e271
to
e025fe8
Compare
ckohen
requested changes
Nov 10, 2023
Co-authored-by: ckohen <chaikohen@gmail.com>
D4isDAVID
changed the title
ckohen
approved these changes
Nov 11, 2023
Jiralite
approved these changes
Nov 11, 2023
suneettipirneni
approved these changes
Nov 11, 2023
Vylpes
pushed a commit
to Vylpes/card-drop
that referenced
this pull request
Nov 27, 2023
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@discordjs/rest](https://discord.js.org) ([source](https://github.com/discordjs/discord.js)) | dependencies | minor | [`2.0.1` -> `2.2.0`](https://renovatebot.com/diffs/npm/@discordjs%2frest/2.0.1/2.2.0) | --- ### Release Notes <details> <summary>discordjs/discord.js (@​discordjs/rest)</summary> ### [`v2.2.0`](https://github.com/discordjs/discord.js/blob/HEAD/packages/rest/CHANGELOG.md#discordjsrest220---2023-11-17) [Compare Source](https://github.com/discordjs/discord.js/compare/@discordjs/rest@2.1.0...@discordjs/rest@2.2.0) #### Bug Fixes - Minify mainlib docs json ([#​9963](discordjs/discord.js#9963)) ([4b88306](discordjs/discord.js@4b88306)) #### Features - Present x-ratelimit-scope for 429s hit ([#​9973](discordjs/discord.js#9973)) ([6df233d](discordjs/discord.js@6df233d)) #### Typings - Use wrapper utilities ([#​9945](discordjs/discord.js#9945)) ([4bc1dae](discordjs/discord.js@4bc1dae)) ### [`v2.1.0`](https://github.com/discordjs/discord.js/blob/HEAD/packages/rest/CHANGELOG.md#discordjsrest210---2023-11-12) [Compare Source](https://github.com/discordjs/discord.js/compare/@discordjs/rest@2.0.1...@discordjs/rest@2.1.0) #### Bug Fixes - **REST:** Strip webhook tokens ([#​9723](discordjs/discord.js#9723)) ([cf49f40](discordjs/discord.js@cf49f40)) #### Documentation - Fix "its" typo ([#​9825](discordjs/discord.js#9825)) ([c50809e](discordjs/discord.js@c50809e)) - **create-discord-bot:** Support bun in create-discord-bot ([#​9798](discordjs/discord.js#9798)) ([7157748](discordjs/discord.js@7157748)) #### Features - Expose Retry-After and sublimit timeouts in RatelimitData ([#​9864](discordjs/discord.js#9864)) ([81e7866](discordjs/discord.js@81e7866)) - **CDN:** Support emoji size ([#​9787](discordjs/discord.js#9787)) ([778df45](discordjs/discord.js@778df45)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4wLjAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4wLjAiLCJ0YXJnZXRCcmFuY2giOiJkZXZlbG9wIn0=--> Reviewed-on: https://gitea.vylpes.xyz/External/card-drop/pulls/101 Reviewed-by: Vylpes <ethan@vylpes.com> Co-authored-by: Renovate Bot <renovate@vylpes.com> Co-committed-by: Renovate Bot <renovate@vylpes.com>
Vylpes
pushed a commit
to Vylpes/vylbot-app
that referenced
this pull request
Dec 18, 2023
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@discordjs/rest](https://discord.js.org) ([source](https://github.com/discordjs/discord.js)) | dependencies | minor | [`2.0.1` -> `2.2.0`](https://renovatebot.com/diffs/npm/@discordjs%2frest/2.0.1/2.2.0) | --- ### Release Notes <details> <summary>discordjs/discord.js (@​discordjs/rest)</summary> ### [`v2.2.0`](https://github.com/discordjs/discord.js/blob/HEAD/packages/rest/CHANGELOG.md#discordjsrest220---2023-11-17) [Compare Source](https://github.com/discordjs/discord.js/compare/@discordjs/rest@2.1.0...@discordjs/rest@2.2.0) #### Bug Fixes - Minify mainlib docs json ([#​9963](discordjs/discord.js#9963)) ([4b88306](discordjs/discord.js@4b88306)) #### Features - Present x-ratelimit-scope for 429s hit ([#​9973](discordjs/discord.js#9973)) ([6df233d](discordjs/discord.js@6df233d)) #### Typings - Use wrapper utilities ([#​9945](discordjs/discord.js#9945)) ([4bc1dae](discordjs/discord.js@4bc1dae)) ### [`v2.1.0`](https://github.com/discordjs/discord.js/blob/HEAD/packages/rest/CHANGELOG.md#discordjsrest210---2023-11-12) [Compare Source](https://github.com/discordjs/discord.js/compare/@discordjs/rest@2.0.1...@discordjs/rest@2.1.0) #### Bug Fixes - **REST:** Strip webhook tokens ([#​9723](discordjs/discord.js#9723)) ([cf49f40](discordjs/discord.js@cf49f40)) #### Documentation - Fix "its" typo ([#​9825](discordjs/discord.js#9825)) ([c50809e](discordjs/discord.js@c50809e)) - **create-discord-bot:** Support bun in create-discord-bot ([#​9798](discordjs/discord.js#9798)) ([7157748](discordjs/discord.js@7157748)) #### Features - Expose Retry-After and sublimit timeouts in RatelimitData ([#​9864](discordjs/discord.js#9864)) ([81e7866](discordjs/discord.js@81e7866)) - **CDN:** Support emoji size ([#​9787](discordjs/discord.js#9787)) ([778df45](discordjs/discord.js@778df45)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4wLjAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4wLjAiLCJ0YXJnZXRCcmFuY2giOiJkZXZlbG9wIn0=--> Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/375 Reviewed-by: Vylpes <ethan@vylpes.com> Co-authored-by: Renovate Bot <renovate@vylpes.com> Co-committed-by: Renovate Bot <renovate@vylpes.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Please describe the changes this PR makes and why it should be merged:
Strip the token from webhook routes.
Fixes #9415.
Status and versioning classification: