Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use region specific endpoint when updating s3 hostname #170

Merged
merged 2 commits into from
Nov 2, 2013
Merged

Use region specific endpoint when updating s3 hostname #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2551de
Use region specific endpoint when updating s3 hostname
jamesls Nov 1, 2013
be4ed78
Keep a list of restricted regions that aren't remapped
jamesls Nov 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions botocore/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@


logger = logging.getLogger(__name__)
LabelRE = re.compile('[a-z0-9][a-z0-9\-]*[a-z0-9]')
LABEL_RE = re.compile('[a-z0-9][a-z0-9\-]*[a-z0-9]')
RESTRICTED_REGIONS = [
'us-gov-west-1',
'fips-gov-west-1',
]



def decode_console_output(event_name, shape, value, **kwargs):
Expand Down Expand Up @@ -91,7 +96,7 @@ def check_dns_name(bucket_name):
if n == 1:
if not bucket_name.isalnum():
return False
match = LabelRE.match(bucket_name)
match = LABEL_RE.match(bucket_name)
if match is None or match.end() != len(bucket_name):
return False
return True
Expand All @@ -114,7 +119,7 @@ def fix_s3_host(event_name, endpoint, request, auth, **kwargs):
bucket_name = path_parts[1]
logger.debug('Checking for DNS compatible bucket for: %s',
request.url)
if check_dns_name(bucket_name):
if check_dns_name(bucket_name) and _allowed_region(endpoint.region_name):
# If the operation is on a bucket, the auth_path must be
# terminated with a '/' character.
if len(path_parts) == 2:
Expand All @@ -132,6 +137,10 @@ def fix_s3_host(event_name, endpoint, request, auth, **kwargs):
bucket_name)


def _allowed_region(region_name):
return region_name not in RESTRICTED_REGIONS


def register_retries_for_service(service, **kwargs):
if not hasattr(service, 'retry'):
return
Expand Down
9 changes: 9 additions & 0 deletions tests/unit/test_s3_addressing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@ def test_list_objects_dns_name_non_classic(self):
self.assertEqual(prepared_request.url,
'https://safename.s3.amazonaws.com/')

def test_list_objects_in_restricted_regions(self):
self.endpoint = self.s3.get_endpoint('us-gov-west-1')
op = self.s3.get_operation('ListObjects')
params = op.build_parameters(bucket='safename')
prepared_request = self.get_prepared_request(op, params)
# Note how we keep the region specific endpoint here.
self.assertEqual(prepared_request.url,
'https://s3-us-gov-west-1.amazonaws.com/safename')

def test_list_objects_non_dns_name_non_classic(self):
self.endpoint = self.s3.get_endpoint('us-west-2')
op = self.s3.get_operation('ListObjects')
Expand Down