-
Notifications
You must be signed in to change notification settings - Fork 0
Add external API abuse controls #16
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
Closed
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
dcd51f6
Make abuse controls operable without disrupting trusted callers
metajinglun 6ae8e08
Preserve allocation derivation for off-curve recipients
metajinglun 70fe0a2
Address Greptile review on abuse controls
metajinglun 70daf28
Trim duplicate edge controls from API safeguards
metajinglun 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
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
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 |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| import type { Request, Response, NextFunction } from 'express'; | ||
| import { config } from '../config.js'; | ||
| import { AppError } from './errorHandler.js'; | ||
| import { timingSafeStringEqual } from '../utils/timingSafe.js'; | ||
|
|
||
| declare global { | ||
| namespace Express { | ||
| interface Request { | ||
| clientTier?: 'anon' | 'trusted'; | ||
| apiKey?: string; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| function findTrustedApiKey(apiKey: string): string | undefined { | ||
| // Iterate every key without early-exit: returning on first match would leak | ||
| // the matching key's position via how many comparisons ran, undermining the | ||
| // constant-time intent of timingSafeStringEqual. | ||
| let matched: string | undefined; | ||
| for (const trustedKey of config.server.trustedApiKeys) { | ||
| if (timingSafeStringEqual(apiKey, trustedKey)) { | ||
| matched = trustedKey; | ||
| } | ||
| } | ||
|
|
||
| return matched; | ||
| } | ||
|
|
||
| export function createClientContextMiddleware() { | ||
| return (req: Request, _res: Response, next: NextFunction): void => { | ||
| const apiKey = req.header('x-api-key'); | ||
|
|
||
| if (apiKey) { | ||
| const trustedKey = findTrustedApiKey(apiKey); | ||
| if (!trustedKey) { | ||
| throw AppError.unauthorized('Invalid API key', 'INVALID_API_KEY'); | ||
| } | ||
|
|
||
| req.clientTier = 'trusted'; | ||
| req.apiKey = trustedKey; | ||
| } else { | ||
| req.clientTier = 'anon'; | ||
| } | ||
|
|
||
| next(); | ||
| }; | ||
| } | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.