encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-29 01:20:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Better throttle rate corner case handling

Browse Source
This commit is contained in:
mizvyt 2019-10-01 13:12:56 +08:00
parent dd7adc7ed7
commit c297600fb9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rest_framework/throttling.py
View File

@ -106,15 +106,15 @@ class SimpleRateThrottle(BaseThrottle):
try:
num, period = rate.split('/')
num_requests = int(num)
# Get rate multiplier value if available
period_mult, _ = re.split('[s|m|h|d]', period, maxsplit=1)
period_char = re.findall('[s|m|h|d]', period)[0]
except ValueError:
period_timescale = re.findall(r'^\d*[s|m|h|d]', period)[0]
period_char = period_timescale[-1]
except (ValueError, IndexError):
msg = "Incorrect throttle rate set for '%s' scope" % self.scope
raise ImproperlyConfigured(msg)
try:
period_mult = int(period_mult)
# Get rate multiplier value if available
period_mult = int(period_timescale[:-1])
except ValueError:
period_mult = 1

4
tests/test_throttling.py
View File

@ -474,11 +474,11 @@ class SimpleRateThrottleTests(TestCase):
with pytest.raises(ImproperlyConfigured):
SimpleRateThrottle()
SimpleRateThrottle.rate = '100/century'
SimpleRateThrottle.rate = '100/foos'
with pytest.raises(ImproperlyConfigured):
SimpleRateThrottle()
SimpleRateThrottle.rate = '100/10century'
SimpleRateThrottle.rate = '100/10foos'
with pytest.raises(ImproperlyConfigured):
SimpleRateThrottle()