openstack/swift
Code Issues Proposed changes

Merge "more tests for canned acls"

Browse Source
This commit is contained in:
Zuul 2022-06-06 03:23:05 +00:00 committed by Gerrit Code Review
commit e596754db5
1 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
test/unit/common/middleware/s3api/test_acl_utils.py
View File

@ -16,6 +16,7 @@
import unittest import unittest
from swift.common.swob import Request from swift.common.swob import Request
from swift.common.middleware.s3api import s3response
from swift.common.middleware.s3api.acl_utils import handle_acl_header from swift.common.middleware.s3api.acl_utils import handle_acl_header
from test.unit.common.middleware.s3api import S3ApiTestCase from test.unit.common.middleware.s3api import S3ApiTestCase
@ -26,29 +27,47 @@ class TestS3ApiAclUtils(S3ApiTestCase):
def setUp(self): def setUp(self):
super(TestS3ApiAclUtils, self).setUp() super(TestS3ApiAclUtils, self).setUp()
def test_handle_acl_header(self): def check_generated_acl_header(self, acl, expected):
def check_generated_acl_header(acl, targets): req = Request.blank('/bucket',
req = Request.blank('/bucket', headers={'X-Amz-Acl': acl})
headers={'X-Amz-Acl': acl}) try:
handle_acl_header(req) handle_acl_header(req)
for target in targets: except s3response.ErrorResponse as e:
if isinstance(e, expected):
self.assertEqual(expected._status, e._status)
else:
raise
else:
for target in expected:
self.assertTrue(target[0] in req.headers) self.assertTrue(target[0] in req.headers)
self.assertEqual(req.headers[target[0]], target[1]) self.assertEqual(req.headers[target[0]], target[1])
check_generated_acl_header('public-read', def test_canned_acl_header(self):
[('X-Container-Read', '.r:*,.rlistings')]) # https://docs.aws.amazon.com/AmazonS3/latest/userguide/acl-overview.html#canned-acl
check_generated_acl_header('public-read-write', self.check_generated_acl_header(
[('X-Container-Read', '.r:*,.rlistings'), 'private',
('X-Container-Write', '.r:*')]) [('X-Container-Read', '.'), ('X-Container-Write', '.')])
check_generated_acl_header('private', self.check_generated_acl_header(
[('X-Container-Read', '.'), 'public-read', [('X-Container-Read', '.r:*,.rlistings')])
('X-Container-Write', '.')]) self.check_generated_acl_header(
check_generated_acl_header('bucket-owner-full-control', 'public-read-write', [('X-Container-Read', '.r:*,.rlistings'),
[('X-Container-Read', '.'), ('X-Container-Write', '.r:*')])
('X-Container-Write', '.')]) self.check_generated_acl_header(
check_generated_acl_header('bucket-owner-read', 'aws-exec-read', s3response.InvalidArgument)
[('X-Container-Read', '.'), self.check_generated_acl_header(
('X-Container-Write', '.')]) 'authenticated-read', s3response.S3NotImplemented)
self.check_generated_acl_header(
'bucket-owner-read', [('X-Container-Read', '.'),
('X-Container-Write', '.')])
self.check_generated_acl_header(
'bucket-owner-full-control', [('X-Container-Read', '.'),
('X-Container-Write', '.')])
self.check_generated_acl_header(
'log-delivery-write', s3response.S3NotImplemented)
# the 400 response is the catch all
self.check_generated_acl_header(
'some-non-sense', s3response.InvalidArgument)
if __name__ == '__main__': if __name__ == '__main__':