feat: Treat rate limit header value as comma-separated list #2282
Conversation
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 commit changes the conditional logic in performRateLimiting to prefer returning early rather than nesting if/else statements. This is largely preparation for changing the behavior of performRateLimiting to accept comma-separated lists of header values, which will incur some additional conditional logic.
This commit updates performRateLimiting to treat the rate limit header value as a comma-separated list and enforce rate limiting based on the first value in that list. Certain HTTP headers, such as X-Forwarded-For and other headers that are combined according to RFC 7230, can be represented as a comma-separated list of values. Intermediate proxies may add their own values to these headers, modifying the resulting value. For example, an end user with a single IP address proxied through a fleet of load balancers using the X-Forwarded-For header may be associated with multiple X-Forwarded-For header values, e.g., "2.2.2.2,100.100.100.100" and "2.2.2.2,300.300.300.300". The current implementation of performRateLimiting treats each of these as separate rate limiting keys. To address this issue, this commit splits the rate limit header by commas and takes the first value (with whitespace removed) to use as the rate limiting key. Note that this logic is superficially similar to the utilities.GetIPAddress function with two key differences. In performRateLimiting, there is no set format for a given rate limiting key, nor is there a fallback value after the first value in the list that the API should use.
Pull Request Test Coverage Report for Build 20066956799Details
💛 - Coveralls |
fadymak
reviewed
Dec 8, 2025
Contributor
fadymak
left a comment
There was a problem hiding this comment.
Nice work 👏 Left a couple of small comments/questions whenever you have a moment!
This commit updates performRateLimiting to emit a warning for headers that start with a comma rather than return an error. It is possible under some circumstances that Auth servers could receive a rate limit header value of the form ", foo". Rather than break functionality for servers using this, it is safer to instead emit a warning and then change this to be an error in a future release.
fadymak
approved these changes
Dec 9, 2025
cemalkilic
pushed a commit
that referenced
this pull request
Jan 12, 2026
Resets the main branch (`master`) to have the same changeset as 2.184.0 but under 2.185.0. Original release please notes: ### Features * Add Sb-Forwarded-For header and IP-based rate limiting ([#2295](#2295)) ([e8f679b](e8f679b)) * allow amr claim to be array of strings or objects ([#2274](#2274)) ([607da43](607da43)) * Treat rate limit header value as comma-separated list ([#2282](#2282)) ([5f2e279](5f2e279)) ### Bug Fixes * check each type independently ([#2290](#2290)) ([d9de0af](d9de0af)) * fix the wrong error return value ([#1950](#1950)) ([e2dfb5d](e2dfb5d)) * **indexworker:** remove pg_trgm extension ([#2301](#2301)) ([c553b10](c553b10)) * **oauth-server:** allow custom URI schemes in client redirect URIs ([#2298](#2298)) ([ea72f57](ea72f57)) * tighten email validation rules ([#2304](#2304)) ([33bb372](33bb372)) --------- Co-authored-by: depthfirst-app[bot] <184448029+depthfirst-app[bot]@users.noreply.github.com>
cemalkilic
pushed a commit
that referenced
this pull request
Jan 12, 2026
🤖 I have created a release *beep* *boop* --- ## [2.185.0](v2.184.0...v2.185.0) (2026-01-12) ### Features * Add Sb-Forwarded-For header and IP-based rate limiting ([#2295](#2295)) ([e8f679b](e8f679b)) * allow amr claim to be array of strings or objects ([#2274](#2274)) ([607da43](607da43)) * reset main branch to 2.185.0 ([#2325](#2325)) ([b9d0500](b9d0500)) * Treat rate limit header value as comma-separated list ([#2282](#2282)) ([5f2e279](5f2e279)) ### Bug Fixes * additional provider and issuer checks ([#2326](#2326)) ([cb79a74](cb79a74)) * check each type independently ([#2290](#2290)) ([d9de0af](d9de0af)) * fix the wrong error return value ([#1950](#1950)) ([e2dfb5d](e2dfb5d)) * **indexworker:** remove pg_trgm extension ([#2301](#2301)) ([c553b10](c553b10)) * **oauth-server:** allow custom URI schemes in client redirect URIs ([#2298](#2298)) ([ea72f57](ea72f57)) * tighten email validation rules ([#2304](#2304)) ([33bb372](33bb372)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.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.
What kind of change does this PR introduce?
This PR updates
performRateLimitingto treat the rate limit header value as a comma-separated list and enforce rate limiting based on the first value in that list.What is the current behavior?
Certain HTTP headers, such as
X-Forwarded-Forand other headers that are combined according to RFC 7230, can be represented as a comma-separated list of values. Intermediate proxies may add their own values to these headers, modifying the resulting value. For example, an end user with a single IP address proxied through a fleet of load balancers using the X-Forwarded-For header may be associated with multipleX-Forwarded-Forheader values, e.g.,2.2.2.2,100.100.100.100and2.2.2.2,300.300.300.300. The current implementation ofperformRateLimitingtreats each of these as separate rate limiting keys.What is the new behavior?
This PR splits the rate limit header by commas and takes the first value (with whitespace removed) to use as the rate limiting key.
Note that this logic is superficially similar to the
utilities.GetIPAddressfunction with two key differences. InperformRateLimiting, there is no set format for a given rate limiting key, nor is there a fallback value after the first value in the list that the API should use.