Skip to content

Fix use_ssl parameter ignored when custom HTTPS endpoint_url provided #9704

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

Open
wants to merge 1 commit into
base: v2
Choose a base branch
from
+81 −1
Open

Fix use_ssl parameter ignored when custom HTTPS endpoint_url provided #9704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion awscli/botocore/regions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,11 @@ def construct_endpoint(
LOG.debug(f'Endpoint provider result: {provider_result.url}')

# The endpoint provider does not support non-secure transport.
if not self._use_ssl and provider_result.url.startswith('https://'):
if (
not self._use_ssl
and provider_result.url.startswith('https://')
and 'Endpoint' not in provider_params
):
provider_result = provider_result._replace(
url=f'http://{provider_result.url[8:]}'
)
Expand Down
76 changes: 76 additions & 0 deletions tests/unit/botocore/test_endpoint_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
from botocore.loaders import Loader
from botocore.regions import EndpointRulesetResolver

from unittest.mock import Mock, patch

REGION_TEMPLATE = "{Region}"
REGION_REF = {"ref": "Region"}
BUCKET_ARN_REF = {"ref": "bucketArn"}
Expand Down Expand Up @@ -486,3 +488,77 @@ def test_auth_schemes_conversion_first_authtype_unknown(
def test_get_attr(rule_lib, value, path, expected_value):
result = rule_lib.get_attr(value, path)
assert result == expected_value
@pytest.mark.parametrize(
"use_ssl, endpoint_url, provider_params, expected_url",
[
# use_ssl=True, endpoint_url="http://..." → HTTP
(
True,
'http://custom.com',
{'Endpoint': 'http://custom.com'},
'http://custom.com',
),
# use_ssl=True, endpoint_url="https://..." → HTTPS
(
True,
'https://custom.com',
{'Endpoint': 'https://custom.com'},
'https://custom.com',
),
# use_ssl=False, endpoint_url="http://..." → HTTP
(
False,
'http://custom.com',
{'Endpoint': 'http://custom.com'},
'http://custom.com',
),
# use_ssl=False, endpoint_url="https://..." → HTTPS
(
False,
'https://custom.com',
{'Endpoint': 'https://custom.com'},
'https://custom.com',
),
# use_ssl=True, no endpoint → HTTPS
(
True,
'https://s3-test-only-domain.amazonaws.com',
{},
'https://s3-test-only-domain.amazonaws.com',
),
# use_ssl=False, no endpoint → HTTP (downgrade)
(
False,
'https://s3-test-only-domain.amazonaws.com',
{},
'http://s3-test-only-domain.amazonaws.com',
),
],
)
def test_construct_endpoint_parametrized(
use_ssl, endpoint_url, provider_params, expected_url
):
resolver = EndpointRulesetResolver(
endpoint_ruleset_data={
'version': '1.0',
'parameters': {},
'rules': [],
},
partition_data={},
service_model=None,
builtins={},
client_context=None,
event_emitter=None,
use_ssl=use_ssl,
requested_auth_scheme=None,
)

with patch.object(resolver._provider, 'resolve_endpoint') as mock_resolve:
mock_resolve.return_value = RuleSetEndpoint(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we're missing an import that is causing this test to fail in CI.

url=endpoint_url, properties={}, headers={}
)
with patch.object(
resolver, '_get_provider_params', return_value=provider_params
):
result = resolver.construct_endpoint(None, None, None)
assert result.url == expected_url
Loading