Merge branch 'release-freeze' into HEAD

edx · Apr 3, 2019 · 906a794 · 906a794
2 parents d195f09 + 84986ad
commit 906a794
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/cms/envs/common.py b/cms/envs/common.py
@@ -1438,3 +1438,6 @@
 
 ############## Settings for CourseGraph ############################
 COURSEGRAPH_JOB_QUEUE = LOW_PRIORITY_QUEUE
+
+# Max no. of bad requests after which ratelimitier backend will block IP's access
+RATE_LIMIT_BACKEND_MAX_REQUESTS = 30
diff --git a/common/djangoapps/util/bad_request_rate_limiter.py b/common/djangoapps/util/bad_request_rate_limiter.py
@@ -2,13 +2,17 @@
 A utility class which wraps the RateLimitMixin 3rd party class to do bad request counting
 which can be used for rate limiting
 """
+from django.conf import settings
+
 from ratelimitbackend.backends import RateLimitMixin
 
 
 class BadRequestRateLimiter(RateLimitMixin):
     """
     Use the 3rd party RateLimitMixin to help do rate limiting on the Password Reset flows
     """
+    # get max number value from settings instead of using default one
+    requests = settings.RATE_LIMIT_BACKEND_MAX_REQUESTS
 
     def is_rate_limit_exceeded(self, request):
         """

diff --git a/lms/envs/aws.py b/lms/envs/aws.py
@@ -1188,3 +1188,9 @@
     'COMPLETION_VIDEO_COMPLETE_PERCENTAGE',
     COMPLETION_VIDEO_COMPLETE_PERCENTAGE,
 )
+
+# Max no. of bad requests after which ratelimitier backend will block IP's access
+RATE_LIMIT_BACKEND_MAX_REQUESTS = ENV_TOKENS.get(
+    'RATE_LIMIT_BACKEND_MAX_REQUESTS',
+    RATE_LIMIT_BACKEND_MAX_REQUESTS
+)
diff --git a/lms/envs/common.py b/lms/envs/common.py
@@ -3401,3 +3401,6 @@
 ############### Settings for user-state-client ##################
 # Maximum number of rows to fetch in XBlockUserStateClient calls. Adjust for performance
 USER_STATE_BATCH_SIZE = 5000
+
+# Max no. of bad requests after which ratelimitier backend will block IP's access
+RATE_LIMIT_BACKEND_MAX_REQUESTS = 30