openstack
/
swift
Code Issues Proposed changes

changed domain_remap to handle multiple reseller prefixes

This commit is contained in:
Colin Nicholson 2011-01-21 10:11:38 +00:00
parent e76598fa58
commit 643476c3b0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
swift/common/middleware/domain_remap.py
View File

@ -39,7 +39,7 @@ class DomainRemapMiddleware(object):
if self.storage_domain and self.storage_domain[0] != '.': if self.storage_domain and self.storage_domain[0] != '.':
self.storage_domain = '.' + self.storage_domain self.storage_domain = '.' + self.storage_domain
self.path_root = conf.get('path_root', 'v1').strip('/') self.path_root = conf.get('path_root', 'v1').strip('/')
self.reseller_prefix = conf.get('reseller_prefix','AUTH'); self.reseller_prefixes = conf.get('reseller_prefixes','AUTH').split(',');
def __call__(self, env, start_response): def __call__(self, env, start_response):
if not self.storage_domain: if not self.storage_domain:
@ -63,10 +63,12 @@ class DomainRemapMiddleware(object):
return resp(env, start_response) return resp(env, start_response)
if '_' not in account and '-' in account: if '_' not in account and '-' in account:
account = account.replace('-', '_', 1) account = account.replace('-', '_', 1)
if account.lower().startswith(self.reseller_prefix.lower()) and \ for reseller_prefix in self.reseller_prefixes:
not account.startswith(self.reseller_prefix): if account.lower().startswith(reseller_prefix.lower()):
account_suffix = account[len(self.reseller_prefix):] if not account.startswith(reseller_prefix):
account = self.reseller_prefix + account_suffix account_suffix = account[len(reseller_prefix):]
account = reseller_prefix + account_suffix
break
path = env['PATH_INFO'].strip('/') path = env['PATH_INFO'].strip('/')
new_path_parts = ['', self.path_root, account] new_path_parts = ['', self.path_root, account]
if container: if container: