openstack/swift
Code Issues Proposed changes

py3: port crossdomain

Browse Source 
Change-Id: I83a35f066d69edf39c74fd22c7fb248b5320d21f
This commit is contained in:
Samuel Merritt 2018-06-22 15:59:03 -07:00 committed by Tim Burke
parent 50ea4e1e08
commit 081ff36e6e
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,7 @@ class CrossDomainMiddleware(object):
'<cross-domain-policy>\n' \ '<cross-domain-policy>\n' \
'%s\n' \ '%s\n' \
'</cross-domain-policy>' % self.cross_domain_policy '</cross-domain-policy>' % self.cross_domain_policy
return Response(request=req, body=body, return Response(request=req, body=body.encode('utf-8'),
content_type="application/xml") content_type="application/xml")
def __call__(self, env, start_response): def __call__(self, env, start_response):

32
test/unit/common/middleware/test_crossdomain.py
View File

@ -23,7 +23,7 @@ from swift.common.middleware import crossdomain
class FakeApp(object): class FakeApp(object):
def __call__(self, env, start_response): def __call__(self, env, start_response):
return "FAKE APP" return b"FAKE APP"
def start_response(*args): def start_response(*args):
@ -37,12 +37,12 @@ class TestCrossDomain(unittest.TestCase):
# GET of /crossdomain.xml (default) # GET of /crossdomain.xml (default)
def test_crossdomain_default(self): def test_crossdomain_default(self):
expectedResponse = '<?xml version="1.0"?>\n' \ expectedResponse = b'<?xml version="1.0"?>\n' \
'<!DOCTYPE cross-domain-policy SYSTEM ' \ b'<!DOCTYPE cross-domain-policy SYSTEM ' \
'"http://www.adobe.com/xml/dtds/cross-domain-policy.dtd" >\n' \ b'"http://www.adobe.com/xml/dtds/cross-domain-policy.dtd" >\n' \
'<cross-domain-policy>\n' \ b'<cross-domain-policy>\n' \
'<allow-access-from domain="*" secure="false" />\n' \ b'<allow-access-from domain="*" secure="false" />\n' \
'</cross-domain-policy>' b'</cross-domain-policy>'
req = Request.blank('/crossdomain.xml', req = Request.blank('/crossdomain.xml',
environ={'REQUEST_METHOD': 'GET'}) environ={'REQUEST_METHOD': 'GET'})
@ -53,13 +53,13 @@ class TestCrossDomain(unittest.TestCase):
def test_crossdomain_custom(self): def test_crossdomain_custom(self):
conf = {'cross_domain_policy': '<dummy 1>\n<dummy 2>'} conf = {'cross_domain_policy': '<dummy 1>\n<dummy 2>'}
self.app = crossdomain.CrossDomainMiddleware(FakeApp(), conf) self.app = crossdomain.CrossDomainMiddleware(FakeApp(), conf)
expectedResponse = '<?xml version="1.0"?>\n' \ expectedResponse = b'<?xml version="1.0"?>\n' \
'<!DOCTYPE cross-domain-policy SYSTEM ' \ b'<!DOCTYPE cross-domain-policy SYSTEM ' \
'"http://www.adobe.com/xml/dtds/cross-domain-policy.dtd" >\n' \ b'"http://www.adobe.com/xml/dtds/cross-domain-policy.dtd" >\n' \
'<cross-domain-policy>\n' \ b'<cross-domain-policy>\n' \
'<dummy 1>\n' \ b'<dummy 1>\n' \
'<dummy 2>\n' \ b'<dummy 2>\n' \
'</cross-domain-policy>' b'</cross-domain-policy>'
req = Request.blank('/crossdomain.xml', req = Request.blank('/crossdomain.xml',
environ={'REQUEST_METHOD': 'GET'}) environ={'REQUEST_METHOD': 'GET'})
@ -70,7 +70,7 @@ class TestCrossDomain(unittest.TestCase):
def test_crossdomain_pass(self): def test_crossdomain_pass(self):
req = Request.blank('/', environ={'REQUEST_METHOD': 'GET'}) req = Request.blank('/', environ={'REQUEST_METHOD': 'GET'})
resp = self.app(req.environ, start_response) resp = self.app(req.environ, start_response)
self.assertEqual(resp, 'FAKE APP') self.assertEqual(resp, b'FAKE APP')
# Only GET is allowed on the /crossdomain.xml resource # Only GET is allowed on the /crossdomain.xml resource
def test_crossdomain_get_only(self): def test_crossdomain_get_only(self):
@ -78,7 +78,7 @@ class TestCrossDomain(unittest.TestCase):
req = Request.blank('/crossdomain.xml', req = Request.blank('/crossdomain.xml',
environ={'REQUEST_METHOD': method}) environ={'REQUEST_METHOD': method})
resp = self.app(req.environ, start_response) resp = self.app(req.environ, start_response)
self.assertEqual(resp, 'FAKE APP') self.assertEqual(resp, b'FAKE APP')
if __name__ == '__main__': if __name__ == '__main__':

1
tox.ini
View File

@ -37,6 +37,7 @@ commands =
test/unit/cli/test_ring_builder_analyzer.py \ test/unit/cli/test_ring_builder_analyzer.py \
test/unit/cli/test_ringbuilder.py \ test/unit/cli/test_ringbuilder.py \
test/unit/common/middleware/test_catch_errors.py \ test/unit/common/middleware/test_catch_errors.py \
test/unit/common/middleware/test_crossdomain.py \
test/unit/common/middleware/test_gatekeeper.py \ test/unit/common/middleware/test_gatekeeper.py \
test/unit/common/middleware/test_healthcheck.py \ test/unit/common/middleware/test_healthcheck.py \
test/unit/common/middleware/test_proxy_logging.py \ test/unit/common/middleware/test_proxy_logging.py \