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

Jump to bottom

[Identity] Fix VisualStudioCodeCredential to use refresh token for AzureCloud by default #16775

Merged
merged 2 commits into from
Nov 9, 2020
Merged

[Identity] Fix VisualStudioCodeCredential to use refresh token for AzureCloud by default #16775

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
6871c99
[Identity] Fix VisualStudioCodeCredential to use refresh token for Az…
schaabs Nov 9, 2020
8aecde9
fix GetAzureCloudInstance logic
schaabs Nov 9, 2020
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
3 changes: 3 additions & 0 deletions sdk/identity/Azure.Identity/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Release History
## 1.3.0-beta.3 (Unreleased)

### Fixes and improvements
- Prevent `VisualStudioCodeCredential` using invalid authentication data when no user is signed in to Visual Studio Code ([#15870](https://github.com/Azure/azure-sdk-for-net/issues/15870))

### Breaking Changes
- Rename property `IncludeX5CClaimHeader` on `ClientCertificateCredentialOptions` to `SendCertificateChain`
- Removing Application Authentication APIs for GA release. These will be reintroduced in 1.4.0-beta.1.
Expand Down
4 changes: 2 additions & 2 deletions sdk/identity/Azure.Identity/src/VisualStudioCodeCredential.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ private void GetUserSettings(out string tenant, out string environmentName)
{
var path = _vscAdapter.GetUserSettingsPath();
tenant = _tenantId;
environmentName = "Azure";
environmentName = "AzureCloud";

try
{
Expand Down Expand Up @@ -164,7 +164,7 @@ private static IVisualStudioCodeAdapter GetVscAdapter()
private static AzureCloudInstance GetAzureCloudInstance(string name) =>
name switch
{
"Azure" => AzureCloudInstance.AzurePublic,
"AzureCloud" => AzureCloudInstance.AzurePublic,
"AzureChina" => AzureCloudInstance.AzureChina,
"AzureGermanCloud" => AzureCloudInstance.AzureGermany,
"AzureUSGovernment" => AzureCloudInstance.AzureUsGovernment,
Expand Down
8 changes: 4 additions & 4 deletions sdk/identity/Azure.Identity/tests/ChainedTokenCredentialLiveTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public async Task ChainedTokenCredential_UseVisualStudioCodeCredential_ParallelC
public async Task ChainedTokenCredential_UseAzureCliCredential()
{
var (expectedToken, expectedExpiresOn, processOutput) = CredentialTestHelpers.CreateTokenForAzureCli();
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", null);
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", null);
var fileSystem = CredentialTestHelpers.CreateFileSystemForVisualStudioCode(TestEnvironment);
var processService = new TestProcessService(new TestProcess { Output = processOutput });

Expand Down Expand Up @@ -148,7 +148,7 @@ public async Task ChainedTokenCredential_UseAzureCliCredential()
public async Task ChainedTokenCredential_UseAzureCliCredential_ParallelCalls()
{
var (expectedToken, expectedExpiresOn, processOutput) = CredentialTestHelpers.CreateTokenForAzureCli();
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", null);
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", null);
var fileSystem = CredentialTestHelpers.CreateFileSystemForVisualStudioCode(TestEnvironment);
var processService = new TestProcessService { CreateHandler = psi => new TestProcess { Output = processOutput }};

Expand Down Expand Up @@ -177,7 +177,7 @@ public async Task ChainedTokenCredential_UseAzureCliCredential_ParallelCalls()
[Test]
public void ChainedTokenCredential_AllCredentialsHaveFailed_CredentialUnavailableException()
{
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", "{}");
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", "{}");

var fileSystem = new TestFileSystemService();
var processService = new TestProcessService(new TestProcess { Error = "'az' is not recognized" });
Expand Down Expand Up @@ -232,7 +232,7 @@ public void ChainedTokenCredential_AllCredentialsHaveFailed_FirstAuthenticationF
[Test]
public void ChainedTokenCredential_AllCredentialsHaveFailed_LastAuthenticationFailedException()
{
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", null);
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", null);
var fileSystem = new TestFileSystemService();
var processService = new TestProcessService(new TestProcess {Error = "Error"});

Expand Down
8 changes: 4 additions & 4 deletions sdk/identity/Azure.Identity/tests/DefaultAzureCredentialLiveTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public async Task DefaultAzureCredential_UseAzureCliCredential()

var (expectedToken, expectedExpiresOn, processOutput) = CredentialTestHelpers.CreateTokenForAzureCli();
var testProcess = new TestProcess { Output = processOutput };
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", null);
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", null);
var fileSystem = CredentialTestHelpers.CreateFileSystemForVisualStudioCode(TestEnvironment);

var factory = new TestDefaultAzureCredentialFactory(options, fileSystem, new TestProcessService(testProcess), vscAdapter) { ManagedIdentitySourceFactory = () => default };
Expand Down Expand Up @@ -178,7 +178,7 @@ public async Task DefaultAzureCredential_UseAzureCliCredential_ParallelCalls()

var (expectedToken, expectedExpiresOn, processOutput) = CredentialTestHelpers.CreateTokenForAzureCli();
var processService = new TestProcessService { CreateHandler = psi => new TestProcess { Output = processOutput }};
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", null);
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", null);
var fileSystem = CredentialTestHelpers.CreateFileSystemForVisualStudioCode(TestEnvironment);

var factory = new TestDefaultAzureCredentialFactory(options, fileSystem, processService, vscAdapter) { ManagedIdentitySourceFactory = () => default };
Expand Down Expand Up @@ -210,7 +210,7 @@ public void DefaultAzureCredential_AllCredentialsHaveFailed_CredentialUnavailabl
ExcludeSharedTokenCacheCredential = true,
});

var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", "{}");
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", "{}");
var factory = new TestDefaultAzureCredentialFactory(options, new TestFileSystemService(), new TestProcessService(new TestProcess { Error = "'az' is not recognized" }), vscAdapter) { ManagedIdentitySourceFactory = () => default };
var credential = InstrumentClient(new DefaultAzureCredential(factory, options));

Expand Down Expand Up @@ -266,7 +266,7 @@ public void DefaultAzureCredential_AllCredentialsHaveFailed_LastAuthenticationFa
ExcludeSharedTokenCacheCredential = true,
});

var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", null);
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", null);
var factory = new TestDefaultAzureCredentialFactory(options, new TestFileSystemService(), new TestProcessService(new TestProcess { Error = "Error" }), vscAdapter) { ManagedIdentitySourceFactory = () => default };
var credential = InstrumentClient(new DefaultAzureCredential(factory, options));

Expand Down
12 changes: 6 additions & 6 deletions sdk/identity/Azure.Identity/tests/VisualStudioCodeCredentialLiveTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public async Task AuthenticateWithVscCredential_NoSettingsFile()
{
var refreshToken = await CredentialTestHelpers.GetRefreshTokenAsync(TestEnvironment, Mode);
var fileSystemService = new TestFileSystemService { ReadAllHandler = s => throw new FileNotFoundException() };
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", refreshToken);
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", refreshToken);

var options = InstrumentClientOptions(new VisualStudioCodeCredentialOptions { TenantId = TestEnvironment.TestTenantId });
VisualStudioCodeCredential credential = InstrumentClient(new VisualStudioCodeCredential(options, default, default, fileSystemService, vscAdapter));
Expand All @@ -52,7 +52,7 @@ public async Task AuthenticateWithVscCredential_BrokenSettingsFile()
{
var refreshToken = await CredentialTestHelpers.GetRefreshTokenAsync(TestEnvironment, Mode);
var fileSystemService = new TestFileSystemService { ReadAllHandler = s => "{a,}" };
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", refreshToken);
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", refreshToken);

var options = InstrumentClientOptions(new VisualStudioCodeCredentialOptions { TenantId = TestEnvironment.TestTenantId });
VisualStudioCodeCredential credential = InstrumentClient(new VisualStudioCodeCredential(options, default, default, fileSystemService, vscAdapter));
Expand All @@ -65,7 +65,7 @@ public async Task AuthenticateWithVscCredential_EmptySettingsFile()
{
var refreshToken = await CredentialTestHelpers.GetRefreshTokenAsync(TestEnvironment, Mode);
var fileSystemService = CredentialTestHelpers.CreateFileSystemForVisualStudioCode(TestEnvironment);
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", refreshToken);
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", refreshToken);

var options = InstrumentClientOptions(new VisualStudioCodeCredentialOptions { TenantId = TestEnvironment.TestTenantId });
VisualStudioCodeCredential credential = InstrumentClient(new VisualStudioCodeCredential(options, default, default, fileSystemService, vscAdapter));
Expand Down Expand Up @@ -107,7 +107,7 @@ public void AuthenticateWithVscCredential_NoVscInstalled()
public void AuthenticateWithVscCredential_NoRefreshToken()
{
var tenantId = TestEnvironment.TestTenantId;
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", null);
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", null);
var fileSystem = CredentialTestHelpers.CreateFileSystemForVisualStudioCode(TestEnvironment);

var options = InstrumentClientOptions(new VisualStudioCodeCredentialOptions { TenantId = tenantId });
Expand All @@ -121,7 +121,7 @@ public void AuthenticateWithVscCredential_AuthenticationCodeInsteadOfRefreshToke
{
var tenantId = TestEnvironment.TestTenantId;
var fileSystemService = CredentialTestHelpers.CreateFileSystemForVisualStudioCode(TestEnvironment);
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", "{}");
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", "{}");

var options = InstrumentClientOptions(new VisualStudioCodeCredentialOptions { TenantId = tenantId });
VisualStudioCodeCredential credential = InstrumentClient(new VisualStudioCodeCredential(options, default, default, fileSystemService, vscAdapter));
Expand All @@ -134,7 +134,7 @@ public void AuthenticateWithVscCredential_InvalidRefreshToken()
{
var tenantId = TestEnvironment.TestTenantId;
var fileSystemService = CredentialTestHelpers.CreateFileSystemForVisualStudioCode(TestEnvironment);
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "Azure", Guid.NewGuid().ToString());
var vscAdapter = new TestVscAdapter(ExpectedServiceName, "AzureCloud", Guid.NewGuid().ToString());

var options = InstrumentClientOptions(new VisualStudioCodeCredentialOptions { TenantId = tenantId });
VisualStudioCodeCredential credential = InstrumentClient(new VisualStudioCodeCredential(options, default, default, fileSystemService, vscAdapter));
Expand Down