openstack/swift
Code Issues Proposed changes

Fixed bugs re: make_pre_authed* and SCRIPT_NAME

Browse Source 
There were bugs with SCRIPT_NAME and
swift.common.wsgi.make_pre_authed* functions.

1) SCRIPT_NAME wasn't copied with PATH_INFO, which it should've been.
2) When a new path was given, SCRIPT_NAME wasn't set to an empty
   string but just omitted, which is allowed by spec, but really
   should be set.

For completeness, if SCRIPT_NAME doesn't exist in the source env, it
will be created in the new env, but as an empty string.

Change-Id: Ifbc27ed8ff357038c54df4d37de46cfd5e31372e
This commit is contained in:
gholt 2012-10-30 15:40:41 +00:00
parent 6c6b84b3f5
commit a94a283149
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swift/common/wsgi.py
View File

@ -329,14 +329,16 @@ def make_pre_authed_env(env, method=None, path=None, agent='Swift',
newenv = {} newenv = {}
for name in ('eventlet.posthooks', 'HTTP_USER_AGENT', 'HTTP_HOST', for name in ('eventlet.posthooks', 'HTTP_USER_AGENT', 'HTTP_HOST',
'PATH_INFO', 'QUERY_STRING', 'REMOTE_USER', 'REQUEST_METHOD', 'PATH_INFO', 'QUERY_STRING', 'REMOTE_USER', 'REQUEST_METHOD',
'SERVER_NAME', 'SERVER_PORT', 'SERVER_PROTOCOL', 'SCRIPT_NAME', 'SERVER_NAME', 'SERVER_PORT',
'swift.cache', 'swift.source', 'swift.trans_id'): 'SERVER_PROTOCOL', 'swift.cache', 'swift.source',
'swift.trans_id'):
if name in env: if name in env:
newenv[name] = env[name] newenv[name] = env[name]
if method: if method:
newenv['REQUEST_METHOD'] = method newenv['REQUEST_METHOD'] = method
if path: if path:
newenv['PATH_INFO'] = path newenv['PATH_INFO'] = path
newenv['SCRIPT_NAME'] = ''
if query_string is not None: if query_string is not None:
newenv['QUERY_STRING'] = query_string newenv['QUERY_STRING'] = query_string
if agent: if agent:
@ -348,4 +350,6 @@ def make_pre_authed_env(env, method=None, path=None, agent='Swift',
newenv['swift.authorize_override'] = True newenv['swift.authorize_override'] = True
newenv['REMOTE_USER'] = '.wsgi.pre_authed' newenv['REMOTE_USER'] = '.wsgi.pre_authed'
newenv['wsgi.input'] = StringIO('') newenv['wsgi.input'] = StringIO('')
if 'SCRIPT_NAME' not in newenv:
newenv['SCRIPT_NAME'] = ''
return newenv return newenv

15
test/unit/common/test_wsgi.py
View File

@ -223,5 +223,20 @@ class TestWSGI(unittest.TestCase):
{'QUERY_STRING': 'original'}, 'GET', 'path', 'the body') {'QUERY_STRING': 'original'}, 'GET', 'path', 'the body')
self.assertEquals(r.body, 'the body') self.assertEquals(r.body, 'the body')
def test_pre_auth_creates_script_name(self):
e = wsgi.make_pre_authed_env({})
self.assertTrue('SCRIPT_NAME' in e)
def test_pre_auth_copies_script_name(self):
e = wsgi.make_pre_authed_env({'SCRIPT_NAME': '/script_name'})
self.assertEquals(e['SCRIPT_NAME'], '/script_name')
def test_pre_auth_copies_script_name_unless_path_overridden(self):
e = wsgi.make_pre_authed_env({'SCRIPT_NAME': '/script_name'},
path='/override')
self.assertEquals(e['SCRIPT_NAME'], '')
self.assertEquals(e['PATH_INFO'], '/override')
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()