openstack/swift
Code Issues Proposed changes

More bugfixes found by letterj

Browse Source
This commit is contained in:
gholt
2011-03-24 23:50:52 +00:00
parent a464e4aa6b
commit 0d267d3ec4
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
swift/common/middleware/staticweb.py
View File

@@ -111,8 +111,8 @@ import urllib
from webob import Response, Request from webob import Response, Request
from webob.exc import HTTPMovedPermanently, HTTPNotFound from webob.exc import HTTPMovedPermanently, HTTPNotFound
from swift.common.utils import cache_from_env, human_readable, split_path, \ from swift.common.utils import cache_from_env, get_logger, human_readable, \
TRUE_VALUES split_path, TRUE_VALUES
class StaticWeb(object): class StaticWeb(object):
@@ -131,6 +131,8 @@ class StaticWeb(object):
self.conf = conf self.conf = conf
#: The seconds to cache the x-container-meta-web-* headers., #: The seconds to cache the x-container-meta-web-* headers.,
self.cache_timeout = int(conf.get('cache_timeout', 300)) self.cache_timeout = int(conf.get('cache_timeout', 300))
#: Logger for this filter.
self.logger = get_logger(conf, log_route='staticweb')
# Results from the last call to self._start_response. # Results from the last call to self._start_response.
self._response_status = None self._response_status = None
self._response_headers = None self._response_headers = None
@@ -333,11 +335,13 @@ class StaticWeb(object):
:param start_response: The original WSGI start_response hook. :param start_response: The original WSGI start_response hook.
""" """
self._get_container_info(env, start_response) self._get_container_info(env, start_response)
if not self._index: if not self._listings and not self._index:
return self.app(env, start_response) return self.app(env, start_response)
if env['PATH_INFO'][-1] != '/': if env['PATH_INFO'][-1] != '/':
return HTTPMovedPermanently( return HTTPMovedPermanently(
location=(env['PATH_INFO'] + '/'))(env, start_response) location=(env['PATH_INFO'] + '/'))(env, start_response)
if not self._index:
return self._listing(env, start_response)
tmp_env = dict(env) tmp_env = dict(env)
tmp_env['PATH_INFO'] += self._index tmp_env['PATH_INFO'] += self._index
resp = self.app(tmp_env, self._start_response) resp = self.app(tmp_env, self._start_response)
@@ -368,8 +372,10 @@ class StaticWeb(object):
if status_int != 404: if status_int != 404:
return self._error_response(resp, env, start_response) return self._error_response(resp, env, start_response)
self._get_container_info(env, start_response) self._get_container_info(env, start_response)
if not self._index: if not self._listings and not self._index:
return self.app(env, start_response) return self.app(env, start_response)
if not self._index:
return self._listing(env, start_response, self.obj)
tmp_env = dict(env) tmp_env = dict(env)
if tmp_env['PATH_INFO'][-1] != '/': if tmp_env['PATH_INFO'][-1] != '/':
tmp_env['PATH_INFO'] += '/' tmp_env['PATH_INFO'] += '/'
@@ -421,11 +427,11 @@ class StaticWeb(object):
(self.version, self.account, self.container) (self.version, self.account, self.container)
memcache_client.delete(memcache_key) memcache_client.delete(memcache_key)
return self.app(env, start_response) return self.app(env, start_response)
if env['REQUEST_METHOD'] not in ('HEAD', 'GET') or \ if (env['REQUEST_METHOD'] not in ('HEAD', 'GET') or
(env.get('REMOTE_USER') and (env.get('REMOTE_USER') and
env.get('HTTP_X_WEB_MODE', 'f') not in TRUE_VALUES) or \ env.get('HTTP_X_WEB_MODE', 'f').lower() not in TRUE_VALUES) or
(not env.get('REMOTE_USER') and (not env.get('REMOTE_USER') and
env.get('HTTP_X_WEB_MODE', 't') not in TRUE_VALUES): env.get('HTTP_X_WEB_MODE', 't').lower() not in TRUE_VALUES)):
return self.app(env, start_response) return self.app(env, start_response)
if self.obj: if self.obj:
return self._handle_object(env, start_response) return self._handle_object(env, start_response)