Managed Identity and Service Principal Support

CredentialProvider.Microsoft.Tests/CredentialProvider.Microsoft.Tests.csproj

@@ -4,6 +4,8 @@
  <PropertyGroup>
  <LangVersion>latest</LangVersion>
  <IsPackable>false</IsPackable>
+ <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+ <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
  </PropertyGroup>
 
  <ItemGroup>
@@ -18,5 +20,4 @@
  <ProjectReference Include="..\CredentialProvider.Microsoft\CredentialProvider.Microsoft.csproj" />
  <ProjectReference Include="..\src\Authentication\Microsoft.Artifacts.Authentication.csproj" />
  </ItemGroup>
-
 </Project>

CredentialProvider.Microsoft.Tests/CredentialProviders/Vsts/AuthUtilTests.cs

@@ -45,27 +45,27 @@ public void TestCleanup()
  }
 
  [TestMethod]
- public async Task GetAadAuthorityUri_WithoutAuthenticateHeaders_ReturnsCorrectAuthority()
+ public async Task GetAuthorizationInfoAsync_WithoutAuthenticateHeaders_ReturnsCorrectAuthority()
  {
  var requestUri = new Uri("https://example.pkgs.visualstudio.com/_packaging/feed/nuget/v3/index.json");
 
- var authorityUri = await authUtil.GetAadAuthorityUriAsync(requestUri, cancellationToken);
+ var authInfo = await authUtil.GetAuthorizationInfoAsync(requestUri, cancellationToken);
 
- authorityUri.Should().Be(organizationsAuthority);
+ authInfo.EntraAuthorityUri.Should().Be(organizationsAuthority);
  }
 
  [TestMethod]
- public async Task GetAadAuthorityUri_WithoutAuthenticateHeadersAndPpe_ReturnsCorrectAuthority()
+ public async Task GetAuthorizationInfoAsync_WithoutAuthenticateHeadersAndPpe_ReturnsCorrectAuthority()
  {
  var requestUri = new Uri("https://example.pkgs.vsts.me/_packaging/feed/nuget/v3/index.json");
 
- var authorityUri = await authUtil.GetAadAuthorityUriAsync(requestUri, cancellationToken);
+ var authInfo = await authUtil.GetAuthorizationInfoAsync(requestUri, cancellationToken);
 
- authorityUri.Should().Be(new Uri("https://login.windows-ppe.net/organizations"));
+ authInfo.EntraAuthorityUri.Should().Be(new Uri("https://login.windows-ppe.net/organizations"));
  }
 
  [TestMethod]
- public async Task GetAadAuthorityUri_WithoutAuthenticateHeadersAndPpeAndPpeOverride_ReturnsCorrectAuthority()
+ public async Task GetAuthorizationInfoAsync_WithoutAuthenticateHeadersAndPpeAndPpeOverride_ReturnsCorrectAuthority()
  {
  var ppeUris = new[]
  {
@@ -79,36 +79,49 @@ public async Task GetAadAuthorityUri_WithoutAuthenticateHeadersAndPpeAndPpeOverr
 
  foreach (var ppeUri in ppeUris)
  {
- var authorityUri = await authUtil.GetAadAuthorityUriAsync(ppeUri, cancellationToken);
+ var authInfo = await authUtil.GetAuthorizationInfoAsync(ppeUri, cancellationToken);
 
- authorityUri.Should().Be(new Uri("https://login.windows-ppe.net/organizations"));
+ authInfo.EntraAuthorityUri.Should().Be(new Uri("https://login.windows-ppe.net/organizations"));
  }
  }
 
  [TestMethod]
- public async Task GetAadAuthorityUri_WithAuthenticateHeaders_ReturnsCorrectAuthority()
+ public async Task GetAuthorizationInfoAsync_WithAuthenticateHeaders_ReturnsCorrectAuthority()
  {
  var requestUri = new Uri("https://example.pkgs.visualstudio.com/_packaging/feed/nuget/v3/index.json");
 
  MockAadAuthorityHeaders(testAuthority);
 
- var authorityUri = await authUtil.GetAadAuthorityUriAsync(requestUri, cancellationToken);
+ var authInfo = await authUtil.GetAuthorizationInfoAsync(requestUri, cancellationToken);
 
- authorityUri.Should().Be(testAuthority);
+ authInfo.EntraAuthorityUri.Should().Be(testAuthority);
  }
 
  [TestMethod]
- public async Task GetAadAuthorityUri_WithAuthenticateHeadersAndEnvironmentOverride_ReturnsOverrideAuthority()
+ public async Task GetAuthorizationInfoAsync_WithAuthenticateHeadersAndEnvironmentOverride_ReturnsOverrideAuthority()
  {
  var requestUri = new Uri("https://example.pkgs.visualstudio.com/_packaging/feed/nuget/v3/index.json");
  var overrideAuthority = new Uri("https://override.aad.authority.com");
 
  MockAadAuthorityHeaders(testAuthority);
 
  Environment.SetEnvironmentVariable(EnvUtil.MsalAuthorityEnvVar, overrideAuthority.ToString());
- var authorityUri = await authUtil.GetAadAuthorityUriAsync(requestUri, cancellationToken);
+ var authInfo = await authUtil.GetAuthorizationInfoAsync(requestUri, cancellationToken);
 
- authorityUri.Should().Be(overrideAuthority);
+ authInfo.EntraAuthorityUri.Should().Be(overrideAuthority);
+ }
+
+ [TestMethod]
+ public async Task GetAuthorizationInfoAsync_WithTenantHeaders_ReturnsCorrectTenantId()
+ {
+ var requestUri = new Uri("https://example.pkgs.visualstudio.com/_packaging/feed/nuget/v3/index.json");
+
+ var testTenant = Guid.NewGuid();
+ MockVssResourceTenantHeader(testTenant);
+
+ var authInfo = await authUtil.GetAuthorizationInfoAsync(requestUri, cancellationToken);
+
+ authInfo.EntraTenantId.Should().Be(testTenant.ToString());
  }
 
  [TestMethod]
@@ -203,9 +216,9 @@ private void MockResponseHeaders(string key, string value)
  authUtil.HttpResponseHeaders.Add(key, value);
  }
 
- private void MockVssResourceTenantHeader()
+ private void MockVssResourceTenantHeader(Guid? guid = null)
  {
- MockResponseHeaders(AuthUtil.VssResourceTenant, Guid.NewGuid().ToString());
+ MockResponseHeaders(AuthUtil.VssResourceTenant,(guid ?? Guid.NewGuid()).ToString());
  }
 
  private void MockVssAuthorizationEndpointHeader()

CredentialProvider.Microsoft.Tests/CredentialProviders/Vsts/VstsCredentialProviderTests.cs

@@ -46,15 +46,15 @@ public void TestInitialize()
  mockBearerTokenProvider2.Setup(x => x.CanGetToken(It.IsAny<TokenRequest>())).Returns(true);
  mockBearerTokenProvider2.Setup(x => x.GetTokenAsync(It.IsAny<TokenRequest>(), It.IsAny<CancellationToken>())).ReturnsAsync((AuthenticationResult)null);
  mockBearerTokenProvidersFactory = new Mock<ITokenProvidersFactory>();
- mockBearerTokenProvidersFactory.Setup(x => x.GetAsync(It.IsAny<Uri>())).ReturnsAsync(new[] { mockBearerTokenProvider1.Object, mockBearerTokenProvider2.Object });
+ mockBearerTokenProvidersFactory.Setup(x => x.Get(It.IsAny<Uri>())).ReturnsAsync(new[] { mockBearerTokenProvider1.Object, mockBearerTokenProvider2.Object });
 
  mockVstsSessionTokenFromBearerTokenProvider = new Mock<IAzureDevOpsSessionTokenFromBearerTokenProvider>();
  mockVstsSessionTokenFromBearerTokenProvider.Setup(x => x.GetAzureDevOpsSessionTokenFromBearerToken(It.IsAny<GetAuthenticationCredentialsRequest>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()));
 
  mockAuthUtil = new Mock<IAuthUtil>();
  mockAuthUtil
- .Setup(x => x.GetAadAuthorityUriAsync(It.IsAny<Uri>(), It.IsAny<CancellationToken>()))
- .Returns(Task.FromResult(testAuthority));
+ .Setup(x => x.GetAuthorizationInfoAsync(It.IsAny<Uri>(), It.IsAny<CancellationToken>()))
+ .Returns(Task.FromResult(new AuthorizationInfo() { EntraAuthorityUri = testAuthority }));
 
  vstsCredentialProvider = new VstsCredentialProvider(
  mockLogger.Object,