use get_container_info for staticweb
Update staticweb to use get_container_info instead of its own memcache entry. Change-Id: I59bc0d94b9e45f3d5776a5462f53b82ab78101d4
This commit is contained in:
Michael Barton
parent
9d0a0e850e
commit
e499b9100b
|
|
@ -119,13 +119,12 @@ import cgi
|
|||
import time
|
||||
from urllib import quote as urllib_quote
|
||||
|
||||
|
||||
from swift.common.utils import cache_from_env, human_readable, split_path, \
|
||||
config_true_value, json
|
||||
from swift.common.wsgi import make_pre_authed_env, make_pre_authed_request, \
|
||||
WSGIContext
|
||||
from swift.common.utils import human_readable, split_path, config_true_value, \
|
||||
json
|
||||
from swift.common.wsgi import make_pre_authed_env, WSGIContext
|
||||
from swift.common.http import is_success, is_redirection, HTTP_NOT_FOUND
|
||||
from swift.common.swob import Response, HTTPMovedPermanently, HTTPNotFound
|
||||
from swift.proxy.controllers.base import get_container_info
|
||||
|
||||
|
||||
def quote(value, safe='/'):
|
||||
|
|
@ -219,47 +218,14 @@ class _StaticWebContext(WSGIContext):
|
|||
"""
|
||||
self._index = self._error = self._listings = self._listings_css = \
|
||||
self._dir_type = None
|
||||
memcache_client = cache_from_env(env)
|
||||
if memcache_client:
|
||||
cached_data = memcache_client.get(
|
||||
get_memcache_key(self.version, self.account, self.container))
|
||||
if cached_data:
|
||||
(self._index, self._error, self._listings, self._listings_css,
|
||||
self._dir_type) = cached_data
|
||||
return
|
||||
else:
|
||||
cached_data = memcache_client.get(
|
||||
get_compat_memcache_key(
|
||||
self.version, self.account, self.container))
|
||||
if cached_data:
|
||||
(self._index, self._error, self._listings,
|
||||
self._listings_css) = cached_data
|
||||
self._dir_type = ''
|
||||
return
|
||||
resp = make_pre_authed_request(
|
||||
env, 'HEAD', '/%s/%s/%s' % (
|
||||
self.version, self.account, self.container),
|
||||
agent=self.agent, swift_source='SW').get_response(self.app)
|
||||
if is_success(resp.status_int):
|
||||
self._index = \
|
||||
resp.headers.get('x-container-meta-web-index', '').strip()
|
||||
self._error = \
|
||||
resp.headers.get('x-container-meta-web-error', '').strip()
|
||||
self._listings = \
|
||||
resp.headers.get('x-container-meta-web-listings', '').strip()
|
||||
self._listings_css = \
|
||||
resp.headers.get('x-container-meta-web-listings-css',
|
||||
'').strip()
|
||||
self._dir_type = \
|
||||
resp.headers.get('x-container-meta-web-directory-type',
|
||||
'').strip()
|
||||
if memcache_client:
|
||||
memcache_client.set(
|
||||
get_memcache_key(
|
||||
self.version, self.account, self.container),
|
||||
(self._index, self._error, self._listings,
|
||||
self._listings_css, self._dir_type),
|
||||
time=self.cache_timeout)
|
||||
container_info = get_container_info(env, self.app, swift_source='SW')
|
||||
if is_success(container_info['status']):
|
||||
meta = container_info.get('meta', {})
|
||||
self._index = meta.get('web-index', '').strip()
|
||||
self._error = meta.get('web-error', '').strip()
|
||||
self._listings = meta.get('web-listings', '').strip()
|
||||
self._listings_css = meta.get('web-listings-css', '').strip()
|
||||
self._dir_type = meta.get('web-directory-type', '').strip()
|
||||
|
||||
def _listing(self, env, start_response, prefix=None):
|
||||
"""
|
||||
|
|
@ -516,14 +482,6 @@ class StaticWeb(object):
|
|||
split_path(env['PATH_INFO'], 2, 4, True)
|
||||
except ValueError:
|
||||
return self.app(env, start_response)
|
||||
if env['REQUEST_METHOD'] in ('PUT', 'POST') and container and not obj:
|
||||
memcache_client = cache_from_env(env)
|
||||
if memcache_client:
|
||||
memcache_client.delete(
|
||||
get_memcache_key(version, account, container))
|
||||
memcache_client.delete(
|
||||
get_compat_memcache_key(version, account, container))
|
||||
return self.app(env, start_response)
|
||||
if env['REQUEST_METHOD'] not in ('HEAD', 'GET'):
|
||||
return self.app(env, start_response)
|
||||
if env.get('REMOTE_USER') and \
|
||||
|
|
|
|||
|
|
@ -52,6 +52,47 @@ class FakeMemcache(object):
|
|||
return True
|
||||
|
||||
|
||||
meta_map = {
|
||||
'c1': {'status': 401},
|
||||
'c2': {},
|
||||
'c3': {'meta': {'web-index': 'index.html',
|
||||
'web-listings': 't'}},
|
||||
'c3b': {'meta': {'web-index': 'index.html',
|
||||
'web-listings': 't'}},
|
||||
'c4': {'meta': {'web-index': 'index.html',
|
||||
'web-error': 'error.html',
|
||||
'web-listings': 't',
|
||||
'web-listings-css': 'listing.css',
|
||||
'web-directory-type': 'text/dir'}},
|
||||
'c5': {'meta': {'web-index': 'index.html',
|
||||
'web-error': 'error.html',
|
||||
'web-listings': 't',
|
||||
'web-listings-css': 'listing.css'}},
|
||||
'c6': {'meta': {'web-listings': 't'}},
|
||||
'c7': {'meta': {'web-listings': 'f'}},
|
||||
'c8': {'meta': {'web-error': 'error.html',
|
||||
'web-listings': 't',
|
||||
'web-listings-css':
|
||||
'http://localhost/stylesheets/listing.css'}},
|
||||
'c9': {'meta': {'web-error': 'error.html',
|
||||
'web-listings': 't',
|
||||
'web-listings-css':
|
||||
'/absolute/listing.css'}},
|
||||
'c10': {'meta': {'web-listings': 't'}},
|
||||
'c11': {'meta': {'web-index': 'index.html'}},
|
||||
'c11a': {'meta': {'web-index': 'index.html',
|
||||
'web-directory-type': 'text/directory'}},
|
||||
}
|
||||
|
||||
|
||||
def mock_get_container_info(env, app, swift_source='SW'):
|
||||
container = env['PATH_INFO'].rstrip('/').split('/')[3]
|
||||
container_info = meta_map[container]
|
||||
container_info.setdefault('status', 200)
|
||||
container_info.setdefault('read_acl', '.r:*')
|
||||
return container_info
|
||||
|
||||
|
||||
class FakeApp(object):
|
||||
|
||||
def __init__(self, status_headers_body_iter=None):
|
||||
|
|
@ -70,15 +111,11 @@ class FakeApp(object):
|
|||
elif env['PATH_INFO'] == '/v1/a/c1':
|
||||
return Response(status='401 Unauthorized')(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c2':
|
||||
return self.listing(env, start_response,
|
||||
{'x-container-read': '.r:*'})
|
||||
return self.listing(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c2/one.txt':
|
||||
return Response(status='404 Not Found')(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c3':
|
||||
return self.listing(env, start_response,
|
||||
{'x-container-read': '.r:*',
|
||||
'x-container-meta-web-index': 'index.html',
|
||||
'x-container-meta-web-listings': 't'})
|
||||
return self.listing(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c3/index.html':
|
||||
return Response(status='200 Ok', body='''
|
||||
<html>
|
||||
|
|
@ -93,10 +130,7 @@ class FakeApp(object):
|
|||
</html>
|
||||
''')(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c3b':
|
||||
return self.listing(env, start_response,
|
||||
{'x-container-read': '.r:*',
|
||||
'x-container-meta-web-index': 'index.html',
|
||||
'x-container-meta-web-listings': 't'})
|
||||
return self.listing(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c3b/index.html':
|
||||
resp = Response(status='204 No Content')
|
||||
resp.app_iter = iter([])
|
||||
|
|
@ -132,13 +166,7 @@ class FakeApp(object):
|
|||
return Response(status='404 Not Found')(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c4':
|
||||
self.get_c4_called = True
|
||||
return self.listing(env, start_response,
|
||||
{'x-container-read': '.r:*',
|
||||
'x-container-meta-web-index': 'index.html',
|
||||
'x-container-meta-web-error': 'error.html',
|
||||
'x-container-meta-web-listings': 't',
|
||||
'x-container-meta-web-listings-css': 'listing.css',
|
||||
'x-container-meta-web-directory-type': 'text/dir'})
|
||||
return self.listing(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c4/one.txt':
|
||||
return Response(status='200 Ok',
|
||||
headers={'x-object-meta-test': 'value'},
|
||||
|
|
@ -165,11 +193,7 @@ class FakeApp(object):
|
|||
</html>
|
||||
'''.strip())(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c5':
|
||||
return self.listing(env, start_response,
|
||||
{'x-container-read': '.r:*',
|
||||
'x-container-meta-web-index': 'index.html',
|
||||
'x-container-meta-listings': 't',
|
||||
'x-container-meta-web-error': 'error.html'})
|
||||
return self.listing(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c5/index.html':
|
||||
return Response(status='503 Service Unavailable')(env,
|
||||
start_response)
|
||||
|
|
@ -182,45 +206,27 @@ class FakeApp(object):
|
|||
elif env['PATH_INFO'] == '/v1/a/c5/404error.html':
|
||||
return Response(status='404 Not Found')(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c6':
|
||||
return self.listing(env, start_response,
|
||||
{'x-container-read': '.r:*',
|
||||
'x-container-meta-web-listings': 't'})
|
||||
return self.listing(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c6/subdir':
|
||||
return Response(status='404 Not Found')(env, start_response)
|
||||
elif env['PATH_INFO'] in ('/v1/a/c7', '/v1/a/c7/'):
|
||||
return self.listing(env, start_response,
|
||||
{'x-container-read': '.r:*',
|
||||
'x-container-meta-web-listings': 'f'})
|
||||
return self.listing(env, start_response)
|
||||
elif env['PATH_INFO'] in ('/v1/a/c8', '/v1/a/c8/'):
|
||||
return self.listing(env, start_response,
|
||||
{'x-container-read': '.r:*',
|
||||
'x-container-meta-web-error': 'error.html',
|
||||
'x-container-meta-web-listings': 't',
|
||||
'x-container-meta-web-listings-css': \
|
||||
'http://localhost/stylesheets/listing.css'})
|
||||
return self.listing(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c8/subdir/':
|
||||
return Response(status='404 Not Found')(env, start_response)
|
||||
elif env['PATH_INFO'] in ('/v1/a/c9', '/v1/a/c9/'):
|
||||
return self.listing(env, start_response,
|
||||
{'x-container-read': '.r:*',
|
||||
'x-container-meta-web-error': 'error.html',
|
||||
'x-container-meta-web-listings': 't',
|
||||
'x-container-meta-web-listings-css': \
|
||||
'/absolute/listing.css'})
|
||||
return self.listing(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c9/subdir/':
|
||||
return Response(status='404 Not Found')(env, start_response)
|
||||
elif env['PATH_INFO'] in ('/v1/a/c10', '/v1/a/c10/'):
|
||||
return self.listing(env, start_response,
|
||||
{'x-container-read': '.r:*',
|
||||
'x-container-meta-web-listings': 't'})
|
||||
return self.listing(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c10/\xe2\x98\x83/':
|
||||
return Response(status='404 Not Found')(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c10/\xe2\x98\x83/\xe2\x98\x83/':
|
||||
return Response(status='404 Not Found')(env, start_response)
|
||||
elif env['PATH_INFO'] in ('/v1/a/c11', '/v1/a/c11/'):
|
||||
return self.listing(env, start_response,
|
||||
{'x-container-read': '.r:*',
|
||||
'x-container-meta-web-index': 'index.html'})
|
||||
return self.listing(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c11/subdir/':
|
||||
return Response(status='200 Ok', headers={'Content-Type':\
|
||||
'application/directory'})(env, start_response)
|
||||
|
|
@ -238,11 +244,7 @@ class FakeApp(object):
|
|||
elif env['PATH_INFO'] == '/v1/a/c11/subdir2/index.html':
|
||||
return Response(status='404 Not Found')(env, start_response)
|
||||
elif env['PATH_INFO'] in ('/v1/a/c11a', '/v1/a/c11a/'):
|
||||
return self.listing(env, start_response,
|
||||
{'x-container-read': '.r:*',
|
||||
'x-container-meta-web-index': 'index.html',
|
||||
'x-container-meta-web-directory-type': \
|
||||
'text/directory'})
|
||||
return self.listing(env, start_response)
|
||||
elif env['PATH_INFO'] == '/v1/a/c11a/subdir/':
|
||||
return Response(status='200 Ok', headers={'Content-Type':\
|
||||
'text/directory'})(env, start_response)
|
||||
|
|
@ -261,7 +263,8 @@ class FakeApp(object):
|
|||
else:
|
||||
raise Exception('Unknown path %r' % env['PATH_INFO'])
|
||||
|
||||
def listing(self, env, start_response, headers):
|
||||
def listing(self, env, start_response):
|
||||
headers = {'x-container-read': '.r:*'}
|
||||
if env['PATH_INFO'] in ('/v1/a/c3', '/v1/a/c4', '/v1/a/c8', \
|
||||
'/v1/a/c9') and \
|
||||
env['QUERY_STRING'] == 'delimiter=/&format=json&prefix=subdir/':
|
||||
|
|
@ -399,6 +402,11 @@ class TestStaticWeb(unittest.TestCase):
|
|||
def setUp(self):
|
||||
self.app = FakeApp()
|
||||
self.test_staticweb = staticweb.filter_factory({})(self.app)
|
||||
self._orig_get_container_info = staticweb.get_container_info
|
||||
staticweb.get_container_info = mock_get_container_info
|
||||
|
||||
def tearDown(self):
|
||||
staticweb.get_container_info = self._orig_get_container_info
|
||||
|
||||
def test_app_set(self):
|
||||
app = FakeApp()
|
||||
|
|
@ -569,44 +577,6 @@ class TestStaticWeb(unittest.TestCase):
|
|||
self.assertEquals(resp.status_int, 404)
|
||||
self.assert_("Chrome's 404 fancy-page sucks." in resp.body)
|
||||
|
||||
def test_container4unknown_memcache(self):
|
||||
fake_memcache = FakeMemcache()
|
||||
self.assertEquals(fake_memcache.store, {})
|
||||
resp = Request.blank('/v1/a/c4',
|
||||
environ={'swift.cache': fake_memcache}
|
||||
).get_response(self.test_staticweb)
|
||||
self.assertEquals(resp.status_int, 301)
|
||||
self.assertEquals(fake_memcache.store,
|
||||
{'/staticweb2/v1/a/c4':
|
||||
('index.html', 'error.html', 't', 'listing.css', 'text/dir')})
|
||||
self.assert_(self.test_staticweb.app.get_c4_called)
|
||||
self.test_staticweb.app.get_c4_called = False
|
||||
resp = Request.blank('/v1/a/c4',
|
||||
environ={'swift.cache': fake_memcache}
|
||||
).get_response(self.test_staticweb)
|
||||
self.assertEquals(resp.status_int, 301)
|
||||
self.assert_(not self.test_staticweb.app.get_c4_called)
|
||||
self.assertEquals(fake_memcache.store,
|
||||
{'/staticweb2/v1/a/c4':
|
||||
('index.html', 'error.html', 't', 'listing.css', 'text/dir')})
|
||||
resp = Request.blank('/v1/a/c4',
|
||||
environ={'swift.cache': fake_memcache, 'REQUEST_METHOD': 'PUT'}
|
||||
).get_response(self.test_staticweb)
|
||||
self.assertEquals(resp.status_int, 200)
|
||||
self.assertEquals(fake_memcache.store, {})
|
||||
resp = Request.blank('/v1/a/c4',
|
||||
environ={'swift.cache': fake_memcache}
|
||||
).get_response(self.test_staticweb)
|
||||
self.assertEquals(resp.status_int, 301)
|
||||
self.assertEquals(fake_memcache.store,
|
||||
{'/staticweb2/v1/a/c4':
|
||||
('index.html', 'error.html', 't', 'listing.css', 'text/dir')})
|
||||
resp = Request.blank('/v1/a/c4',
|
||||
environ={'swift.cache': fake_memcache, 'REQUEST_METHOD': 'POST'}
|
||||
).get_response(self.test_staticweb)
|
||||
self.assertEquals(resp.status_int, 200)
|
||||
self.assertEquals(fake_memcache.store, {})
|
||||
|
||||
def test_container4subdir(self):
|
||||
resp = Request.blank(
|
||||
'/v1/a/c4/subdir/').get_response(self.test_staticweb)
|
||||
|
|
@ -724,7 +694,7 @@ class TestStaticWeb(unittest.TestCase):
|
|||
self.assertEquals(resp.status_int, 200)
|
||||
self.assertEquals(resp.headers['x-object-meta-test'], 'value')
|
||||
self.assertEquals(resp.body, '1')
|
||||
self.assertEquals(self.app.calls, 2)
|
||||
self.assertEquals(self.app.calls, 1)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
|||
Loading…
Reference in New Issue