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

Host prefix bug #2911

Merged
merged 4 commits into from
Apr 19, 2023
Merged

Host prefix bug #2911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9def339
host_prefix regex
Apr 19, 2023
f48d6c0
test
Apr 19, 2023
b8b72c3
cleanup
Apr 19, 2023
7cc7e18
Update test and error construction
nateprewitt Apr 19, 2023
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
19 changes: 17 additions & 2 deletions botocore/serialize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@

from botocore import validate
from botocore.compat import formatdate
from botocore.exceptions import ParamValidationError
from botocore.utils import (
has_header,
is_json_value_header,
Expand All @@ -58,6 +59,7 @@
ISO8601 = '%Y-%m-%dT%H:%M:%SZ'
# Same as ISO8601, but with microsecond precision.
ISO8601_MICRO = '%Y-%m-%dT%H:%M:%S.%fZ'
HOST_PREFIX_RE = re.compile(r"^[A-Za-z0-9\.\-]+$")


def create_serializer(protocol_name, include_validation=True):
Expand Down Expand Up @@ -183,8 +185,21 @@ def _expand_host_prefix(self, parameters, operation_model):
for member, shape in input_members.items()
if shape.serialization.get('hostLabel')
]
format_kwargs = {name: parameters[name] for name in host_labels}

format_kwargs = {}
bad_labels = []
for name in host_labels:
param = parameters[name]
if not HOST_PREFIX_RE.match(param):
bad_labels.append(name)
format_kwargs[name] = param
if bad_labels:
raise ParamValidationError(
report=(
f"Invalid value for parameter(s): {', '.join(bad_labels)}. "
"Must contain only alphanumeric characters, hyphen, "
"or period."
)
)
return host_prefix_expression.format(**format_kwargs)


Expand Down
11 changes: 11 additions & 0 deletions tests/functional/test_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,6 +1377,17 @@ def test_endpoint_redirection_fails_with_accelerate_endpoint(self):
RequestToken="SecretToken",
)

def test_invalid_request_route_raises(self):
self.client, self.http_stubber = self.create_stubbed_s3_client(
region_name="us-west-2"
)
self.http_stubber.add_response()
with self.assertRaises(ParamValidationError):
self.client.write_get_object_response(
RequestRoute="my-route/",
RequestToken="SecretToken",
)


class TestS3SigV4(BaseS3OperationTest):
def setUp(self):
Expand Down