Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 3.8k
fix(security): rate limit chat OTP + validate mothership proxy endpoint#4312
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
Merged
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
556e0fd
fix(security): rate limit chat OTP endpoint to prevent email bombing
waleedlatif1 07feab5
fix(security): validate mothership proxy endpoint to block path trave…
waleedlatif1 f2dcb82
fix(security): address greptile feedback on OTP rate limiting
waleedlatif1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -8,16 +8,32 @@ import type { NextRequest } from 'next/server' | ||
| import { z } from 'zod' | ||
| import { renderOTPEmail } from '@/components/emails' | ||
| import { getRedisClient } from '@/lib/core/config/redis' | ||
| import type { TokenBucketConfig } from '@/lib/core/rate-limiter' | ||
| import { RateLimiter } from '@/lib/core/rate-limiter' | ||
| import { addCorsHeaders, isEmailAllowed } from '@/lib/core/security/deployment' | ||
| import { getStorageMethod } from '@/lib/core/storage' | ||
| import { generateRequestId } from '@/lib/core/utils/request' | ||
| import { generateRequestId, getClientIp } from '@/lib/core/utils/request' | ||
| import { withRouteHandler } from '@/lib/core/utils/with-route-handler' | ||
| import { sendEmail } from '@/lib/messaging/email/mailer' | ||
| import { setChatAuthCookie } from '@/app/api/chat/utils' | ||
| import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils' | ||
| const logger = createLogger('ChatOtpAPI') | ||
| const rateLimiter = new RateLimiter() | ||
| const OTP_IP_RATE_LIMIT: TokenBucketConfig = { | ||
| maxTokens: 10, | ||
| refillRate: 10, | ||
| refillIntervalMs: 15 * 60_000, | ||
| } | ||
| const OTP_EMAIL_RATE_LIMIT: TokenBucketConfig = { | ||
| maxTokens: 3, | ||
| refillRate: 3, | ||
| refillIntervalMs: 15 * 60_000, | ||
| } | ||
| function generateOTP(): string { | ||
| return randomInt(100000, 1000000).toString() | ||
| } | ||
| @@ -214,6 +230,23 @@ export const POST = withRouteHandler( | ||
| const requestId = generateRequestId() | ||
| try { | ||
| const ip = getClientIp(request) | ||
| if (ip !== 'unknown') { | ||
| const ipRateLimit = await rateLimiter.checkRateLimitDirect( | ||
| `chat-otp:ip:${identifier}:${ip}`, | ||
| OTP_IP_RATE_LIMIT | ||
| ) | ||
| if (!ipRateLimit.allowed) { | ||
| logger.warn(`[${requestId}] OTP IP rate limit exceeded for ${identifier} from ${ip}`) | ||
| const retryAfter = Math.ceil( | ||
| (ipRateLimit.retryAfterMs ?? OTP_IP_RATE_LIMIT.refillIntervalMs) / 1000 | ||
| ) | ||
| const response = createErrorResponse('Too many requests. Please try again later.', 429) | ||
| response.headers.set('Retry-After', String(retryAfter)) | ||
| return addCorsHeaders(response, request) | ||
| } | ||
| } | ||
waleedlatif1 marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| const body = await request.json() | ||
| const { email } = otpRequestSchema.parse(body) | ||
| @@ -255,6 +288,25 @@ export const POST = withRouteHandler( | ||
| ) | ||
| } | ||
| const emailRateLimit = await rateLimiter.checkRateLimitDirect( | ||
| `chat-otp:email:${deployment.id}:${email.toLowerCase()}`, | ||
| OTP_EMAIL_RATE_LIMIT | ||
| ) | ||
| if (!emailRateLimit.allowed) { | ||
| logger.warn( | ||
| `[${requestId}] OTP email rate limit exceeded for ${email} on chat ${deployment.id}` | ||
| ) | ||
| const retryAfter = Math.ceil( | ||
| (emailRateLimit.retryAfterMs ?? OTP_EMAIL_RATE_LIMIT.refillIntervalMs) / 1000 | ||
| ) | ||
| const response = createErrorResponse( | ||
| 'Too many verification code requests. Please try again later.', | ||
| 429 | ||
| ) | ||
| response.headers.set('Retry-After', String(retryAfter)) | ||
| return addCorsHeaders(response, request) | ||
| } | ||
| const otp = generateOTP() | ||
| await storeOTP(email, deployment.id, otp) | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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.