openstack/swift
Code Issues Proposed changes

Updated func tests and made swauth .rlistings check a bit easier to read

Browse Source
This commit is contained in:
gholt
2011-03-24 23:12:36 +00:00
parent 0e3040f989
commit 2d2150bde7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/middleware/swauth.py
View File

@@ -277,9 +277,9 @@ class Swauth(object):
return None return None
referrers, groups = parse_acl(getattr(req, 'acl', None)) referrers, groups = parse_acl(getattr(req, 'acl', None))
if referrer_allowed(req.referer, referrers): if referrer_allowed(req.referer, referrers):
if not obj and '.rlistings' not in groups: if obj or '.rlistings' in groups:
return self.denied_response(req)
return None return None
return self.denied_response(req)
if not req.remote_user: if not req.remote_user:
return self.denied_response(req) return self.denied_response(req)
for user_group in user_groups: for user_group in user_groups:

4
test/functionalnosetests/test_container.py
View File

@@ -338,7 +338,7 @@ class TestContainer(unittest.TestCase):
def post(url, token, parsed, conn): def post(url, token, parsed, conn):
conn.request('POST', parsed.path + '/' + self.name, '', conn.request('POST', parsed.path + '/' + self.name, '',
{'X-Auth-Token': token, {'X-Auth-Token': token,
'X-Container-Read': '.r:*'}) 'X-Container-Read': '.r:*,.rlistings'})
return check_response(conn) return check_response(conn)
resp = retry(post) resp = retry(post)
resp.read() resp.read()
@@ -430,7 +430,7 @@ class TestContainer(unittest.TestCase):
def post(url, token, parsed, conn): def post(url, token, parsed, conn):
conn.request('POST', parsed.path + '/' + self.name, '', conn.request('POST', parsed.path + '/' + self.name, '',
{'X-Auth-Token': token, {'X-Auth-Token': token,
'X-Container-Read': '.r:*'}) 'X-Container-Read': '.r:*,.rlistings'})
return check_response(conn) return check_response(conn)
resp = retry(post) resp = retry(post)
resp.read() resp.read()