Skip to content

Commit 9d53063

Browse files
authored
fix: disable blanket API throttling in favour of WAF (#6642)
1 parent 04431e9 commit 9d53063

3 files changed

Lines changed: 2 additions & 42 deletions

File tree

api/app/settings/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@
302302

303303
LOGIN_THROTTLE_RATE = env("LOGIN_THROTTLE_RATE", "20/min")
304304
SIGNUP_THROTTLE_RATE = env("SIGNUP_THROTTLE_RATE", "10000/min")
305-
USER_THROTTLE_RATE = env("USER_THROTTLE_RATE", "500/min")
306-
MASTER_API_KEY_THROTTLE_RATE = env("MASTER_API_KEY_THROTTLE_RATE", USER_THROTTLE_RATE)
305+
USER_THROTTLE_RATE = env("USER_THROTTLE_RATE", default=None)
306+
MASTER_API_KEY_THROTTLE_RATE = env("MASTER_API_KEY_THROTTLE_RATE", default=None)
307307
DEFAULT_THROTTLE_CLASSES = env.list("DEFAULT_THROTTLE_CLASSES", subcast=str, default=[])
308308
REST_FRAMEWORK = {
309309
"DEFAULT_PERMISSION_CLASSES": ["rest_framework.permissions.IsAuthenticated"],

infrastructure/aws/production/ecs-task-definition-web.json

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -130,26 +130,6 @@
130130
"name": "INFLUXDB_URL",
131131
"value": "https://eu-central-1-1.aws.cloud2.influxdata.com"
132132
},
133-
{
134-
"name": "DEFAULT_THROTTLE_CLASSES",
135-
"value": "core.throttling.UserRateThrottle,core.throttling.MasterAPIKeyUserRateThrottle"
136-
},
137-
{
138-
"name": "USER_THROTTLE_CACHE_BACKEND",
139-
"value": "django_redis.cache.RedisCache"
140-
},
141-
{
142-
"name": "USER_THROTTLE_CACHE_LOCATION",
143-
"value": "rediss://serverless-redis-cache-c4q8sw.serverless.euw2.cache.amazonaws.com:6379"
144-
},
145-
{
146-
"name": "USER_THROTTLE_CACHE_OPTIONS",
147-
"value": "CLIENT_CLASS=core.redis_cluster.SafeRedisClusterClient"
148-
},
149-
{
150-
"name": "MASTER_API_KEY_THROTTLE_RATE",
151-
"value": "100/sec"
152-
},
153133
{
154134
"name": "OAUTH_CLIENT_ID",
155135
"value": "232959427810-br6ltnrgouktp0ngsbs04o14ueb9rch0.apps.googleusercontent.com"

infrastructure/aws/staging/ecs-task-definition-web.json

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -194,26 +194,6 @@
194194
"name": "INFLUXDB_URL",
195195
"value": "https://eu-central-1-1.aws.cloud2.influxdata.com"
196196
},
197-
{
198-
"name": "DEFAULT_THROTTLE_CLASSES",
199-
"value": "core.throttling.UserRateThrottle,core.throttling.MasterAPIKeyUserRateThrottle"
200-
},
201-
{
202-
"name": "USER_THROTTLE_CACHE_BACKEND",
203-
"value": "django_redis.cache.RedisCache"
204-
},
205-
{
206-
"name": "USER_THROTTLE_CACHE_LOCATION",
207-
"value": "rediss://serverless-redis-cache-7u3xil.serverless.euw2.cache.amazonaws.com:6379"
208-
},
209-
{
210-
"name": "USER_THROTTLE_CACHE_OPTIONS",
211-
"value": "CLIENT_CLASS=core.redis_cluster.SafeRedisClusterClient"
212-
},
213-
{
214-
"name": "MASTER_API_KEY_THROTTLE_RATE",
215-
"value": "10/sec"
216-
},
217197
{
218198
"name": "GITHUB_APP_ID",
219199
"value": "811209"

0 commit comments

Comments
 (0)