From f3c8c36cddbf1801443af431bc7db2e6d844eaed Mon Sep 17 00:00:00 2001 From: Luis Pabon Date: Tue, 26 Nov 2013 20:21:10 -0500 Subject: Return BadRequest on X-Delete-At/After headers Gluster-swift does not support X-Delete-After or X-Delete-At headers. The code needs to inform the caller with a 400-BadRequest if they use these headers. Change-Id: Ic9d3a1646c0d26bb0204245efce4501f7479fee6 Signed-off-by: Luis Pabon Reviewed-on: http://review.gluster.org/6364 Reviewed-by: Chetan Risbud Reviewed-on: http://review.gluster.org/6444 --- test/functional/gluster_swift_tests.py | 33 +++++++++++++++++-- test/unit/common/test_constraints.py | 59 ++++++++++++++++++++++++++++++++-- test/unit/proxy/test_server.py | 10 ++++++ 3 files changed, 97 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/functional/gluster_swift_tests.py b/test/functional/gluster_swift_tests.py index d7a833e..0a721b6 100644 --- a/test/functional/gluster_swift_tests.py +++ b/test/functional/gluster_swift_tests.py @@ -58,6 +58,37 @@ class TestFile(Base): data_read = file.read() self.assertEquals(data,data_read) + def testInvalidHeadersPUT(self): + file = self.env.container.file(Utils.create_name()) + self.assertRaises(ResponseError, + file.write_random, + self.env.file_size, + hdrs={'X-Delete-At': '9876545321'}) + self.assert_status(400) + self.assertRaises(ResponseError, + file.write_random, + self.env.file_size, + hdrs={'X-Delete-After': '60'}) + self.assert_status(400) + + def testInvalidHeadersPOST(self): + file = self.env.container.file(Utils.create_name()) + file.write_random(self.env.file_size) + headers = file.make_headers(cfg={}) + headers.update({ 'X-Delete-At' : '987654321'}) + # Need to call conn.make_request instead of file.sync_metadata + # because sync_metadata calls make_headers. make_headers() + # overwrites any headers in file.metadata as 'user' metadata + # by appending 'X-Object-Meta-' to any of the headers + # in file.metadata. + file.conn.make_request('POST', file.path, hdrs=headers, cfg={}) + self.assertEqual(400, file.conn.response.status) + + headers = file.make_headers(cfg={}) + headers.update({ 'X-Delete-After' : '60'}) + file.conn.make_request('POST', file.path, hdrs=headers, cfg={}) + self.assertEqual(400, file.conn.response.status) + class TestFileUTF8(Base2, TestFile): set_up = False @@ -336,5 +367,3 @@ class TestMultiProtocolAccess(Base): md5_returned = hashlib.md5(data_read_from_mountP).hexdigest() self.assertEquals(md5_returned,file_info['etag']) fhOnMountPoint.close() - - diff --git a/test/unit/common/test_constraints.py b/test/unit/common/test_constraints.py index 7139094..180721c 100644 --- a/test/unit/common/test_constraints.py +++ b/test/unit/common/test_constraints.py @@ -16,7 +16,7 @@ import unittest import swift.common.constraints from nose import SkipTest -from mock import patch +from mock import Mock, patch from gluster.swift.common import constraints as cnt @@ -75,12 +75,65 @@ class TestConstraints(unittest.TestCase): self.assertTrue(cnt.validate_obj_name_component('..')) self.assertTrue(cnt.validate_obj_name_component('')) + def test_validate_headers(self): + req = Mock() + req.headers = [] + self.assertEqual(cnt.validate_headers(req), '') + req.headers = ['x-some-header'] + self.assertEqual(cnt.validate_headers(req), '') + req.headers = ['x-delete-at', 'x-some-header'] + self.assertNotEqual(cnt.validate_headers(req), '') + req.headers = ['x-delete-after', 'x-some-header'] + self.assertNotEqual(cnt.validate_headers(req), '') + req.headers = ['x-delete-at', 'x-delete-after', 'x-some-header'] + self.assertNotEqual(cnt.validate_headers(req), '') + + def test_validate_headers_ignoring_config_set(self): + with patch('gluster.swift.common.constraints.' + 'Glusterfs._ignore_unsupported_headers', True): + req = Mock() + req.headers = [] + self.assertEqual(cnt.validate_headers(req), '') + req.headers = ['x-some-header'] + self.assertEqual(cnt.validate_headers(req), '') + req.headers = ['x-delete-at', 'x-some-header'] + self.assertEqual(cnt.validate_headers(req), '') + req.headers = ['x-delete-after', 'x-some-header'] + self.assertEqual(cnt.validate_headers(req), '') + req.headers = ['x-delete-at', 'x-delete-after', 'x-some-header'] + self.assertEqual(cnt.validate_headers(req), '') + + def test_gluster_check_metadata(self): + mock_check_metadata = Mock() + with patch('gluster.swift.common.constraints.__check_metadata', + mock_check_metadata): + req = Mock() + req.headers = [] + cnt.gluster_check_metadata(req, 'object') + self.assertTrue(1, mock_check_metadata.call_count) + cnt.gluster_check_metadata(req, 'object', POST=False) + self.assertTrue(1, mock_check_metadata.call_count) + req.headers = ['x-some-header'] + self.assertEqual(cnt.gluster_check_metadata(req, 'object', POST=False), None) + req.headers = ['x-delete-at', 'x-some-header'] + self.assertNotEqual(cnt.gluster_check_metadata(req, 'object', POST=False), None) + req.headers = ['x-delete-after', 'x-some-header'] + self.assertNotEqual(cnt.gluster_check_metadata(req, 'object', POST=False), None) + req.headers = ['x-delete-at', 'x-delete-after', 'x-some-header'] + self.assertNotEqual(cnt.gluster_check_metadata(req, 'object', POST=False), None) + def test_gluster_check_object_creation(self): with patch('gluster.swift.common.constraints.__check_object_creation', mock_check_object_creation): - self.assertFalse(cnt.gluster_check_object_creation(None, 'dir/z')) + req = Mock() + req.headers = [] + self.assertFalse(cnt.gluster_check_object_creation(req, 'dir/z')) def test_gluster_check_object_creation_err(self): with patch('gluster.swift.common.constraints.__check_object_creation', mock_check_object_creation): - self.assertTrue(cnt.gluster_check_object_creation(None, 'dir/.')) + req = Mock() + req.headers = [] + self.assertTrue(cnt.gluster_check_object_creation(req, 'dir/.')) + req.headers = ['x-delete-at'] + self.assertTrue(cnt.gluster_check_object_creation(req, 'dir/z')) diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py index 490e8fc..25976ba 100644 --- a/test/unit/proxy/test_server.py +++ b/test/unit/proxy/test_server.py @@ -4354,6 +4354,7 @@ class TestObjectController(unittest.TestCase): self.assert_(called[0]) def test_POST_converts_delete_after_to_delete_at(self): + raise SkipTest("X-Delete-At and X-Delete-After are not supported") with save_globals(): controller = proxy_server.ObjectController(self.app, 'account', 'container', 'object') @@ -4390,6 +4391,7 @@ class TestObjectController(unittest.TestCase): time.time = orig_time def test_POST_non_int_delete_after(self): + raise SkipTest("X-Delete-At and X-Delete-After are not supported") with save_globals(): controller = proxy_server.ObjectController(self.app, 'account', 'container', 'object') @@ -4404,6 +4406,7 @@ class TestObjectController(unittest.TestCase): self.assertTrue('Non-integer X-Delete-After' in res.body) def test_POST_negative_delete_after(self): + raise SkipTest("X-Delete-At and X-Delete-After are not supported") with save_globals(): controller = proxy_server.ObjectController(self.app, 'account', 'container', 'object') @@ -4418,6 +4421,7 @@ class TestObjectController(unittest.TestCase): self.assertTrue('X-Delete-At in past' in res.body) def test_POST_delete_at(self): + raise SkipTest("X-Delete-At and X-Delete-After are not supported") with save_globals(): given_headers = {} @@ -4462,6 +4466,7 @@ class TestObjectController(unittest.TestCase): self.assertTrue('X-Delete-At in past' in resp.body) def test_PUT_converts_delete_after_to_delete_at(self): + raise SkipTest("X-Delete-At and X-Delete-After are not supported") with save_globals(): controller = proxy_server.ObjectController(self.app, 'account', 'container', 'object') @@ -4484,6 +4489,7 @@ class TestObjectController(unittest.TestCase): time.time = orig_time def test_PUT_non_int_delete_after(self): + raise SkipTest("X-Delete-At and X-Delete-After are not supported") with save_globals(): controller = proxy_server.ObjectController(self.app, 'account', 'container', 'object') @@ -4499,6 +4505,7 @@ class TestObjectController(unittest.TestCase): self.assertTrue('Non-integer X-Delete-After' in res.body) def test_PUT_negative_delete_after(self): + raise SkipTest("X-Delete-At and X-Delete-After are not supported") with save_globals(): controller = proxy_server.ObjectController(self.app, 'account', 'container', 'object') @@ -4514,6 +4521,7 @@ class TestObjectController(unittest.TestCase): self.assertTrue('X-Delete-At in past' in res.body) def test_PUT_delete_at(self): + raise SkipTest("X-Delete-At and X-Delete-After are not supported") with save_globals(): given_headers = {} @@ -4890,6 +4898,7 @@ class TestObjectController(unittest.TestCase): @mock.patch('time.time', new=lambda: STATIC_TIME) def test_PUT_x_delete_at_with_fewer_container_replicas(self): + raise SkipTest("X-Delete-At and X-Delete-After are not supported") self.app.container_ring.set_replicas(2) delete_at_timestamp = int(time.time()) + 100000 @@ -4925,6 +4934,7 @@ class TestObjectController(unittest.TestCase): @mock.patch('time.time', new=lambda: STATIC_TIME) def test_PUT_x_delete_at_with_more_container_replicas(self): + raise SkipTest("X-Delete-At and X-Delete-After are not supported") self.app.container_ring.set_replicas(4) self.app.expiring_objects_account = 'expires' self.app.expiring_objects_container_divisor = 60 -- cgit