openstack/swift
Code Issues Proposed changes

Merge "Block X-Backend* in gatekeeper"

Browse Source
This commit is contained in:
Jenkins 2014-03-22 00:17:17 +00:00 committed by Gerrit Code Review
commit d4a1d75bfc
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swift/common/middleware/gatekeeper.py
View File

@ -45,7 +45,8 @@ import re
# rather than prefix match. # rather than prefix match.
inbound_exclusions = [get_sys_meta_prefix('account'), inbound_exclusions = [get_sys_meta_prefix('account'),
get_sys_meta_prefix('container'), get_sys_meta_prefix('container'),
get_sys_meta_prefix('object')] get_sys_meta_prefix('object'),
'x-backend']
# 'x-object-sysmeta' is reserved in anticipation of future support # 'x-object-sysmeta' is reserved in anticipation of future support
# for system metadata being applied to objects # for system metadata being applied to objects

5
swift/proxy/server.py
View File

@ -264,11 +264,6 @@ class Application(object):
try: try:
if self.memcache is None: if self.memcache is None:
self.memcache = cache_from_env(env) self.memcache = cache_from_env(env)
# Remove any x-backend-* headers since those are reserved for use
# by backends communicating with each other; no end user should be
# able to send those into the cluster.
for key in list(k for k in env if k.startswith('HTTP_X_BACKEND_')):
del env[key]
req = self.update_request(Request(env)) req = self.update_request(Request(env))
return self.handle_request(req)(env, start_response) return self.handle_request(req)(env, start_response)
except UnicodeError: except UnicodeError:

9
test/unit/common/middleware/test_gatekeeper.py
View File

@ -68,8 +68,13 @@ class TestGatekeeper(unittest.TestCase):
'X-Container-Sysmeta-BAR': 'value', 'X-Container-Sysmeta-BAR': 'value',
'X-Object-Sysmeta-BAR': 'value'} 'X-Object-Sysmeta-BAR': 'value'}
forbidden_headers_out = dict(sysmeta_headers) x_backend_headers = {'X-Backend-Replication': 'true',
forbidden_headers_in = dict(sysmeta_headers) 'X-Backend-Replication-Headers': 'stuff'}
forbidden_headers_out = dict(sysmeta_headers.items() +
x_backend_headers.items())
forbidden_headers_in = dict(sysmeta_headers.items() +
x_backend_headers.items())
def _assertHeadersEqual(self, expected, actual): def _assertHeadersEqual(self, expected, actual):
for key in expected: for key in expected: