Skip to content

Fixes Fido2Configuration.FullyQualifiedOrigins contains a null entry when configured from a configuration section on .NET 7 #360

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
abergs merged 1 commit into from Jan 11, 2023
+6 −6
Merged

Fixes Fido2Configuration.FullyQualifiedOrigins contains a null entry when configured from a configuration section on .NET 7 #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions Src/Fido2.Models/Fido2Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ namespace Fido2NetLib;

public class Fido2Configuration
{
private HashSet<string> _origins;
private HashSet<string> _fullyQualifiedOrigins;
private ISet<string> _origins;
private ISet<string> _fullyQualifiedOrigins;

/// <summary>
/// Create the configuration for Fido2.
Expand Down Expand Up @@ -56,7 +56,7 @@ public Fido2Configuration()
/// <summary>
/// Server origins, including protocol host and port.
/// </summary>
public HashSet<string> Origins
public ISet<string> Origins
{
get
{
Expand Down Expand Up @@ -86,7 +86,7 @@ public HashSet<string> Origins
/// <summary>
/// Fully Qualified Server origins, generated automatically from Origins.
/// </summary>
public HashSet<string> FullyQualifiedOrigins
public ISet<string> FullyQualifiedOrigins
{
get => _fullyQualifiedOrigins ?? new HashSet<string>
{
Expand Down
2 changes: 1 addition & 1 deletion Src/Fido2/AuthenticatorAssertionResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public static AuthenticatorAssertionResponse Parse(AuthenticatorAssertionRawResp
/// <param name="cancellationToken"></param>
public async Task<AssertionVerificationResult> VerifyAsync(
AssertionOptions options,
HashSet<string> fullyQualifiedExpectedOrigins,
ISet<string> fullyQualifiedExpectedOrigins,
byte[] storedPublicKey,
uint storedSignatureCounter,
IsUserHandleOwnerOfCredentialIdAsync isUserHandleOwnerOfCredId,
Expand Down
2 changes: 1 addition & 1 deletion Src/Fido2/AuthenticatorResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ protected AuthenticatorResponse(ReadOnlySpan<byte> utf8EncodedJson)

// todo: add TokenBinding https://www.w3.org/TR/webauthn/#dictdef-tokenbinding

protected void BaseVerify(HashSet<string> fullyQualifiedExpectedOrigins, ReadOnlySpan<byte> originalChallenge, ReadOnlySpan<byte> requestTokenBindingId)
protected void BaseVerify(ISet<string> fullyQualifiedExpectedOrigins, ReadOnlySpan<byte> originalChallenge, ReadOnlySpan<byte> requestTokenBindingId)
{
if (Type is not "webauthn.create" && Type is not "webauthn.get")
throw new Fido2VerificationException(Fido2ErrorCode.InvalidAuthenticatorResponse, $"Type must be 'webauthn.create' or 'webauthn.get'. Was '{Type}'");
Expand Down