Feature/org rate limiting#364
Open
Devadakene wants to merge 9 commits into
Open
Conversation
Devadakene
force-pushed
the
feature/org-rate-limiting
branch
from
July 16, 2026 19:19
0405d8c to
2b00c22
Compare
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
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.
Closes #241
Summary
This PR implements organization-based rate limiting to prevent one operator's heavy usage or DDoS from locking out other operators sharing the same office IP address.
When a request is authenticated with an API key, the rate limiter uses the associated organization ID (
org:<orgId>) as the rate-limiting key. If no organization ID is present (e.g. unauthenticated requests), the rate limiter falls back to keying by the caller's IP address.Key Changes
ApiKeyGuardto expose the organization ID on the request object as(request as any).org.AdaptiveRateLimitGuardto use the organization key identifierorg:<orgId>if present.createRateLimiterExpress middleware to check forrequest.org(and resolve it from the database ifx-api-keyis supplied), falling back to the client's IP.docs/security/rate-limits.md.Testing
E2E tests were added to
app/backend/test/security.e2e-spec.tsmatching the acceptance criteria:Commands Run
Screenshots
N/A (Backend / API changes only)
Checklist