openstack/swift
Code Issues Proposed changes

Merge "Correct 400 response message when x-delete-after is zero"

Browse Source
This commit is contained in:
Zuul 2018-01-08 15:47:41 +00:00 committed by Gerrit Code Review
commit af2b799862
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
swift/common/constraints.py
View File

@ -302,9 +302,9 @@ def valid_timestamp(request):
def check_delete_headers(request):
"""
Validate if 'x-delete' headers are have correct values
values should be positive integers and correspond to
a time in the future.
Check that 'x-delete-after' and 'x-delete-at' headers have valid values.
Values should be positive integers and correspond to a time greater than or
equal to the request timestamp.
:param request: the swob request object
@ -319,13 +319,13 @@ def check_delete_headers(request):
raise HTTPBadRequest(request=request,
content_type='text/plain',
body='Non-integer X-Delete-After')
actual_del_time = now + x_delete_after
if actual_del_time < now:
actual_del_time = utils.normalize_delete_at_timestamp(
now + x_delete_after)
if int(actual_del_time) < now:
raise HTTPBadRequest(request=request,
content_type='text/plain',
body='X-Delete-After in past')
request.headers['x-delete-at'] = utils.normalize_delete_at_timestamp(
actual_del_time)
request.headers['x-delete-at'] = actual_del_time
del request.headers['x-delete-after']
if 'x-delete-at' in request.headers:

8
test/unit/common/test_constraints.py
View File

@ -283,6 +283,14 @@ class TestConstraints(unittest.TestCase):
self.assertEqual(cm.exception.status_int, HTTP_BAD_REQUEST)
self.assertIn('X-Delete-After in past', cm.exception.body)
headers = {'X-Delete-After': '0',
'X-Timestamp': str(time.time())}
with self.assertRaises(HTTPException) as cm:
constraints.check_delete_headers(
Request.blank('/', headers=headers))
self.assertEqual(cm.exception.status_int, HTTP_BAD_REQUEST)
self.assertIn('X-Delete-After in past', cm.exception.body)
# X-Delete-At
delete_at = str(int(ts + 100))
headers = {'X-Delete-At': delete_at,