Skip to content

[dotnet] Fix webauth credential to allow nullable rpID #15201

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
Jan 31, 2025
Merged

[dotnet] Fix webauth credential to allow nullable rpID #15201

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70e14a6
rpId is nullable
nvborisenko Jan 31, 2025
01e2eb7
Fix test name
nvborisenko Jan 31, 2025
d1e9094
Non-nullable in CreateCredential methods
nvborisenko Jan 31, 2025
0dcae2e
Nullable property
nvborisenko Jan 31, 2025
e6b75da
Update convert to dict
nvborisenko Jan 31, 2025
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
10 changes: 5 additions & 5 deletions dotnet/src/webdriver/VirtualAuth/Credential.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ public sealed class Credential
private readonly byte[] id;
private readonly byte[]? userHandle;

private Credential(byte[] id, bool isResidentCredential, string rpId, string privateKey, byte[]? userHandle, int signCount)
private Credential(byte[] id, bool isResidentCredential, string? rpId, string privateKey, byte[]? userHandle, int signCount)
{
this.id = id ?? throw new ArgumentNullException(nameof(id));
this.IsResidentCredential = isResidentCredential;
this.RpId = rpId ?? throw new ArgumentNullException(nameof(rpId));
this.RpId = rpId;
this.PrivateKey = privateKey ?? throw new ArgumentNullException(nameof(privateKey));
this.userHandle = userHandle;
this.SignCount = signCount;
Expand All @@ -52,7 +52,7 @@ private Credential(byte[] id, bool isResidentCredential, string rpId, string pri
/// <param name="privateKey">The private Key for the credentials.</param>
/// <param name="signCount">The signature counter for the credentials.</param>
/// <returns>The created instance of the Credential class.</returns>
/// <exception cref="ArgumentNullException">If <paramref name="id"/>, <paramref name="rpId"/>, or <paramref name="privateKey"/> are <see langword="null"/>.</exception>
/// <exception cref="ArgumentNullException">If <paramref name="id"/> or <paramref name="privateKey"/> are <see langword="null"/>.</exception>
public static Credential CreateNonResidentCredential(byte[] id, string rpId, string privateKey, int signCount)
{
return new Credential(id, false, rpId, privateKey, null, signCount);
Expand All @@ -67,7 +67,7 @@ public static Credential CreateNonResidentCredential(byte[] id, string rpId, str
/// <param name="userHandle">The user handle associated to the credential.</param>
/// <param name="signCount">The signature counter for the credentials.</param>
/// <returns>The created instance of the Credential class.</returns>
/// <exception cref="ArgumentNullException">If <paramref name="id"/>, <paramref name="rpId"/>, or <paramref name="privateKey"/> are <see langword="null"/>.</exception>
/// <exception cref="ArgumentNullException">If <paramref name="id"/> or <paramref name="privateKey"/> are <see langword="null"/>.</exception>
public static Credential CreateResidentCredential(byte[] id, string rpId, string privateKey, byte[] userHandle, int signCount)
{
return new Credential(id, true, rpId, privateKey, userHandle, signCount);
Expand All @@ -86,7 +86,7 @@ public static Credential CreateResidentCredential(byte[] id, string rpId, string
/// <summary>
/// Gets the ID of the relying party of this credential.
/// </summary>
public string RpId { get; }
public string? RpId { get; }

/// <summary>
/// Gets the private key of the credential.
Expand Down
2 changes: 1 addition & 1 deletion dotnet/test/common/VirtualAuthn/VirtualAuthenticatorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ public void ShouldRemoveAllCredentials()
[IgnoreBrowser(Selenium.Browser.IE, "IE does not support Virtual Authenticator")]
[IgnoreBrowser(Selenium.Browser.Firefox, "Firefox does not support Virtual Authenticator")]
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Virtual Authenticator")]
public void testSetUserVerified()
public void TestSetUserVerified()
{
CreateRKEnabledCTAP2Authenticator();

Expand Down