Skip to content

[Core] Add workaround for cross-tenant authentication with Track 2 SDKs #16797

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
jiasli merged 4 commits into from
Apr 9, 2021
Merged

[Core] Add workaround for cross-tenant authentication with Track 2 SDKs #16797

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88738f2
cross-tenant authentication
jiasli Feb 3, 2021
b6cedae
Skip get_all_tokens for managed identity
jiasli Feb 22, 2021
b79feff
Merge branch 'dev' into cross-tenant
jiasli Mar 1, 2021
6071c37
Update src/azure-cli-core/azure/cli/core/commands/client_factory.py
jiasli Apr 6, 2021
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
Prev Previous commit
Update src/azure-cli-core/azure/cli/core/commands/client_factory.py 
Co-authored-by: Feiyue Yu <[email protected]>
  • Loading branch information
@jiasli @qwordy
jiasli and qwordy authored Apr 6, 2021
commit 6071c378b032e3c81dc2774b42f251ef4fb4ecba
2 changes: 1 addition & 1 deletion src/azure-cli-core/azure/cli/core/commands/client_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def _get_mgmt_service_client(cli_ctx,
# As a temporary workaround, manually add external tokens to 'x-ms-authorization-auxiliary' header.
# https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/authenticate-multi-tenant
if getattr(cred, "_external_tenant_token_retriever", None):
_, _, _, external_tenant_tokens = cred.get_all_tokens(*resource_to_scopes(resource))
*_, external_tenant_tokens = cred.get_all_tokens(*resource_to_scopes(resource))
# Hard-code scheme to 'Bearer' as _BearerTokenCredentialPolicyBase._update_headers does.
client_kwargs['headers']['x-ms-authorization-auxiliary'] = \
', '.join("Bearer {}".format(t[1]) for t in external_tenant_tokens)
Copy link
Member

@qwordy qwordy Apr 6, 2021

Choose a reason for hiding this comment

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

Is there a pipeline support?

Copy link
Member Author

@jiasli jiasli Apr 6, 2021

Choose a reason for hiding this comment

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

I will make a new policy and add it to the pipeline in the future, utilizing Azure/azure-sdk-for-python#17340.

Expand Down