Skip to content

Fix SSO login failure for China and EUSC partition URLs #10465

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

Merged
AndrewAsseily merged 4 commits into from
Jul 2, 2026
+65 −2
Merged

Fix SSO login failure for China and EUSC partition URLs #10465

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
4a97323
Add China partition domains to SSO start URL resolver allowlist
AndrewAsseily Jul 2, 2026
d261619
Add changelog entry
AndrewAsseily Jul 2, 2026
67dc7d5
Add EUSC, and DualStack partition domains to SSO start URL resolver a…
AndrewAsseily Jul 2, 2026
49731d3
Update changelog
AndrewAsseily Jul 2, 2026
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
5 changes: 5 additions & 0 deletions .changes/next-release/bugfix-sso-17448.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "bugfix",
"category": "``sso``",
"description": "Fix SSO login failure for non-commercial partition URLs (China and EUSC)"
}
32 changes: 30 additions & 2 deletions awscli/customizations/sso/resolve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,18 @@
_AWS_OWNED_SUFFIXES = (
'.app.aws',
'.portal.amazonaws.com',
'.portal.amazonaws.com.cn',
'.app.amazonwebservices.com.cn',
'.portal.amazonaws.eu',
'.api.amazonwebservices.eu',
'.awsapps.com',
'.awsapps.cn',
)

_AWS_OWNED_EXACT = 'identitycenter.amazonaws.com'
_AWS_OWNED_EXACT = (
'identitycenter.amazonaws.com',
'identitycenter.amazonaws.com.cn',
)

_REGION_PATTERNS = (
# {idcInstanceId}.portal.{region}.app.aws
Expand All @@ -41,6 +49,26 @@
r'^[^.]+\.(?P<region>[a-z0-9-]+)\.portal\.amazonaws\.com$',
re.IGNORECASE,
),
# {idcInstanceId}.{region}.portal.amazonaws.com.cn
re.compile(
r'^[^.]+\.(?P<region>[a-z0-9-]+)\.portal\.amazonaws\.com\.cn$',
re.IGNORECASE,
),
# {idcInstanceId}.portal.{region}.app.amazonwebservices.com.cn
re.compile(
r'^[^.]+\.portal\.(?P<region>[a-z0-9-]+)\.app\.amazonwebservices\.com\.cn$',
re.IGNORECASE,
),
# {idcInstanceId}.{region}.portal.amazonaws.eu
re.compile(
r'^[^.]+\.(?P<region>[a-z0-9-]+)\.portal\.amazonaws\.eu$',
re.IGNORECASE,
),
# {idcInstanceId}.portal.{region}.api.amazonwebservices.eu
re.compile(
r'^[^.]+\.portal\.(?P<region>[a-z0-9-]+)\.api\.amazonwebservices\.eu$',
re.IGNORECASE,
),
)

_MAX_REDIRECTS = 1
Expand All @@ -61,7 +89,7 @@ def _normalize_url(url):

def is_aws_owned_domain(hostname):
hostname = hostname.lower().rstrip('.')
if hostname == _AWS_OWNED_EXACT:
if hostname in _AWS_OWNED_EXACT:
return True
for suffix in _AWS_OWNED_SUFFIXES:
if hostname == suffix.lstrip('.'):
Expand Down
30 changes: 30 additions & 0 deletions tests/unit/customizations/sso/test_resolve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@ class TestIsAwsOwnedDomain:
'awsapps.com',
'identitycenter.amazonaws.com',
'identitycenter.amazonaws.com.',
'd-abc123.awsapps.cn',
'myalias.awsapps.cn',
'ssoins-abc123.cn-north-1.portal.amazonaws.com.cn',
'ssoins-abc123.cn-northwest-1.portal.amazonaws.com.cn',
'identitycenter.amazonaws.com.cn',
'ssoins-abc123.portal.cn-north-1.app.amazonwebservices.com.cn',
'ssoins-abc123.eusc-de-east-1.portal.amazonaws.eu',
'ssoins-abc123.portal.eusc-de-east-1.api.amazonwebservices.eu',
],
)
def test_aws_owned_returns_true(self, hostname):
Expand All @@ -56,6 +64,9 @@ def test_aws_owned_returns_true(self, hostname):
'notidentitycenter.amazonaws.com',
'example.com',
'',
'awsapps.cn.evil.net',
'evil-awsapps.cn',
'portal.amazonaws.com.cn.evil.net',
],
)
def test_non_aws_owned_returns_false(self, hostname):
Expand All @@ -72,6 +83,23 @@ class TestExtractRegionFromHostname:
('ssoins-abc.portal.cn-north-1.app.aws', 'cn-north-1'),
('ssoins-abc.us-gov-west-1.portal.amazonaws.com', 'us-gov-west-1'),
('ssoins-abc.us-west-2.portal.amazonaws.com', 'us-west-2'),
('ssoins-abc.cn-north-1.portal.amazonaws.com.cn', 'cn-north-1'),
(
'ssoins-abc.cn-northwest-1.portal.amazonaws.com.cn',
'cn-northwest-1',
),
(
'ssoins-abc.portal.cn-north-1.app.amazonwebservices.com.cn',
'cn-north-1',
),
(
'ssoins-abc.eusc-de-east-1.portal.amazonaws.eu',
'eusc-de-east-1',
),
(
'ssoins-abc.portal.eusc-de-east-1.api.amazonwebservices.eu',
'eusc-de-east-1',
),
],
)
def test_extracts_region(self, hostname, expected_region):
Expand All @@ -81,7 +109,9 @@ def test_extracts_region(self, hostname, expected_region):
'hostname',
[
'd-abc123.awsapps.com',
'd-abc123.awsapps.cn',
'identitycenter.amazonaws.com',
'identitycenter.amazonaws.com.cn',
'aws.mycompany.com',
],
)
Expand Down
Loading