openstack/swift
Code Issues Proposed changes

limit posts and copies

Browse Source
This commit is contained in:
David Goetz 2011-07-11 15:54:51 -07:00
parent 748f449d31
commit e3ff894fab
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/middleware/ratelimit.py
View File

@ -107,13 +107,13 @@ class RateLimitMiddleware(object):
keys = []
if self.account_ratelimit and \
account_name and container_name and not obj_name and \
req_method in ('PUT', 'DELETE'):
req_method in ('PUT', 'DELETE', 'POST'):
# account_ratelimit PUTs/DELETEs to acc_name/cont_name
keys.append(("ratelimit/%s" % account_name,
self.account_ratelimit))
if account_name and container_name and obj_name and \
req_method in ('PUT', 'DELETE'):
req_method in ('PUT', 'DELETE', 'POST', 'COPY'):
# container_ratelimit PUTs/DELETEs to acc_name/cont_name/obj_name
container_size = None
memcache_key = get_container_memcache_key(account_name,

4
test/unit/common/middleware/test_ratelimit.py
View File

@ -191,7 +191,7 @@ class TestRateLimit(unittest.TestCase):
self.assertEquals(len(the_app.get_ratelimitable_key_tuples(
'DELETE', 'a', None, None)), 0)
self.assertEquals(len(the_app.get_ratelimitable_key_tuples(
'POST', 'a', 'c', None)), 0)
'POST', 'a', 'c', None)), 1)
self.assertEquals(len(the_app.get_ratelimitable_key_tuples(
'PUT', 'a', 'c', None)), 1)
self.assertEquals(len(the_app.get_ratelimitable_key_tuples(
@ -208,7 +208,7 @@ class TestRateLimit(unittest.TestCase):
self.test_ratelimit = ratelimit.filter_factory(conf_dict)(FakeApp())
ratelimit.http_connect = mock_http_connect(204)
for meth, exp_time in [('DELETE', 9.8), ('GET', 0),
('POST', 0), ('PUT', 9.8)]:
('POST', 9.8), ('PUT', 9.8)]:
req = Request.blank('/v/a%s/c' % meth)
req.method = meth
req.environ['swift.cache'] = FakeMemcache()