MSI POP Attestation #5612
+260
−207
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
|
|
||
| #if NETSTANDARD | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
|
|
||
| using System; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.Identity.Client; | ||
| using Microsoft.Identity.Client.ManagedIdentity; | ||
|
|
||
| namespace Microsoft.Identity.Client.KeyAttestation | ||
| { | ||
| /// <summary> | ||
| /// Extension methods for enabling KeyGuard attestation support in managed identity mTLS PoP flows. | ||
| /// </summary> | ||
| public static class ManagedIdentityAttestationExtensions | ||
| { | ||
| /// <summary> | ||
| /// Enables KeyGuard attestation support for managed identity mTLS Proof-of-Possession flows. | ||
| /// This method should be called after <see cref="ManagedIdentityPopExtensions.WithMtlsProofOfPossession"/>. | ||
| /// </summary> | ||
| /// <param name="builder">The AcquireTokenForManagedIdentityParameterBuilder instance.</param> | ||
| /// <returns>The builder to chain .With methods.</returns> | ||
| public static AcquireTokenForManagedIdentityParameterBuilder WithAttestationSupport( | ||
| this AcquireTokenForManagedIdentityParameterBuilder builder) | ||
| { | ||
| if (builder == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(builder)); | ||
| } | ||
|
|
||
| // Register the attestation token provider | ||
| return builder.WithAttestationProviderForTests(async (req, ct) => | ||
|
Member
There was a problem hiding this comment. Why is builder method suffixed with "ForTests" ? It is production code. |
||
| { | ||
| // Get the caller-provided KeyGuard/CNG handle | ||
| var keyHandle = req.KeyHandle; | ||
|
|
||
| if (keyHandle == null) | ||
| { | ||
| throw new MsalClientException( | ||
| "attestation_key_handle_missing", | ||
| "KeyHandle is required for attestation but was not provided."); | ||
| } | ||
|
|
||
| // Call the native interop via PopKeyAttestor | ||
| AttestationResult attestationResult = await PopKeyAttestor.AttestKeyGuardAsync( | ||
| req.AttestationEndpoint.AbsoluteUri, | ||
| keyHandle, | ||
| req.ClientId ?? string.Empty, | ||
| ct).ConfigureAwait(false); | ||
|
|
||
| // Map to MSAL's internal response | ||
| if (attestationResult != null && | ||
| attestationResult.Status == AttestationStatus.Success && | ||
| !string.IsNullOrWhiteSpace(attestationResult.Jwt)) | ||
| { | ||
| return new AttestationTokenResponse { AttestationToken = attestationResult.Jwt }; | ||
| } | ||
|
|
||
| throw new MsalClientException( | ||
| "attestation_failure", | ||
| $"Key Attestation failed " + | ||
| $"(status={attestationResult?.Status}, " + | ||
| $"code={attestationResult?.NativeErrorCode}). {attestationResult?.ErrorMessage}"); | ||
| }); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
Robbie-Microsoft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| <!-- ─── Target frameworks ─────────────────────────────────────────────── --> | ||
| <PropertyGroup> | ||
|
|
@@ -19,20 +19,14 @@ | |
| <!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion--> | ||
| <Version>$(MicrosoftIdentityClientVersion)-preview</Version> | ||
| <!-- Copyright needs to be in the form of © not (c) to be compliant --> | ||
| <Title>MSAL.NET extension for KeyGuard attestation support</Title> | ||
|
Contributor
There was a problem hiding this comment. the feature GA'd under this name - https://learn.microsoft.com/en-us/windows/security/identity-protection/credential-guard/ |
||
| <Description> | ||
| This package contains binaries needed to enable KeyGuard attestation in managed identity proof-of-possession (mTLS PoP) flows using MSAL.NET. | ||
| </Description> | ||
| <PackageTags>Microsoft Authentication Library Managed Identity MSAL KeyGuard Attestation Proof-of-Possession</PackageTags> | ||
| <Product>Microsoft Authentication Library</Product> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- ─── References ────────────────────────────────────────────────────── --> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\Microsoft.Identity.Client\Microsoft.Identity.Client.csproj" /> | ||
|
|
@@ -42,6 +36,11 @@ | |
| <PackageReference Include="System.Security.Cryptography.Cng" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <!-- Temporarily disable PublicAPI analyzer to generate correct signatures --> | ||
|
|
||
| <NoWarn>$(NoWarn);RS0016;RS0017;RS0036;RS0041</NoWarn> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Label="For public api analyzer support"> | ||
| <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" /> | ||
| <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" /> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The solution file does not add the new project, only deletes the old one.