aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-02-04 10:52:05 +0100
committerChocobozzz <me@florianbigard.com>2020-02-04 10:52:05 +0100
commit9a11f73392928c81d4a478191e126d3ec754f781 (patch)
treeeea4d172970fc25d1d22ebe56e00c852466e484c
parent7cd1b12c19d0589d1d692ed0571ca0800f028aea (diff)
downloadPeerTube-9a11f73392928c81d4a478191e126d3ec754f781.tar.gz
PeerTube-9a11f73392928c81d4a478191e126d3ec754f781.tar.zst
PeerTube-9a11f73392928c81d4a478191e126d3ec754f781.zip
Upgrade express-rate-limit
-rw-r--r--package.json2
-rw-r--r--server/controllers/api/index.ts4
-rw-r--r--server/controllers/api/users/index.ts2
-rw-r--r--yarn.lock8
4 files changed, 6 insertions, 10 deletions
diff --git a/package.json b/package.json
index 0a5484d2a..cec311a18 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
95 "deep-object-diff": "^1.1.0", 95 "deep-object-diff": "^1.1.0",
96 "express": "^4.12.4", 96 "express": "^4.12.4",
97 "express-oauth-server": "^2.0.0", 97 "express-oauth-server": "^2.0.0",
98 "express-rate-limit": "^4.0.4", 98 "express-rate-limit": "^5.0.0",
99 "express-validator": "^6.4.0", 99 "express-validator": "^6.4.0",
100 "flat": "^5.0.0", 100 "flat": "^5.0.0",
101 "fluent-ffmpeg": "^2.1.0", 101 "fluent-ffmpeg": "^2.1.0",
diff --git a/server/controllers/api/index.ts b/server/controllers/api/index.ts
index 6138a32de..7bec6c527 100644
--- a/server/controllers/api/index.ts
+++ b/server/controllers/api/index.ts
@@ -1,5 +1,4 @@
1import * as express from 'express' 1import * as express from 'express'
2import * as RateLimit from 'express-rate-limit'
3import { configRouter } from './config' 2import { configRouter } from './config'
4import { jobsRouter } from './jobs' 3import { jobsRouter } from './jobs'
5import { oauthClientsRouter } from './oauth-clients' 4import { oauthClientsRouter } from './oauth-clients'
@@ -15,6 +14,7 @@ import { overviewsRouter } from './overviews'
15import { videoPlaylistRouter } from './video-playlist' 14import { videoPlaylistRouter } from './video-playlist'
16import { CONFIG } from '../../initializers/config' 15import { CONFIG } from '../../initializers/config'
17import { pluginRouter } from './plugins' 16import { pluginRouter } from './plugins'
17import * as RateLimit from 'express-rate-limit'
18 18
19const apiRouter = express.Router() 19const apiRouter = express.Router()
20 20
@@ -24,8 +24,6 @@ apiRouter.use(cors({
24 credentials: true 24 credentials: true
25})) 25}))
26 26
27// FIXME: https://github.com/nfriedly/express-rate-limit/issues/138
28// @ts-ignore
29const apiRateLimiter = RateLimit({ 27const apiRateLimiter = RateLimit({
30 windowMs: CONFIG.RATES_LIMIT.API.WINDOW_MS, 28 windowMs: CONFIG.RATES_LIMIT.API.WINDOW_MS,
31 max: CONFIG.RATES_LIMIT.API.MAX 29 max: CONFIG.RATES_LIMIT.API.MAX
diff --git a/server/controllers/api/users/index.ts b/server/controllers/api/users/index.ts
index b960e80c1..0b7012537 100644
--- a/server/controllers/api/users/index.ts
+++ b/server/controllers/api/users/index.ts
@@ -53,8 +53,6 @@ import { Hooks } from '@server/lib/plugins/hooks'
53 53
54const auditLogger = auditLoggerFactory('users') 54const auditLogger = auditLoggerFactory('users')
55 55
56// FIXME: https://github.com/nfriedly/express-rate-limit/issues/138
57// @ts-ignore
58const loginRateLimiter = RateLimit({ 56const loginRateLimiter = RateLimit({
59 windowMs: CONFIG.RATES_LIMIT.LOGIN.WINDOW_MS, 57 windowMs: CONFIG.RATES_LIMIT.LOGIN.WINDOW_MS,
60 max: CONFIG.RATES_LIMIT.LOGIN.MAX 58 max: CONFIG.RATES_LIMIT.LOGIN.MAX
diff --git a/yarn.lock b/yarn.lock
index 6e75dab9a..68f281e45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2282,10 +2282,10 @@ express-oauth-server@^2.0.0:
2282 express "^4.13.3" 2282 express "^4.13.3"
2283 oauth2-server "3.0.0" 2283 oauth2-server "3.0.0"
2284 2284
2285express-rate-limit@^4.0.4: 2285express-rate-limit@^5.0.0:
2286 version "4.0.4" 2286 version "5.0.0"
2287 resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-4.0.4.tgz#a495338ae9e58c856b66d1346ec0d86f43ba2e43" 2287 resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-5.0.0.tgz#9a6f4cacc388c1a1da7ba2f65db69f7395e9b04e"
2288 integrity sha512-DLRj2vMO7Xgai8qWKU9O6ZztF2bdDmfFNFi9k3G9BPzJ+7MG7eWaaBikbe0eBpNGSxU8JziwW0PQKG78aNWa6g== 2288 integrity sha512-dhT57wqxfqmkOi4HM7NuT4Gd7gbUgSK2ocG27Y6lwm8lbOAw9XQfeANawGq8wLDtlGPO1ZgDj0HmKsykTxfFAg==
2289 2289
2290express-validator@^6.4.0: 2290express-validator@^6.4.0:
2291 version "6.4.0" 2291 version "6.4.0"