Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Add dedicated rate limiters for tokens checker

Chocobozzz2b6b99d2cee2
diff --git a/config/config-schema.json b/config/config-schema.json
index f50b227a75..d0cad56f30 100644
--- a/config/config-schema.json
+++ b/config/config-schema.json
@@ -124,6 +124,21 @@
},
"additionalProperties": false
},
+ "confirm_token": {
+ "type": "object",
+ "properties": {
+ "window": {
+ "description": "Consuming a token sent by email/OTP (reset password, verify email, confirm 2FA) 10 attempts in 5 min",
+ "type": "string",
+ "default": "5 minutes"
+ },
+ "max": {
+ "type": "integer",
+ "default": 10
+ }
+ },
+ "additionalProperties": false
+ },
"receive_client_log": {
"type": "object",
"properties": {
@@ -272,14 +287,14 @@
"default": "5 minutes"
},
"max": {
- "description": "Requires at least 4 distinct IPs (`max / max_per_ip`) to lock an account",
+ "description": "Requires at least 10 distinct IPs (`max / max_per_ip`) to lock an account",
"type": "integer",
- "default": 20
+ "default": 60
},
"max_per_ip": {
- "description": "A single IP's contribution to the account lock is capped at 5 failures",
+ "description": "A single IP's contribution to the account lock is capped at 6 failures",
"type": "integer",
- "default": 5
+ "default": 6
}
},
"additionalProperties": false
diff --git a/config/default.yaml b/config/default.yaml
index 5987db7714..95c19b5ed5 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -38,6 +38,11 @@ rates_limit:
# 3 attempts in 5 min
window: 5 minutes
max: 3
+ confirm_token:
+ # Consuming a token sent by email/OTP (reset password, verify email, confirm 2FA)
+ # 10 attempts in 5 min
+ window: 5 minutes
+ max: 10
receive_client_log:
# 1 attempt every 2 seconds
window: 1 minute
diff --git a/config/production.yaml.example b/config/production.yaml.example
index b8f8ac84a3..102c7c1bbe 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -36,6 +36,11 @@ rates_limit:
# 3 attempts in 5 min
window: 5 minutes
max: 3
+ confirm_token:
+ # Consuming a token sent by email/OTP (reset password, verify email, confirm 2FA)
+ # 10 attempts in 5 min
+ window: 5 minutes
+ max: 10
receive_client_log:
# 1 attempt every 2 seconds
window: 1 minute
diff --git a/config/test.yaml b/config/test.yaml
index 47eb29dd74..4afd76659f 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -19,6 +19,9 @@ rates_limit:
api:
window: 10 seconds
max: 500
+ confirm_token:
+ window: 10 seconds
+ max: 500
report_abuse:
window: 10 seconds
max: 500
diff --git a/server/core/controllers/api/users/email-verification.ts b/server/core/controllers/api/users/email-verification.ts
index 08bceb34b2..2d643f7b4a 100644
--- a/server/core/controllers/api/users/email-verification.ts
+++ b/server/core/controllers/api/users/email-verification.ts
@@ -3,7 +3,7 @@ import { Redis } from '@server/lib/redis.js'
import express from 'express'
import { CONFIG } from '../../../initializers/config.js'
import { sendVerifyRegistrationEmail, sendVerifyRegistrationRequestEmail, sendVerifyUserChangeEmail } from '../../../lib/user.js'
-import { asyncMiddleware, buildRateLimiter } from '../../../middlewares/index.js'
+import { asyncMiddleware, buildRateLimiter, confirmTokenRateLimiter } from '../../../middlewares/index.js'
import {
registrationVerifyEmailValidator,
usersAskSendRegistrationVerifyEmailValidator,
@@ -34,12 +34,14 @@ emailVerificationRouter.post(
emailVerificationRouter.post(
'/:id/verify-email',
+ confirmTokenRateLimiter,
asyncMiddleware(usersVerifyEmailValidator),
asyncMiddleware(verifyUserEmail)
)
emailVerificationRouter.post(
'/registrations/:registrationId/verify-email',
+ confirmTokenRateLimiter,
asyncMiddleware(registrationVerifyEmailValidator),
asyncMiddleware(verifyRegistrationEmail)
)
diff --git a/server/core/controllers/api/users/index.ts b/server/core/controllers/api/users/index.ts
index e621ac410e..65628879c9 100644
--- a/server/core/controllers/api/users/index.ts
+++ b/server/core/controllers/api/users/index.ts
@@ -22,6 +22,7 @@ import {
asyncRetryTransactionMiddleware,
authenticate,
buildRateLimiter,
+ confirmTokenRateLimiter,
ensureUserHasRight,
paginationValidator,
setDefaultPagination,
@@ -148,6 +149,7 @@ usersRouter.post(
usersRouter.post(
'/:id/reset-password',
+ confirmTokenRateLimiter,
asyncMiddleware(usersResetPasswordValidator),
asyncMiddleware(resetUserPassword)
)
diff --git a/server/core/controllers/api/users/two-factor.ts b/server/core/controllers/api/users/two-factor.ts
index f3dba3a532..180a670883 100644
--- a/server/core/controllers/api/users/two-factor.ts
+++ b/server/core/controllers/api/users/two-factor.ts
@@ -3,7 +3,7 @@ import { generateOTPSecret, isOTPValid } from '@server/helpers/otp.js'
import { encrypt } from '@server/helpers/peertube-crypto.js'
import { CONFIG } from '@server/initializers/config.js'
import { Redis } from '@server/lib/redis.js'
-import { asyncMiddleware, authenticate, usersCheckCurrentPasswordFactory } from '@server/middlewares/index.js'
+import { asyncMiddleware, authenticate, confirmTokenRateLimiter, usersCheckCurrentPasswordFactory } from '@server/middlewares/index.js'
import {
confirmTwoFactorValidator,
disableTwoFactorValidator,
@@ -21,6 +21,7 @@ twoFactorRouter.post('/:id/two-factor/request',
)
twoFactorRouter.post('/:id/two-factor/confirm-request',
+ confirmTokenRateLimiter,
authenticate,
asyncMiddleware(requestOrConfirmTwoFactorValidator),
confirmTwoFactorValidator,
diff --git a/server/core/initializers/checker-before-init.ts b/server/core/initializers/checker-before-init.ts
index 78478108fa..9589dfec19 100644
--- a/server/core/initializers/checker-before-init.ts
+++ b/server/core/initializers/checker-before-init.ts
@@ -176,6 +176,8 @@ export function checkMissedConfig () {
'rates_limit.signup.max',
'rates_limit.ask_send_email.window',
'rates_limit.ask_send_email.max',
+ 'rates_limit.confirm_token.window',
+ 'rates_limit.confirm_token.max',
'rates_limit.receive_client_log.window',
'rates_limit.receive_client_log.max',
'rates_limit.plugins.window',
diff --git a/server/core/initializers/config.ts b/server/core/initializers/config.ts
index 270dca9cb5..c0c74277a5 100644
--- a/server/core/initializers/config.ts
+++ b/server/core/initializers/config.ts
@@ -359,6 +359,10 @@ const CONFIG = {
WINDOW_MS: parseDurationToMs(config.get<string>('rates_limit.ask_send_email.window')),
MAX: config.get<number>('rates_limit.ask_send_email.max')
},
+ CONFIRM_TOKEN: {
+ WINDOW_MS: parseDurationToMs(config.get<string>('rates_limit.confirm_token.window')),
+ MAX: config.get<number>('rates_limit.confirm_token.max')
+ },
PLUGINS: {
WINDOW_MS: parseDurationToMs(config.get<string>('rates_limit.plugins.window')),
MAX: config.get<number>('rates_limit.plugins.max')
diff --git a/server/core/middlewares/rate-limiter.ts b/server/core/middlewares/rate-limiter.ts
index 390247c21f..e539608f78 100644
--- a/server/core/middlewares/rate-limiter.ts
+++ b/server/core/middlewares/rate-limiter.ts
@@ -62,6 +62,12 @@ export const apiRateLimiter = buildRateLimiter({
max: CONFIG.RATES_LIMIT.API.MAX
})
+// Endpoints that consume a token sent by email or generated for the user (reset password, verify email, confirm 2FA)
+export const confirmTokenRateLimiter = buildRateLimiter({
+ windowMs: CONFIG.RATES_LIMIT.CONFIRM_TOKEN.WINDOW_MS,
+ max: CONFIG.RATES_LIMIT.CONFIRM_TOKEN.MAX
+})
+
export const activityPubRateLimiter = buildRateLimiter({
windowMs: CONFIG.RATES_LIMIT.ACTIVITY_PUB.WINDOW_MS,
max: CONFIG.RATES_LIMIT.ACTIVITY_PUB.MAX
diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index c16e8315dd..2b659cc848 100644
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -45,6 +45,11 @@ rates_limit:
max:
__name: PEERTUBE_RATES_LIMIT_ASK_SEND_EMAIL_MAX
__format: json
+ confirm_token:
+ window: PEERTUBE_RATES_LIMIT_CONFIRM_TOKEN_WINDOW
+ max:
+ __name: PEERTUBE_RATES_LIMIT_CONFIRM_TOKEN_MAX
+ __format: json
receive_client_log:
window: PEERTUBE_RATES_LIMIT_RECEIVE_CLIENT_LOG_WINDOW
max: