Skip to content

Add support for sending X5C when using a service principal with certificate for authentication #1666

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
merged 5 commits into from
Jul 19, 2024
Merged

Add support for sending X5C when using a service principal with certificate for authentication #1666

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62b9c3d
Add method for sending X5C
Jul 17, 2024
ece4379
Debugging updates
Jul 18, 2024
52c1be9
Revert version change
Jul 18, 2024
55d6262
Apply code review feedback to use more appropriate helper functions i…
Jul 19, 2024
ab05752
Update configuration and environment documentation to document the ne…
Jul 19, 2024
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
Next Next commit
Debugging updates
  • Loading branch information
Michael J. Lyons (XBOX) committed Jul 18, 2024
commit ece43792a8335393a3611d1e9ad529edd7b7501c
12 changes: 3 additions & 9 deletions src/shared/Core/Authentication/MicrosoftAuthentication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,20 +274,14 @@ public async Task<IMicrosoftAuthenticationResult> GetTokenForServicePrincipalAsy

try
{
var tokenBuilder = app.AcquireTokenForClient(scopes);

if (sp.SendX5C)
{
tokenBuilder = tokenBuilder.WithSendX5C(true);
}

AuthenticationResult result = await tokenBuilder.ExecuteAsync();
Context.Trace.WriteLine($"Sending with X5C: '{sp.SendX5C}'.");
AuthenticationResult result = await app.AcquireTokenForClient(scopes).WithSendX5C(sp.SendX5C).ExecuteAsync();;

return new MsalResult(result);
}
catch (Exception ex)
{
Context.Trace.WriteLine($"Failed to acquire token for service principal '{sp.TenantId}/{sp.TenantId}'.");
Context.Trace.WriteLine($"Failed to acquire token for service principal '{sp.TenantId}/{sp.Id}'.");
Context.Trace.WriteException(ex);
throw;
}
Expand Down
2 changes: 1 addition & 1 deletion src/shared/Microsoft.AzureRepos/AzureReposHostProvider.cs
View file
Open in desktop

This comment was marked as outdated.

Sign in to view

Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ private bool UseServicePrincipal(out ServicePrincipalIdentity sp)
AzureDevOpsConstants.GitConfiguration.Credential.ServicePrincipalCertificateSendX5C,
out string certHasX5C);

sp.SendX5C = !hasX5CSetting || certHasX5C == "false";
sp.SendX5C = !hasX5CSetting || certHasX5C != "false";

X509Certificate2 cert = X509Utils.GetCertificateByThumbprint(certThumbprint);
if (cert is null)
Expand Down