openstack/swift
Code Issues Proposed changes

Merge "enforce account quotas on empty accounts"

Browse Source
This commit is contained in:
Zuul 2020-02-01 02:21:52 +00:00 committed by Gerrit Code Review
commit 01b1d60cd9
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/common/middleware/account_quotas.py
View File

@ -109,7 +109,7 @@ class AccountQuotaMiddleware(object):
account_info = get_account_info(request.environ, self.app,
swift_source='AQ')
if not account_info or not account_info['bytes']:
if not account_info:
return self.app
try:
quota = int(account_info['meta'].get('quota-bytes', -1))

28
test/unit/common/middleware/test_account_quotas.py
View File

@ -210,6 +210,34 @@ class TestAccountQuota(unittest.TestCase):
res = req.get_response(app)
self.assertEqual(res.status_int, 200)
def test_exceed_quota_bytes_on_empty_account_not_authorized(self):
headers = [('x-account-bytes-used', '0'),
('x-account-meta-quota-bytes', '10')]
app = FakeAuthFilter(
account_quotas.AccountQuotaMiddleware(FakeApp(headers)))
cache = FakeCache(None)
req = Request.blank('/v1/a/c/o', method='PUT',
headers={'x-auth-token': 'secret',
'content-length': '100'},
environ={'swift.cache': cache})
res = req.get_response(app)
self.assertEqual(res.status_int, 413)
self.assertEqual(res.body, b'Upload exceeds quota.')
def test_exceed_quota_bytes_not_authorized(self):
headers = [('x-account-bytes-used', '100'),
('x-account-meta-quota-bytes', '1000')]
app = FakeAuthFilter(
account_quotas.AccountQuotaMiddleware(FakeApp(headers)))
cache = FakeCache(None)
req = Request.blank('/v1/a/c/o', method='PUT',
headers={'x-auth-token': 'secret',
'content-length': '901'},
environ={'swift.cache': cache})
res = req.get_response(app)
self.assertEqual(res.status_int, 413)
self.assertEqual(res.body, b'Upload exceeds quota.')
def test_over_quota_container_create_still_works(self):
headers = [('x-account-bytes-used', '1001'),
('x-account-meta-quota-bytes', '1000')]