openstack/swift
Code Issues Proposed changes

Merge "have tempurl allow OPTIONS requests"

Browse Source
This commit is contained in:
Jenkins 2013-05-07 22:19:18 +00:00 committed by Gerrit Code Review
commit c3e6f3a1d6
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,6 +236,8 @@ class TempURL(object):
:param start_response: The WSGI start_response hook. :param start_response: The WSGI start_response hook.
:returns: Response as per WSGI. :returns: Response as per WSGI.
""" """
if env['REQUEST_METHOD'] == 'OPTIONS':
return self.app(env, start_response)
temp_url_sig, temp_url_expires, filename = self._get_temp_url_info(env) temp_url_sig, temp_url_expires, filename = self._get_temp_url_info(env)
if temp_url_sig is None and temp_url_expires is None: if temp_url_sig is None and temp_url_expires is None:
return self.app(env, start_response) return self.app(env, start_response)

8
test/unit/common/middleware/test_tempurl.py
View File

@ -80,6 +80,7 @@ class TestTempURL(unittest.TestCase):
def setUp(self): def setUp(self):
self.app = FakeApp() self.app = FakeApp()
self.auth = tempauth.filter_factory({})(self.app) self.auth = tempauth.filter_factory({})(self.app)
self.auth.reseller_prefix = 'a'
self.tempurl = tempurl.filter_factory({})(self.auth) self.tempurl = tempurl.filter_factory({})(self.auth)
def _make_request(self, path, **kwargs): def _make_request(self, path, **kwargs):
@ -92,6 +93,13 @@ class TestTempURL(unittest.TestCase):
self.assertEquals(resp.status_int, 401) self.assertEquals(resp.status_int, 401)
self.assertTrue('Temp URL invalid' not in resp.body) self.assertTrue('Temp URL invalid' not in resp.body)
def test_allow_options(self):
self.app.status_headers_body_iter = iter([('200 Ok', {}, '')])
resp = self._make_request(
'/v1/a/c/o?temp_url_sig=abcde&temp_url_expires=12345',
environ={'REQUEST_METHOD': 'OPTIONS'}).get_response(self.tempurl)
self.assertEquals(resp.status_int, 200)
def test_get_valid(self): def test_get_valid(self):
method = 'GET' method = 'GET'
expires = int(time() + 86400) expires = int(time() + 86400)