-
Notifications
You must be signed in to change notification settings - Fork 0
🔒 Fix Rate Limit Bypass via X-Forwarded-For Spoofing #524
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
is0692vs
wants to merge
1
commit into
main
Choose a base branch
from
security/fix-rate-limit-ip-spoofing-7941677267623678207
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,31 +66,18 @@ function isValidIp(value: string): boolean { | |
| } | ||
| } | ||
|
|
||
| function isTrustedProxy(ip: string): boolean { | ||
| // Matches private IPv4 ranges, loopback, and link-local addresses. | ||
| const privateIpv4 = /^(127\.|10\.|192\.168\.|169\.254\.|172\.(1[6-9]|2[0-9]|3[0-1])\.)/; | ||
| // Matches IPv4-mapped IPv6 versions of the same private IPv4 ranges. | ||
| const privateIpv4MappedIpv6 = /^::ffff:(127\.|10\.|192\.168\.|169\.254\.|172\.(1[6-9]|2[0-9]|3[0-1])\.)/i; | ||
| // Matches IPv6 loopback, ULA (fc00::/7), and link-local (fe80::/10). | ||
| const privateIpv6 = /^(::1|f[cd]|fe[89ab])/i; | ||
|
|
||
| return ( | ||
| privateIpv4.test(ip) || | ||
| privateIpv4MappedIpv6.test(ip) || | ||
| privateIpv6.test(ip) | ||
| ); | ||
| } | ||
|
|
||
| export function getClientIp(request: Request): string { | ||
| const forwardedFor = request.headers.get("x-forwarded-for"); | ||
| if (!forwardedFor) return "unknown"; | ||
|
|
||
| const ips = forwardedFor.split(",").map(ip => ip.trim()); | ||
|
|
||
| // Iterate from right to left and return the first non-private IP as the client IP. | ||
| // Iterate from right to left and return the first valid IP. | ||
| // We do not skip private IPs because doing so without a known proxy topology | ||
| // allows attackers to bypass rate limiting by appending a spoofed private IP. | ||
| for (let i = ips.length - 1; i >= 0; i--) { | ||
| const ip = ips[i]; | ||
| if (ip && isValidIp(ip) && !isTrustedProxy(ip)) { | ||
| if (ip && isValidIp(ip)) { | ||
| return ip; | ||
|
Comment on lines
+75
to
81
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 1. Proxy ip rate limiting getClientIp now returns the right-most syntactically valid X-Forwarded-For token even if it is a private proxy address, and the API routes use that value directly as the rate-limit key. In deployments where the right-most XFF entry is a shared internal proxy hop, this can group many users into one bucket and cause widespread false 429s. Agent Prompt
|
||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
プロキシが自身のプライベート IP を
X-Forwarded-Forの右端に追加する環境では、その IP が全クライアント共通のレート制限キーになります。そのため、1 クライアントが上限を消費すると、同じプロキシ配下の他クライアントにも 429 が返されます。Knowledge Base Used: GitHub Client
Prompt To Fix With AI