x/swauth
Code Issues Proposed changes

Fixed E127 and E131 hacking.

Browse Source 
E127 continuation line over-indented for visual indent
E131 continuation line unaligned for hanging indent

Change-Id: I19ceb58d8545fb1b585e04b40418271f6ff56a5e
This commit is contained in:
Ondřej Nový 2016-02-14 14:26:35 +01:00
parent 556aa15697
commit f195a5f6ec
4 changed files with 55 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swauth/middleware.py
View File

@ -1076,7 +1076,7 @@ class Swauth(object):
raise Exception('Could not retrieve account id value: %s %s' % raise Exception('Could not retrieve account id value: %s %s' %
(path, resp.status)) (path, resp.status))
headers = {'X-Object-Meta-Account-Id': headers = {'X-Object-Meta-Account-Id':
resp.headers['x-container-meta-account-id']} resp.headers['x-container-meta-account-id']}
# Create the object in the main auth account (this object represents # Create the object in the main auth account (this object represents
# the user) # the user)
path = quote('/v1/%s/%s/%s' % (self.auth_account, account, user)) path = quote('/v1/%s/%s/%s' % (self.auth_account, account, user))
@ -1558,8 +1558,8 @@ class Swauth(object):
:param returns: True if .super_admin. :param returns: True if .super_admin.
""" """
return req.headers.get('x-auth-admin-user') == '.super_admin' and \ return req.headers.get('x-auth-admin-user') == '.super_admin' and \
self.super_admin_key and \ self.super_admin_key and \
req.headers.get('x-auth-admin-key') == self.super_admin_key req.headers.get('x-auth-admin-key') == self.super_admin_key
def is_reseller_admin(self, req, admin_detail=None): def is_reseller_admin(self, req, admin_detail=None):
"""Returns True if the admin specified in the request represents a """Returns True if the admin specified in the request represents a
@ -1602,7 +1602,7 @@ class Swauth(object):
return False return False
req.credentials_valid = True req.credentials_valid = True
return admin_detail and admin_detail['account'] == account and \ return admin_detail and admin_detail['account'] == account and \
'.admin' in (g['name'] for g in admin_detail['groups']) '.admin' in (g['name'] for g in admin_detail['groups'])
return False return False
def posthooklogger(self, env, req): def posthooklogger(self, env, req):

2
test/unit/test_authtypes.py
View File

@ -50,7 +50,7 @@ class TestSha1(unittest.TestCase):
.return_value = 'salt' .return_value = 'salt'
enc_key = self.auth_encoder.encode('keystring') enc_key = self.auth_encoder.encode('keystring')
self.assertEqual('sha1:salt$d50dc700c296e23ce5b41f7431a0e01f69010f06', self.assertEqual('sha1:salt$d50dc700c296e23ce5b41f7431a0e01f69010f06',
enc_key) enc_key)
def test_sha1_valid_match(self): def test_sha1_valid_match(self):
creds = 'sha1:salt$d50dc700c296e23ce5b41f7431a0e01f69010f06' creds = 'sha1:salt$d50dc700c296e23ce5b41f7431a0e01f69010f06'

98
test/unit/test_middleware.py
View File

@ -180,8 +180,8 @@ class TestAuth(unittest.TestCase):
except Exception as err: except Exception as err:
exc = err exc = err
self.assertEqual(str(exc), self.assertEqual(str(exc),
'Invalid auth_type in config file: %s' % 'Invalid auth_type in config file: %s' %
'Nonexistant') 'Nonexistant')
def test_default_swift_cluster_init(self): def test_default_swift_cluster_init(self):
app = FakeApp() app = FakeApp()
@ -190,11 +190,11 @@ class TestAuth(unittest.TestCase):
'default_swift_cluster': 'local#badscheme://host/path'}), app) 'default_swift_cluster': 'local#badscheme://host/path'}), app)
ath = auth.filter_factory({'super_admin_key': 'supertest'})(app) ath = auth.filter_factory({'super_admin_key': 'supertest'})(app)
self.assertEqual(ath.default_swift_cluster, self.assertEqual(ath.default_swift_cluster,
'local#http://127.0.0.1:8080/v1') 'local#http://127.0.0.1:8080/v1')
ath = auth.filter_factory({'super_admin_key': 'supertest', ath = auth.filter_factory({'super_admin_key': 'supertest',
'default_swift_cluster': 'local#http://host/path'})(app) 'default_swift_cluster': 'local#http://host/path'})(app)
self.assertEqual(ath.default_swift_cluster, self.assertEqual(ath.default_swift_cluster,
'local#http://host/path') 'local#http://host/path')
ath = auth.filter_factory({'super_admin_key': 'supertest', ath = auth.filter_factory({'super_admin_key': 'supertest',
'default_swift_cluster': 'local#https://host/path/'})(app) 'default_swift_cluster': 'local#https://host/path/'})(app)
self.assertEqual(ath.dsc_url, 'https://host/path') self.assertEqual(ath.dsc_url, 'https://host/path')
@ -213,14 +213,14 @@ class TestAuth(unittest.TestCase):
resp = Request.blank('/v1/AUTH_account').get_response(self.test_auth) resp = Request.blank('/v1/AUTH_account').get_response(self.test_auth)
self.assertEqual(resp.status_int, 401) self.assertEqual(resp.status_int, 401)
self.assertEqual(resp.environ['swift.authorize'], self.assertEqual(resp.environ['swift.authorize'],
self.test_auth.authorize) self.test_auth.authorize)
def test_auth_deny_non_reseller_prefix(self): def test_auth_deny_non_reseller_prefix(self):
resp = Request.blank('/v1/BLAH_account', resp = Request.blank('/v1/BLAH_account',
headers={'X-Auth-Token': 'BLAH_t'}).get_response(self.test_auth) headers={'X-Auth-Token': 'BLAH_t'}).get_response(self.test_auth)
self.assertEqual(resp.status_int, 401) self.assertEqual(resp.status_int, 401)
self.assertEqual(resp.environ['swift.authorize'], self.assertEqual(resp.environ['swift.authorize'],
self.test_auth.denied_response) self.test_auth.denied_response)
def test_auth_deny_non_reseller_prefix_no_override(self): def test_auth_deny_non_reseller_prefix_no_override(self):
fake_authorize = lambda x: Response(status='500 Fake') fake_authorize = lambda x: Response(status='500 Fake')
@ -244,7 +244,7 @@ class TestAuth(unittest.TestCase):
# one for checking auth, two for request passed along # one for checking auth, two for request passed along
self.assertEqual(local_app.calls, 2) self.assertEqual(local_app.calls, 2)
self.assertEqual(resp.environ['swift.authorize'], self.assertEqual(resp.environ['swift.authorize'],
local_auth.denied_response) local_auth.denied_response)
def test_auth_no_reseller_prefix_allow(self): def test_auth_no_reseller_prefix_allow(self):
# Ensures that when we have no reseller prefix, we can still allow # Ensures that when we have no reseller prefix, we can still allow
@ -264,7 +264,7 @@ class TestAuth(unittest.TestCase):
self.assertEqual(resp.status_int, 204) self.assertEqual(resp.status_int, 204)
self.assertEqual(local_app.calls, 2) self.assertEqual(local_app.calls, 2)
self.assertEqual(resp.environ['swift.authorize'], self.assertEqual(resp.environ['swift.authorize'],
local_auth.authorize) local_auth.authorize)
def test_auth_no_reseller_prefix_no_token(self): def test_auth_no_reseller_prefix_no_token(self):
# Check that normally we set up a call back to our authorize. # Check that normally we set up a call back to our authorize.
@ -274,7 +274,7 @@ class TestAuth(unittest.TestCase):
resp = Request.blank('/v1/account').get_response(local_auth) resp = Request.blank('/v1/account').get_response(local_auth)
self.assertEqual(resp.status_int, 401) self.assertEqual(resp.status_int, 401)
self.assertEqual(resp.environ['swift.authorize'], self.assertEqual(resp.environ['swift.authorize'],
local_auth.authorize) local_auth.authorize)
# Now make sure we don't override an existing swift.authorize when we # Now make sure we don't override an existing swift.authorize when we
# have no reseller prefix. # have no reseller prefix.
local_auth = \ local_auth = \
@ -715,9 +715,9 @@ class TestAuth(unittest.TestCase):
self.assertTrue(resp.headers.get('x-auth-token', self.assertTrue(resp.headers.get('x-auth-token',
'').startswith('AUTH_tk'), resp.headers.get('x-auth-token')) '').startswith('AUTH_tk'), resp.headers.get('x-auth-token'))
self.assertEqual(resp.headers.get('x-auth-token'), self.assertEqual(resp.headers.get('x-auth-token'),
resp.headers.get('x-storage-token')) resp.headers.get('x-storage-token'))
self.assertEqual(resp.headers.get('x-storage-url'), self.assertEqual(resp.headers.get('x-storage-url'),
'http://127.0.0.1:8080/v1/AUTH_cfa') 'http://127.0.0.1:8080/v1/AUTH_cfa')
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{"storage": {"default": "local", {"storage": {"default": "local",
"local": "http://127.0.0.1:8080/v1/AUTH_cfa"}}) "local": "http://127.0.0.1:8080/v1/AUTH_cfa"}})
@ -751,9 +751,9 @@ class TestAuth(unittest.TestCase):
self.assertTrue(resp.headers.get('x-auth-token', self.assertTrue(resp.headers.get('x-auth-token',
'').startswith('AUTH_tk'), resp.headers.get('x-auth-token')) '').startswith('AUTH_tk'), resp.headers.get('x-auth-token'))
self.assertEqual(resp.headers.get('x-auth-token'), self.assertEqual(resp.headers.get('x-auth-token'),
resp.headers.get('x-storage-token')) resp.headers.get('x-storage-token'))
self.assertEqual(resp.headers.get('x-storage-url'), self.assertEqual(resp.headers.get('x-storage-url'),
'http://127.0.0.1:8080/v1/AUTH_cfa') 'http://127.0.0.1:8080/v1/AUTH_cfa')
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{"storage": {"default": "local", {"storage": {"default": "local",
"local": "http://127.0.0.1:8080/v1/AUTH_cfa"}}) "local": "http://127.0.0.1:8080/v1/AUTH_cfa"}})
@ -791,9 +791,9 @@ class TestAuth(unittest.TestCase):
self.assertTrue(resp.headers.get('x-auth-token', self.assertTrue(resp.headers.get('x-auth-token',
'').startswith('AUTH_tk'), resp.headers.get('x-auth-token')) '').startswith('AUTH_tk'), resp.headers.get('x-auth-token'))
self.assertEqual(resp.headers.get('x-auth-token'), self.assertEqual(resp.headers.get('x-auth-token'),
resp.headers.get('x-storage-token')) resp.headers.get('x-storage-token'))
self.assertEqual(resp.headers.get('x-storage-url'), self.assertEqual(resp.headers.get('x-storage-url'),
'http://127.0.0.1:8080/v1/AUTH_cfa') 'http://127.0.0.1:8080/v1/AUTH_cfa')
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{"storage": {"default": "local", {"storage": {"default": "local",
"local": "http://127.0.0.1:8080/v1/AUTH_cfa"}}) "local": "http://127.0.0.1:8080/v1/AUTH_cfa"}})
@ -823,9 +823,9 @@ class TestAuth(unittest.TestCase):
self.assertTrue(resp.headers.get('x-auth-token', self.assertTrue(resp.headers.get('x-auth-token',
'').startswith('AUTH_tk'), resp.headers.get('x-auth-token')) '').startswith('AUTH_tk'), resp.headers.get('x-auth-token'))
self.assertEqual(resp.headers.get('x-auth-token'), self.assertEqual(resp.headers.get('x-auth-token'),
resp.headers.get('x-storage-token')) resp.headers.get('x-storage-token'))
self.assertEqual(resp.headers.get('x-storage-url'), self.assertEqual(resp.headers.get('x-storage-url'),
'http://127.0.0.1:8080/v1/AUTH_cfa') 'http://127.0.0.1:8080/v1/AUTH_cfa')
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{"storage": {"default": "local", {"storage": {"default": "local",
"local": "http://127.0.0.1:8080/v1/AUTH_cfa"}}) "local": "http://127.0.0.1:8080/v1/AUTH_cfa"}})
@ -855,9 +855,9 @@ class TestAuth(unittest.TestCase):
self.assertTrue(resp.headers.get('x-auth-token', self.assertTrue(resp.headers.get('x-auth-token',
'').startswith('AUTH_tk'), resp.headers.get('x-auth-token')) '').startswith('AUTH_tk'), resp.headers.get('x-auth-token'))
self.assertEqual(resp.headers.get('x-auth-token'), self.assertEqual(resp.headers.get('x-auth-token'),
resp.headers.get('x-storage-token')) resp.headers.get('x-storage-token'))
self.assertEqual(resp.headers.get('x-storage-url'), self.assertEqual(resp.headers.get('x-storage-url'),
'http://127.0.0.1:8080/v1/AUTH_cfa') 'http://127.0.0.1:8080/v1/AUTH_cfa')
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{"storage": {"default": "local", {"storage": {"default": "local",
"local": "http://127.0.0.1:8080/v1/AUTH_cfa"}}) "local": "http://127.0.0.1:8080/v1/AUTH_cfa"}})
@ -887,9 +887,9 @@ class TestAuth(unittest.TestCase):
self.assertTrue(resp.headers.get('x-auth-token', self.assertTrue(resp.headers.get('x-auth-token',
'').startswith('AUTH_tk'), resp.headers.get('x-auth-token')) '').startswith('AUTH_tk'), resp.headers.get('x-auth-token'))
self.assertEqual(resp.headers.get('x-auth-token'), self.assertEqual(resp.headers.get('x-auth-token'),
resp.headers.get('x-storage-token')) resp.headers.get('x-storage-token'))
self.assertEqual(resp.headers.get('x-storage-url'), self.assertEqual(resp.headers.get('x-storage-url'),
'http://127.0.0.1:8080/v1/AUTH_cfa') 'http://127.0.0.1:8080/v1/AUTH_cfa')
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{"storage": {"default": "local", {"storage": {"default": "local",
"local": "http://127.0.0.1:8080/v1/AUTH_cfa"}}) "local": "http://127.0.0.1:8080/v1/AUTH_cfa"}})
@ -917,9 +917,9 @@ class TestAuth(unittest.TestCase):
self.assertEqual(resp.content_type, CONTENT_TYPE_JSON) self.assertEqual(resp.content_type, CONTENT_TYPE_JSON)
self.assertEqual(resp.headers.get('x-auth-token'), 'AUTH_tktest') self.assertEqual(resp.headers.get('x-auth-token'), 'AUTH_tktest')
self.assertEqual(resp.headers.get('x-auth-token'), self.assertEqual(resp.headers.get('x-auth-token'),
resp.headers.get('x-storage-token')) resp.headers.get('x-storage-token'))
self.assertEqual(resp.headers.get('x-storage-url'), self.assertEqual(resp.headers.get('x-storage-url'),
'http://127.0.0.1:8080/v1/AUTH_cfa') 'http://127.0.0.1:8080/v1/AUTH_cfa')
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{"storage": {"default": "local", {"storage": {"default": "local",
"local": "http://127.0.0.1:8080/v1/AUTH_cfa"}}) "local": "http://127.0.0.1:8080/v1/AUTH_cfa"}})
@ -951,9 +951,9 @@ class TestAuth(unittest.TestCase):
self.assertEqual(resp.content_type, CONTENT_TYPE_JSON) self.assertEqual(resp.content_type, CONTENT_TYPE_JSON)
self.assertNotEqual(resp.headers.get('x-auth-token'), 'AUTH_tktest') self.assertNotEqual(resp.headers.get('x-auth-token'), 'AUTH_tktest')
self.assertEqual(resp.headers.get('x-auth-token'), self.assertEqual(resp.headers.get('x-auth-token'),
resp.headers.get('x-storage-token')) resp.headers.get('x-storage-token'))
self.assertEqual(resp.headers.get('x-storage-url'), self.assertEqual(resp.headers.get('x-storage-url'),
'http://127.0.0.1:8080/v1/AUTH_cfa') 'http://127.0.0.1:8080/v1/AUTH_cfa')
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{"storage": {"default": "local", {"storage": {"default": "local",
"local": "http://127.0.0.1:8080/v1/AUTH_cfa"}}) "local": "http://127.0.0.1:8080/v1/AUTH_cfa"}})
@ -989,9 +989,9 @@ class TestAuth(unittest.TestCase):
self.assertEqual(resp.content_type, CONTENT_TYPE_JSON) self.assertEqual(resp.content_type, CONTENT_TYPE_JSON)
self.assertNotEqual(resp.headers.get('x-auth-token'), 'AUTH_tktest') self.assertNotEqual(resp.headers.get('x-auth-token'), 'AUTH_tktest')
self.assertEqual(resp.headers.get('x-auth-token'), self.assertEqual(resp.headers.get('x-auth-token'),
resp.headers.get('x-storage-token')) resp.headers.get('x-storage-token'))
self.assertEqual(resp.headers.get('x-storage-url'), self.assertEqual(resp.headers.get('x-storage-url'),
'http://127.0.0.1:8080/v1/AUTH_cfa') 'http://127.0.0.1:8080/v1/AUTH_cfa')
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{"storage": {"default": "local", {"storage": {"default": "local",
"local": "http://127.0.0.1:8080/v1/AUTH_cfa"}}) "local": "http://127.0.0.1:8080/v1/AUTH_cfa"}})
@ -1027,9 +1027,9 @@ class TestAuth(unittest.TestCase):
self.assertEqual(resp.content_type, CONTENT_TYPE_JSON) self.assertEqual(resp.content_type, CONTENT_TYPE_JSON)
self.assertNotEqual(resp.headers.get('x-auth-token'), 'AUTH_tktest') self.assertNotEqual(resp.headers.get('x-auth-token'), 'AUTH_tktest')
self.assertEqual(resp.headers.get('x-auth-token'), self.assertEqual(resp.headers.get('x-auth-token'),
resp.headers.get('x-storage-token')) resp.headers.get('x-storage-token'))
self.assertEqual(resp.headers.get('x-storage-url'), self.assertEqual(resp.headers.get('x-storage-url'),
'http://127.0.0.1:8080/v1/AUTH_cfa') 'http://127.0.0.1:8080/v1/AUTH_cfa')
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{"storage": {"default": "local", {"storage": {"default": "local",
"local": "http://127.0.0.1:8080/v1/AUTH_cfa"}}) "local": "http://127.0.0.1:8080/v1/AUTH_cfa"}})
@ -1157,7 +1157,7 @@ class TestAuth(unittest.TestCase):
self.assertEqual(resp.status_int, 200) self.assertEqual(resp.status_int, 200)
self.assertEqual(resp.content_type, CONTENT_TYPE_JSON) self.assertEqual(resp.content_type, CONTENT_TYPE_JSON)
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{"accounts": [{"name": "act"}]}) {"accounts": [{"name": "act"}]})
self.assertEqual(self.test_auth.app.calls, 2) self.assertEqual(self.test_auth.app.calls, 2)
self.test_auth.app = FakeApp(iter([ self.test_auth.app = FakeApp(iter([
@ -1179,7 +1179,7 @@ class TestAuth(unittest.TestCase):
self.assertEqual(resp.status_int, 200) self.assertEqual(resp.status_int, 200)
self.assertEqual(resp.content_type, CONTENT_TYPE_JSON) self.assertEqual(resp.content_type, CONTENT_TYPE_JSON)
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{"accounts": [{"name": "act"}]}) {"accounts": [{"name": "act"}]})
self.assertEqual(self.test_auth.app.calls, 3) self.assertEqual(self.test_auth.app.calls, 3)
def test_get_reseller_fail_bad_creds(self): def test_get_reseller_fail_bad_creds(self):
@ -1270,8 +1270,8 @@ class TestAuth(unittest.TestCase):
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{'account_id': 'AUTH_cfa', {'account_id': 'AUTH_cfa',
'services': {'storage': 'services': {'storage':
{'default': 'local', {'default': 'local',
'local': 'http://127.0.0.1:8080/v1/AUTH_cfa'}}, 'local': 'http://127.0.0.1:8080/v1/AUTH_cfa'}},
'users': [{'name': 'tester'}, {'name': 'tester3'}]}) 'users': [{'name': 'tester'}, {'name': 'tester3'}]})
self.assertEqual(self.test_auth.app.calls, 3) self.assertEqual(self.test_auth.app.calls, 3)
@ -1306,8 +1306,8 @@ class TestAuth(unittest.TestCase):
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{'account_id': 'AUTH_cfa', {'account_id': 'AUTH_cfa',
'services': {'storage': 'services': {'storage':
{'default': 'local', {'default': 'local',
'local': 'http://127.0.0.1:8080/v1/AUTH_cfa'}}, 'local': 'http://127.0.0.1:8080/v1/AUTH_cfa'}},
'users': [{'name': 'tester'}, {'name': 'tester3'}]}) 'users': [{'name': 'tester'}, {'name': 'tester3'}]})
self.assertEqual(self.test_auth.app.calls, 4) self.assertEqual(self.test_auth.app.calls, 4)
@ -2783,7 +2783,7 @@ class TestAuth(unittest.TestCase):
# GET of user object (regular user) # GET of user object (regular user)
# This shouldn't actually get called, checked # This shouldn't actually get called, checked
# below # below
('200 Ok', {}, json.dumps({"groups": [{"name": "act:usr"}, ('200 Ok', {}, json.dumps({"groups": [{"name": "act:usr"},
{"name": "test"}], "auth": "plaintext:key"}))])) {"name": "test"}], "auth": "plaintext:key"}))]))
resp = Request.blank('/auth/v2/act/usr', resp = Request.blank('/auth/v2/act/usr',
environ={'REQUEST_METHOD': 'PUT'}, environ={'REQUEST_METHOD': 'PUT'},
@ -3270,7 +3270,7 @@ class TestAuth(unittest.TestCase):
self.assertEqual(resp.status_int, 204) self.assertEqual(resp.status_int, 204)
self.assertEqual(self.test_auth.app.calls, 1) self.assertEqual(self.test_auth.app.calls, 1)
self.assertEqual(resp.headers.get('x-auth-groups'), self.assertEqual(resp.headers.get('x-auth-groups'),
'act:usr,act,AUTH_cfa') 'act:usr,act,AUTH_cfa')
self.assertTrue(float(resp.headers['x-auth-ttl']) < 1, self.assertTrue(float(resp.headers['x-auth-ttl']) < 1,
resp.headers['x-auth-ttl']) resp.headers['x-auth-ttl'])
@ -3313,7 +3313,7 @@ class TestAuth(unittest.TestCase):
except Exception as err: except Exception as err:
exc = err exc = err
self.assertEqual(str(exc), self.assertEqual(str(exc),
'No memcache set up; required for Swauth middleware') 'No memcache set up; required for Swauth middleware')
def test_get_itoken_success(self): def test_get_itoken_success(self):
fmc = FakeMemcache() fmc = FakeMemcache()
@ -3326,7 +3326,7 @@ class TestAuth(unittest.TestCase):
def test_get_admin_detail_fail_no_colon(self): def test_get_admin_detail_fail_no_colon(self):
self.test_auth.app = FakeApp(iter([])) self.test_auth.app = FakeApp(iter([]))
self.assertEqual(self.test_auth.get_admin_detail(Request.blank('/')), self.assertEqual(self.test_auth.get_admin_detail(Request.blank('/')),
None) None)
self.assertEqual(self.test_auth.get_admin_detail(Request.blank('/', self.assertEqual(self.test_auth.get_admin_detail(Request.blank('/',
headers={'X-Auth-Admin-User': 'usr'})), None) headers={'X-Auth-Admin-User': 'usr'})), None)
self.assertRaises(StopIteration, self.test_auth.get_admin_detail, self.assertRaises(StopIteration, self.test_auth.get_admin_detail,
@ -3374,7 +3374,7 @@ class TestAuth(unittest.TestCase):
detail = self.test_auth.get_user_detail( detail = self.test_auth.get_user_detail(
Request.blank('/', Request.blank('/',
headers={'X-Auth-Admin-User': 'act:usr'}), headers={'X-Auth-Admin-User': 'act:usr'}),
'act', 'usr') 'act', 'usr')
self.assertEqual(self.test_auth.app.calls, 1) self.assertEqual(self.test_auth.app.calls, 1)
detail_json = json.loads(detail) detail_json = json.loads(detail)
self.assertEqual("plaintext:key", detail_json['auth']) self.assertEqual("plaintext:key", detail_json['auth'])
@ -3385,7 +3385,7 @@ class TestAuth(unittest.TestCase):
detail = self.test_auth.get_user_detail( detail = self.test_auth.get_user_detail(
Request.blank('/', Request.blank('/',
headers={'X-Auth-Admin-User': 'act:usr'}), headers={'X-Auth-Admin-User': 'act:usr'}),
'act', 'usr') 'act', 'usr')
self.assertEqual(self.test_auth.app.calls, 1) self.assertEqual(self.test_auth.app.calls, 1)
self.assertEqual(detail, None) self.assertEqual(detail, None)
@ -3397,11 +3397,11 @@ class TestAuth(unittest.TestCase):
self.test_auth.get_user_detail( self.test_auth.get_user_detail(
Request.blank('/', Request.blank('/',
headers={'X-Auth-Admin-User': 'act:usr'}), headers={'X-Auth-Admin-User': 'act:usr'}),
'act', 'usr') 'act', 'usr')
except Exception as err: except Exception as err:
exc = err exc = err
self.assertEqual(str(exc), 'Could not get user object: ' self.assertEqual(str(exc), 'Could not get user object: '
'/v1/AUTH_.auth/act/usr 503 Service Unavailable') '/v1/AUTH_.auth/act/usr 503 Service Unavailable')
self.assertEqual(self.test_auth.app.calls, 1) self.assertEqual(self.test_auth.app.calls, 1)
def test_is_user_reseller_admin_success(self): def test_is_user_reseller_admin_success(self):
@ -3413,7 +3413,7 @@ class TestAuth(unittest.TestCase):
result = self.test_auth.is_user_reseller_admin( result = self.test_auth.is_user_reseller_admin(
Request.blank('/', Request.blank('/',
headers={'X-Auth-Admin-User': 'act:usr'}), headers={'X-Auth-Admin-User': 'act:usr'}),
'act', 'usr') 'act', 'usr')
self.assertEqual(self.test_auth.app.calls, 1) self.assertEqual(self.test_auth.app.calls, 1)
self.assertTrue(result) self.assertTrue(result)
@ -3426,7 +3426,7 @@ class TestAuth(unittest.TestCase):
result = self.test_auth.is_user_reseller_admin( result = self.test_auth.is_user_reseller_admin(
Request.blank('/', Request.blank('/',
headers={'X-Auth-Admin-User': 'act:usr'}), headers={'X-Auth-Admin-User': 'act:usr'}),
'act', 'usr') 'act', 'usr')
self.assertEqual(self.test_auth.app.calls, 1) self.assertEqual(self.test_auth.app.calls, 1)
self.assertFalse(result) self.assertFalse(result)
@ -3689,9 +3689,9 @@ class TestAuth(unittest.TestCase):
self.assertTrue(resp.headers.get('x-auth-token', self.assertTrue(resp.headers.get('x-auth-token',
'').startswith('AUTH_tk'), resp.headers.get('x-auth-token')) '').startswith('AUTH_tk'), resp.headers.get('x-auth-token'))
self.assertEqual(resp.headers.get('x-auth-token'), self.assertEqual(resp.headers.get('x-auth-token'),
resp.headers.get('x-storage-token')) resp.headers.get('x-storage-token'))
self.assertEqual(resp.headers.get('x-storage-url'), self.assertEqual(resp.headers.get('x-storage-url'),
'http://127.0.0.1:8080/v1/AUTH_cfa') 'http://127.0.0.1:8080/v1/AUTH_cfa')
self.assertEqual(json.loads(resp.body), self.assertEqual(json.loads(resp.body),
{"storage": {"default": "local", {"storage": {"default": "local",
"local": "http://127.0.0.1:8080/v1/AUTH_cfa"}}) "local": "http://127.0.0.1:8080/v1/AUTH_cfa"}})
@ -3889,7 +3889,7 @@ class TestAuth(unittest.TestCase):
resp = req.get_response(self.test_auth) resp = req.get_response(self.test_auth)
self.assertEqual(resp.status_int, 401) self.assertEqual(resp.status_int, 401)
self.assertEqual(resp.environ['swift.authorize'], self.assertEqual(resp.environ['swift.authorize'],
self.test_auth.authorize) self.test_auth.authorize)
def test_override_asked_for_and_allowed(self): def test_override_asked_for_and_allowed(self):
self.test_auth = \ self.test_auth = \
@ -3925,7 +3925,7 @@ class TestAuth(unittest.TestCase):
resp = req.get_response(self.test_auth) resp = req.get_response(self.test_auth)
self.assertEqual(resp.status_int, 401) self.assertEqual(resp.status_int, 401)
self.assertEqual(resp.environ['swift.authorize'], self.assertEqual(resp.environ['swift.authorize'],
self.test_auth.denied_response) self.test_auth.denied_response)
def test_default_storage_policy(self): def test_default_storage_policy(self):
ath = auth.filter_factory({})(FakeApp()) ath = auth.filter_factory({})(FakeApp())

4
tox.ini
View File

@ -40,12 +40,10 @@ commands = python setup.py build_sphinx
# E123 skipped as they are invalid PEP-8. # E123 skipped as they are invalid PEP-8.
# will be removed later # will be removed later
# H405 multi line docstring summary not separated with an empty line # H405 multi line docstring summary not separated with an empty line
# E127 continuation line over-indented for visual indent
# E128 continuation line under-indented for visual indent # E128 continuation line under-indented for visual indent
# E131 continuation line unaligned for hanging indent
# E121 continuation line under-indented for hanging indent # E121 continuation line under-indented for hanging indent
show-source = True show-source = True
ignore = E123,H405,E127,E128,E131,E121 ignore = E123,H405,E128,E121
builtins = _ builtins = _
exclude=.venv,.git,.tox,dist,doc,*egg,build exclude=.venv,.git,.tox,dist,doc,*egg,build