x/swift3
Code Issues Proposed changes

Fix pep8 errors

Browse Source 
Change-Id: I905c1f36055f7b7f8d017eecd9ae7922291cb09c
This commit is contained in:
MORITA Kazutaka 2014-03-26 08:41:27 +09:00
parent 6232baa895
commit 63b597f350
3 changed files with 85 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swift3/middleware.py
View File

@ -786,7 +786,7 @@ class ObjectController(WSGIContext):
return get_err_response('InvalidDigest') return get_err_response('InvalidDigest')
try: try:
env['HTTP_ETAG'] = value.decode('base64').encode('hex') env['HTTP_ETAG'] = value.decode('base64').encode('hex')
except: except Exception:
return get_err_response('InvalidDigest') return get_err_response('InvalidDigest')
if env['HTTP_ETAG'] == '': if env['HTTP_ETAG'] == '':
return get_err_response('SignatureDoesNotMatch') return get_err_response('SignatureDoesNotMatch')
@ -825,7 +825,7 @@ class ObjectController(WSGIContext):
""" """
try: try:
self._app_call(env) self._app_call(env)
except: except Exception:
return get_err_response('InvalidURI') return get_err_response('InvalidURI')
status = self._get_status_int() status = self._get_status_int()
@ -852,7 +852,8 @@ class Swift3Middleware(object):
def get_controller(self, env, path): def get_controller(self, env, path):
container, obj = split_path(path, 0, 2, True) container, obj = split_path(path, 0, 2, True)
d = dict(container_name=container, object_name=unquote(obj) if obj is not None else obj) d = dict(container_name=container, object_name=unquote(obj)
if obj is not None else obj)
if 'QUERY_STRING' in env: if 'QUERY_STRING' in env:
args = dict(urlparse.parse_qsl(env['QUERY_STRING'], 1)) args = dict(urlparse.parse_qsl(env['QUERY_STRING'], 1))
@ -894,7 +895,7 @@ class Swift3Middleware(object):
try: try:
keyword, info = req.headers['Authorization'].split(' ') keyword, info = req.headers['Authorization'].split(' ')
except: except Exception:
return get_err_response('AccessDenied')(env, start_response) return get_err_response('AccessDenied')(env, start_response)
if keyword != 'AWS': if keyword != 'AWS':
@ -902,7 +903,7 @@ class Swift3Middleware(object):
try: try:
account, signature = info.rsplit(':', 1) account, signature = info.rsplit(':', 1)
except: except Exception:
return get_err_response('InvalidArgument')(env, start_response) return get_err_response('InvalidArgument')(env, start_response)
try: try:

37
swift3/test/unit/test_swift3.py
View File

@ -400,7 +400,7 @@ class TestSwift3(unittest.TestCase):
req = Request.blank('/bucket', req = Request.blank('/bucket',
environ={'REQUEST_METHOD': 'PUT'}, environ={'REQUEST_METHOD': 'PUT'},
headers={'Authorization': 'AWS test:tester:hmac'}) headers={'Authorization': 'AWS test:tester:hmac'})
resp = local_app(req.environ, local_app.app.do_start_response) local_app(req.environ, local_app.app.do_start_response)
self.assertEquals(local_app.app.response_args[0].split()[0], '200') self.assertEquals(local_app.app.response_args[0].split()[0], '200')
def test_bucket_DELETE_error(self): def test_bucket_DELETE_error(self):
@ -420,13 +420,14 @@ class TestSwift3(unittest.TestCase):
req = Request.blank('/bucket', req = Request.blank('/bucket',
environ={'REQUEST_METHOD': 'DELETE'}, environ={'REQUEST_METHOD': 'DELETE'},
headers={'Authorization': 'AWS test:tester:hmac'}) headers={'Authorization': 'AWS test:tester:hmac'})
resp = local_app(req.environ, local_app.app.do_start_response) local_app(req.environ, local_app.app.do_start_response)
self.assertEquals(local_app.app.response_args[0].split()[0], '204') self.assertEquals(local_app.app.response_args[0].split()[0], '204')
def _check_acl(self, owner, resp): def _check_acl(self, owner, resp):
dom = xml.dom.minidom.parseString("".join(resp)) dom = xml.dom.minidom.parseString("".join(resp))
self.assertEquals(dom.firstChild.nodeName, 'AccessControlPolicy') self.assertEquals(dom.firstChild.nodeName, 'AccessControlPolicy')
name = dom.getElementsByTagName('Permission')[0].childNodes[0].nodeValue permission = dom.getElementsByTagName('Permission')[0]
name = permission.childNodes[0].nodeValue
self.assertEquals(name, 'FULL_CONTROL') self.assertEquals(name, 'FULL_CONTROL')
name = dom.getElementsByTagName('ID')[0].childNodes[0].nodeValue name = dom.getElementsByTagName('ID')[0].childNodes[0].nodeValue
self.assertEquals(name, owner) self.assertEquals(name, owner)
@ -499,7 +500,7 @@ class TestSwift3(unittest.TestCase):
environ={'REQUEST_METHOD': 'GET'}, environ={'REQUEST_METHOD': 'GET'},
headers={'Authorization': 'AWS test:tester:hmac', headers={'Authorization': 'AWS test:tester:hmac',
'Range': 'bytes=0-3'}) 'Range': 'bytes=0-3'})
resp = local_app(req.environ, local_app.app.do_start_response) local_app(req.environ, local_app.app.do_start_response)
self.assertEquals(local_app.app.response_args[0].split()[0], '206') self.assertEquals(local_app.app.response_args[0].split()[0], '206')
headers = dict((k.lower(), v) for k, v in headers = dict((k.lower(), v) for k, v in
@ -526,14 +527,15 @@ class TestSwift3(unittest.TestCase):
def test_object_PUT(self): def test_object_PUT(self):
local_app = swift3.filter_factory({})(FakeAppObject(201)) local_app = swift3.filter_factory({})(FakeAppObject(201))
req = Request.blank('/bucket/object', req = Request.blank(
'/bucket/object',
environ={'REQUEST_METHOD': 'PUT'}, environ={'REQUEST_METHOD': 'PUT'},
headers={'Authorization': 'AWS test:tester:hmac', headers={'Authorization': 'AWS test:tester:hmac',
'x-amz-storage-class': 'REDUCED_REDUNDANCY', 'x-amz-storage-class': 'REDUCED_REDUNDANCY',
'Content-MD5': 'Gyz1NfJ3Mcl0NDZFo5hTKA=='}) 'Content-MD5': 'Gyz1NfJ3Mcl0NDZFo5hTKA=='})
req.date = datetime.now() req.date = datetime.now()
req.content_type = 'text/plain' req.content_type = 'text/plain'
resp = local_app(req.environ, local_app.app.do_start_response) local_app(req.environ, local_app.app.do_start_response)
self.assertEquals(local_app.app.response_args[0].split()[0], '200') self.assertEquals(local_app.app.response_args[0].split()[0], '200')
headers = dict((k.lower(), v) for k, v in headers = dict((k.lower(), v) for k, v in
@ -549,7 +551,8 @@ class TestSwift3(unittest.TestCase):
return [] return []
app = FakeApp() app = FakeApp()
local_app = swift3.filter_factory({})(app) local_app = swift3.filter_factory({})(app)
req = Request.blank('/bucket/object', req = Request.blank(
'/bucket/object',
environ={'REQUEST_METHOD': 'PUT'}, environ={'REQUEST_METHOD': 'PUT'},
headers={'Authorization': 'AWS test:tester:hmac', headers={'Authorization': 'AWS test:tester:hmac',
'X-Amz-Storage-Class': 'REDUCED_REDUNDANCY', 'X-Amz-Storage-Class': 'REDUCED_REDUNDANCY',
@ -558,7 +561,7 @@ class TestSwift3(unittest.TestCase):
'Content-MD5': 'ffoHqOWd280dyE1MT4KuoQ=='}) 'Content-MD5': 'ffoHqOWd280dyE1MT4KuoQ=='})
req.date = datetime.now() req.date = datetime.now()
req.content_type = 'text/plain' req.content_type = 'text/plain'
resp = local_app(req.environ, lambda *args: None) local_app(req.environ, lambda *args: None)
self.assertEquals(app.req.headers['ETag'], self.assertEquals(app.req.headers['ETag'],
'7dfa07a8e59ddbcd1dc84d4c4f82aea1') '7dfa07a8e59ddbcd1dc84d4c4f82aea1')
self.assertEquals(app.req.headers['X-Object-Meta-Something'], 'oh hai') self.assertEquals(app.req.headers['X-Object-Meta-Something'], 'oh hai')
@ -583,7 +586,7 @@ class TestSwift3(unittest.TestCase):
req = Request.blank('/bucket/object', req = Request.blank('/bucket/object',
environ={'REQUEST_METHOD': 'DELETE'}, environ={'REQUEST_METHOD': 'DELETE'},
headers={'Authorization': 'AWS test:tester:hmac'}) headers={'Authorization': 'AWS test:tester:hmac'})
resp = local_app(req.environ, local_app.app.do_start_response) local_app(req.environ, local_app.app.do_start_response)
self.assertEquals(local_app.app.response_args[0].split()[0], '204') self.assertEquals(local_app.app.response_args[0].split()[0], '204')
def test_object_multi_DELETE(self): def test_object_multi_DELETE(self):
@ -603,7 +606,7 @@ class TestSwift3(unittest.TestCase):
body=body) body=body)
req.date = datetime.now() req.date = datetime.now()
req.content_type = 'text/plain' req.content_type = 'text/plain'
resp = local_app(req.environ, local_app.app.do_start_response) local_app(req.environ, local_app.app.do_start_response)
self.assertEquals(local_app.app.response_args[0].split()[0], '200') self.assertEquals(local_app.app.response_args[0].split()[0], '200')
def test_object_acl_GET(self): def test_object_acl_GET(self):
@ -621,8 +624,8 @@ class TestSwift3(unittest.TestCase):
""" """
def verify(hash, path, headers): def verify(hash, path, headers):
req = Request.blank(path, headers=headers) req = Request.blank(path, headers=headers)
self.assertEquals(hash, self.assertEquals(hash, hashlib.md5(
hashlib.md5(swift3.canonical_string(req)).hexdigest()) swift3.canonical_string(req)).hexdigest())
verify('6dd08c75e42190a1ce9468d1fd2eb787', '/bucket/object', verify('6dd08c75e42190a1ce9468d1fd2eb787', '/bucket/object',
{'Content-Type': 'text/plain', 'X-Amz-Something': 'test', {'Content-Type': 'text/plain', 'X-Amz-Something': 'test',
@ -678,10 +681,11 @@ class TestSwift3(unittest.TestCase):
app = FakeApp() app = FakeApp()
local_app = swift3.filter_factory({})(app) local_app = swift3.filter_factory({})(app)
req = Request.blank('/bucket/object?Signature=X&Expires=Y&' req = Request.blank('/bucket/object?Signature=X&Expires=Y&'
'AWSAccessKeyId=Z', environ={'REQUEST_METHOD': 'GET'}) 'AWSAccessKeyId=Z',
environ={'REQUEST_METHOD': 'GET'})
req.headers['Date'] = datetime.utcnow() req.headers['Date'] = datetime.utcnow()
req.content_type = 'text/plain' req.content_type = 'text/plain'
resp = local_app(req.environ, lambda *args: None) local_app(req.environ, lambda *args: None)
self.assertEquals(req.headers['Authorization'], 'AWS Z:X') self.assertEquals(req.headers['Authorization'], 'AWS Z:X')
self.assertEquals(req.headers['Date'], 'Y') self.assertEquals(req.headers['Date'], 'Y')
@ -690,11 +694,10 @@ class TestSwift3(unittest.TestCase):
'&partNumber=1', '&partNumber=1',
environ={'REQUEST_METHOD': 'PUT'}) environ={'REQUEST_METHOD': 'PUT'})
req.headers['Authorization'] = 'AWS X:Y' req.headers['Authorization'] = 'AWS X:Y'
resp = self.app(req.environ, start_response) self.app(req.environ, start_response)
self.assertEquals(base64.urlsafe_b64decode( self.assertEquals(base64.urlsafe_b64decode(
req.headers['X-Auth-Token']), req.headers['X-Auth-Token']),
'PUT\n\n\n/bucket/object?partNumber=1' 'PUT\n\n\n/bucket/object?partNumber=1&uploadId=123456789abcdef')
'&uploadId=123456789abcdef')
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()