dotnet format (passwordless-lib#425)

* Added pragmas * dotnet format * Disabled var_elsewhere * Adding dotnet format to pipeline * Added command to mac/linux too * Remove format from windows because of changes to csproj?
carbon · Aug 25, 2023 · 6655af9 · 6655af9
1 parent 2b0fe71
commit 6655af9
Show file tree

Hide file tree

Showing 83 changed files with 439 additions and 400 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -60,7 +60,7 @@ dotnet_style_explicit_tuple_names = true:suggestion
 [*.cs]
 # Prefer "var" when the type is apparent on the right side of the assignment; otherwise, avoid it.
 csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_elsewhere = false:none
 
 # Prefer method-like constructs to have a block body
 csharp_style_expression_bodied_methods = false:none

diff --git a/BlazorWasmDemo/Client/Shared/UserService.cs b/BlazorWasmDemo/Client/Shared/UserService.cs
@@ -14,7 +14,7 @@ public class UserService
     private const string _routeRegister = "credential";
     private const string _routeAssertionOpts = "assertion-options";
     private const string _routeLogin = "assertion";
-    
+
     private readonly JsonSerializerOptions _jsonOptions = new FidoBlazorSerializerContext().Options;
     private readonly HttpClient _httpClient;
     private readonly WebAuthn _webAuthn;
@@ -103,7 +103,7 @@ public async Task<string> RegisterAsync(string? username, string? displayName =
         {
             Console.WriteLine(e);
             var errorMessage = e.Message;
-            if(options.ExcludeCredentials?.Count > 0)
+            if (options.ExcludeCredentials?.Count > 0)
             {
                 errorMessage += " (You may have already registered this device)";
             }

diff --git a/BlazorWasmDemo/Server/Controllers/UserController.cs b/BlazorWasmDemo/Server/Controllers/UserController.cs
@@ -213,16 +213,16 @@ public AssertionOptions MakeAssertionOptions([FromRoute] string? username, [From
 
             var exts = new AuthenticationExtensionsClientInputs()
             {
-                    UserVerificationMethod = true,
-                    Extensions = true,
-                    DevicePubKey = new AuthenticationExtensionsDevicePublicKeyInputs()
+                UserVerificationMethod = true,
+                Extensions = true,
+                DevicePubKey = new AuthenticationExtensionsDevicePublicKeyInputs()
             };
 
-        // 2. Create options (usernameless users will be prompted by their device to select a credential from their own list)
-        var options = _fido2.GetAssertionOptions(
-            existingKeys,
-            userVerification ?? UserVerificationRequirement.Discouraged, 
-            exts);
+            // 2. Create options (usernameless users will be prompted by their device to select a credential from their own list)
+            var options = _fido2.GetAssertionOptions(
+                existingKeys,
+                userVerification ?? UserVerificationRequirement.Discouraged,
+                exts);
 
             // 4. Temporarily store options, session/in-memory cache/redis/db
             _pendingAssertions[new string(options.Challenge.Select(b => (char)b).ToArray())] = options;
@@ -300,7 +300,7 @@ public async Task<string> MakeAssertionAsync([FromBody] AuthenticatorAssertionRa
             var token = handler.CreateEncodedJwt(
                 HttpContext.Request.Host.Host,
                 HttpContext.Request.Headers.Referer,
-                new ClaimsIdentity(new Claim[]{new(ClaimTypes.Actor, Encoding.UTF8.GetString(creds.UserHandle))}),
+                new ClaimsIdentity(new Claim[] { new(ClaimTypes.Actor, Encoding.UTF8.GetString(creds.UserHandle)) }),
                 DateTime.Now.Subtract(TimeSpan.FromMinutes(1)),
                 DateTime.Now.AddDays(1),
                 DateTime.Now,

diff --git a/Demo/ConformanceTesting.cs b/Demo/ConformanceTesting.cs
@@ -6,7 +6,7 @@ namespace Fido2Demo;
 
 public static class ConformanceTesting
 {
-    private static readonly object _syncRoot = new ();
+    private static readonly object _syncRoot = new();
 
     private static IMetadataService _instance;
 

diff --git a/Demo/Pages/_options.cshtml.cs b/Demo/Pages/_options.cshtml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -13,4 +13,4 @@ public void OnGet()
         {
         }
     }
-}
+}
diff --git a/Demo/TestController.cs b/Demo/TestController.cs
@@ -17,7 +17,7 @@ namespace Fido2Demo;
 public class TestController : Controller
 {
     /* CONFORMANCE TESTING ENDPOINTS */
-    private static readonly DevelopmentInMemoryStore _demoStorage = new ();
+    private static readonly DevelopmentInMemoryStore _demoStorage = new();
 
     private readonly IFido2 _fido2;
     private readonly string _origin;
@@ -31,7 +31,7 @@ public TestController(IOptions<Fido2Configuration> fido2Configuration)
             ServerDomain = fido2Configuration.Value.ServerDomain,
             ServerName = fido2Configuration.Value.ServerName,
             Origins = fido2Configuration.Value.FullyQualifiedOrigins,
-        }, 
+        },
         ConformanceTesting.MetadataServiceInstance(
             System.IO.Path.Combine(fido2Configuration.Value.MDSCacheDirPath, @"Conformance"), _origin)
         );
@@ -130,7 +130,7 @@ public IActionResult AssertionOptionsTest([FromBody] TEST_AssertionClientParams
             uv = assertionClientParams.authenticatorSelection.UserVerification;
 
         var exts = new AuthenticationExtensionsClientInputs
-        { 
+        {
             AppID = _origin,
             UserVerificationMethod = true
         };

diff --git a/Src/Fido2.AspNet/DistributedCacheMetadataService.cs b/Src/Fido2.AspNet/DistributedCacheMetadataService.cs
@@ -76,7 +76,8 @@ protected virtual DateTimeOffset GetMemoryCacheAbsoluteExpiryTime(DateTimeOffset
         var expiryTime = _systemClock.UtcNow.GetNextIncrement(_defaultMemoryCacheInterval);
 
         //Ensure that memory cache expiry time never exceeds the next update time from the service
-        if(nextUpdateTime.HasValue && expiryTime > nextUpdateTime.Value) expiryTime = nextUpdateTime.Value;
+        if (nextUpdateTime.HasValue && expiryTime > nextUpdateTime.Value)
+            expiryTime = nextUpdateTime.Value;
 
         return expiryTime;
     }
@@ -98,7 +99,7 @@ protected virtual async Task<MetadataBLOBPayload> GetRepositoryPayloadWithErrorH
         {
             return await repository.GetBLOBAsync(cancellationToken);
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
             _logger.LogError(ex, "Could not fetch metadata from {0}", repository.GetType().Name);
             return null;
@@ -113,7 +114,7 @@ await _distributedCache.SetStringAsync(
             new DistributedCacheEntryOptions()
             {
                 AbsoluteExpiration = GetDistributedCacheAbsoluteExpiryTime(GetNextUpdateTimeFromPayload(payload))
-            }, 
+            },
             cancellationToken);
     }
 
@@ -165,7 +166,7 @@ protected virtual async Task<MetadataBLOBPayload> GetMemoryCachedPayload(IMetada
         {
             var distributedCacheBlob = await GetDistributedCachedBlob(repository, cancellationToken);
 
-            if(distributedCacheBlob != null)
+            if (distributedCacheBlob != null)
             {
                 var nextUpdateTime = GetNextUpdateTimeFromPayload(distributedCacheBlob);
 

diff --git a/Src/Fido2.AspNet/Fido2NetLibBuilderExtensions.cs b/Src/Fido2.AspNet/Fido2NetLibBuilderExtensions.cs
@@ -62,7 +62,7 @@ public static IFido2MetadataServiceBuilder AddFileSystemMetadataRepository(this
 
     public static IFido2MetadataServiceBuilder AddConformanceMetadataRepository(
         this IFido2MetadataServiceBuilder builder,
-        HttpClient client = null, 
+        HttpClient client = null,
         string origin = "")
     {
         builder.Services.AddTransient<IMetadataRepository>(provider =>
@@ -77,7 +77,8 @@ public static IFido2MetadataServiceBuilder AddFidoMetadataRepository(this IFido2
     {
         var httpClientBuilder = builder.Services.AddHttpClient(nameof(Fido2MetadataServiceRepository));
 
-        if(clientBuilder != null) clientBuilder(httpClientBuilder);
+        if (clientBuilder != null)
+            clientBuilder(httpClientBuilder);
 
         builder.Services.AddTransient<IMetadataRepository, Fido2MetadataServiceRepository>();
 

diff --git a/Src/Fido2.Ctap2/Commands/AuthenticatorClientPinCommand.cs b/Src/Fido2.Ctap2/Commands/AuthenticatorClientPinCommand.cs
@@ -13,12 +13,12 @@ public AuthenticatorClientPinCommand(
         byte[]? newPinEnc = null,
         byte[]? pinHashEnc = null)
     {
-        
+
         PinProtocol = pinProtocol;
         SubCommand = subCommand;
         KeyAgreement = keyAgreement;
         PinAuth = pinAuth;
-        NewPinEnc = newPinEnc; 
+        NewPinEnc = newPinEnc;
         PinHashEnc = pinHashEnc;
     }
 
@@ -96,6 +96,7 @@ public AuthenticatorClientPinCommand(
 
 public enum AuthenticatorClientPinSubCommand
 {
+    #pragma warning disable format
     GetRetries      = 0x01,
     GetKeyAgreement = 0x02,
     SetPin          = 0x03,

diff --git a/Src/Fido2.Ctap2/Commands/AuthenticatorGetAssertionCommand.cs b/Src/Fido2.Ctap2/Commands/AuthenticatorGetAssertionCommand.cs
@@ -6,7 +6,7 @@ namespace Fido2NetLib.Ctap2;
 public sealed class AuthenticatorGetAssertionCommand : CtapCommand
 {
     public AuthenticatorGetAssertionCommand(
-        string rpId, 
+        string rpId,
         byte[] clientDataHash,
         PublicKeyCredentialDescriptor[] allowList,
         CborMap? extensions = null,

diff --git a/Src/Fido2.Ctap2/Commands/AuthenticatorMakeCredentialCommand.cs b/Src/Fido2.Ctap2/Commands/AuthenticatorMakeCredentialCommand.cs
@@ -83,7 +83,7 @@ public AuthenticatorMakeCredentialCommand(
         };
 
         var pubKeyCredParams = new CborArray();
-        
+
         foreach (PubKeyCredParam pubKeyCredParam in PubKeyCredParams)
         {
             pubKeyCredParams.Add(pubKeyCredParam.ToCborObject());

diff --git a/Src/Fido2.Ctap2/Commands/CtapCommand.cs b/Src/Fido2.Ctap2/Commands/CtapCommand.cs
@@ -16,7 +16,7 @@ public byte[] GetPayload()
         {
             return new byte[] { (byte)Type };
         }
-    
+
         var encodedObject = parameters.Encode();
 
         var result = new byte[encodedObject.Length + 1];
@@ -25,6 +25,6 @@ public byte[] GetPayload()
 
         encodedObject.AsSpan().CopyTo(result.AsSpan(1));
 
-        return result;      
+        return result;
     }
 }
diff --git a/Src/Fido2.Ctap2/Commands/CtapCommandType.cs b/Src/Fido2.Ctap2/Commands/CtapCommandType.cs
@@ -1,5 +1,6 @@
 namespace Fido2NetLib.Ctap2;
 
+#pragma warning disable format
 public enum CtapCommandType : byte
 {
     //                            | value    | has parameters

diff --git a/Src/Fido2.Ctap2/Devices/FidoAuthenticator.cs b/Src/Fido2.Ctap2/Devices/FidoAuthenticator.cs
@@ -32,7 +32,7 @@ public async ValueTask<AuthenticatorGetInfoResponse> GetInfoAsync()
 
         return AuthenticatorGetInfoResponse.FromCborObject(result.GetCborObject());
     }
-     
+
 
     public async ValueTask<AuthenticatorClientPinResponse> ExecuteClientPinCommandAsync(AuthenticatorClientPinCommand command)
     {
@@ -87,14 +87,14 @@ public async ValueTask SetNewPinAsync(string newPinUnicode, CredentialPublicKey
         byte[] newPinEnc = CryptoHelper.AesCbcDefaultIvNoPadding(sharedSecret, CryptoHelper.ZeroPadRight(newPin, 64));
 
         // LEFT(HMAC-SHA-256(sharedSecret, newPinEnc), 16)
-        var pinAuth = HMACSHA256.HashData(sharedSecret, newPinEnc).AsSpan(0, 16).ToArray(); 
+        var pinAuth = HMACSHA256.HashData(sharedSecret, newPinEnc).AsSpan(0, 16).ToArray();
 
         var command = new AuthenticatorClientPinCommand(
-            pinProtocol  : 0x01, 
-            subCommand   : AuthenticatorClientPinSubCommand.SetPin,
-            keyAgreement : platformKey,
-            pinAuth      : pinAuth,
-            newPinEnc    : newPinEnc
+            pinProtocol: 0x01,
+            subCommand: AuthenticatorClientPinSubCommand.SetPin,
+            keyAgreement: platformKey,
+            pinAuth: pinAuth,
+            newPinEnc: newPinEnc
         );
 
         _ = await ExecuteClientPinCommandAsync(command).ConfigureAwait(false);
@@ -122,15 +122,15 @@ public async ValueTask ChangePinAsync(string curPinUnicode, string newPinUnicode
         byte[] pinAuth = HMACSHA256.HashData(sharedSecret, newPinEnc).AsSpan(0, 16).ToArray();
 
         var command = new AuthenticatorClientPinCommand(
-            pinProtocol  : 0x01,
-            subCommand   : AuthenticatorClientPinSubCommand.ChangePin,
-            keyAgreement : platformKey,
-            pinAuth      : pinAuth,
-            newPinEnc    : newPinEnc,
-            pinHashEnc   : pinHashEnc
+            pinProtocol: 0x01,
+            subCommand: AuthenticatorClientPinSubCommand.ChangePin,
+            keyAgreement: platformKey,
+            pinAuth: pinAuth,
+            newPinEnc: newPinEnc,
+            pinHashEnc: pinHashEnc
         );
 
-        _= await ExecuteClientPinCommandAsync(command).ConfigureAwait(false);
+        _ = await ExecuteClientPinCommandAsync(command).ConfigureAwait(false);
     }
 
     public async ValueTask<byte[]> GetPinTokenAsync(string pin, CredentialPublicKey platformKey, byte[] sharedSecret)
@@ -143,10 +143,10 @@ public async ValueTask<byte[]> GetPinTokenAsync(string pin, CredentialPublicKey
         byte[] pinHashEnc = CryptoHelper.AesCbcDefaultIvNoPadding(sharedSecret, SHA256.HashData(curPin).AsSpan(0, 16));
 
         var command = new AuthenticatorClientPinCommand(
-            pinProtocol  : 0x01,
-            subCommand   : AuthenticatorClientPinSubCommand.GetPinToken,
-            keyAgreement : platformKey,
-            pinHashEnc   : pinHashEnc
+            pinProtocol: 0x01,
+            subCommand: AuthenticatorClientPinSubCommand.GetPinToken,
+            keyAgreement: platformKey,
+            pinHashEnc: pinHashEnc
         );
 
         var result = await ExecuteClientPinCommandAsync(command).ConfigureAwait(false);

diff --git a/Src/Fido2.Ctap2/Extensions/PubKeyCredParamExtensions.cs b/Src/Fido2.Ctap2/Extensions/PubKeyCredParamExtensions.cs
@@ -19,6 +19,7 @@ public static class AuthenticatorTransportExtensions
 {
     public static string Canonicalize(this AuthenticatorTransport value)
     {
+        #pragma warning disable format
         return value switch
         {
             AuthenticatorTransport.Usb      => "usb",
@@ -27,5 +28,6 @@ public static string Canonicalize(this AuthenticatorTransport value)
             AuthenticatorTransport.Internal => "internal",
             _                               => value.ToString()
         };
+        #pragma warning restore format
     }
 }
diff --git a/Src/Fido2.Ctap2/Extensions/PublicKeyCredentialRpEntityExtensions.cs b/Src/Fido2.Ctap2/Extensions/PublicKeyCredentialRpEntityExtensions.cs
@@ -14,7 +14,7 @@ public static CborMap ToCborObject(this PublicKeyCredentialRpEntity rp)
         if (rp.Icon is string icon)
         {
             result.Add("icon", icon);
-        }      
+        }
 
         return result;
     }

diff --git a/Src/Fido2.Ctap2/Helpers/CryptoHelper.cs b/Src/Fido2.Ctap2/Helpers/CryptoHelper.cs
@@ -17,7 +17,7 @@ internal static byte[] AesCbcDefaultIvNoPadding(byte[] key, ReadOnlySpan<byte> d
         // AES256-CBC(sharedSecret, IV = 0, data).
         return aes.EncryptCbc(data, iv: DefaultIV, PaddingMode.None);
     }
-     
+
     public static byte[] GenerateSharedSecret(CredentialPublicKey authenticatorKeyAgreementKey, out CredentialPublicKey platformKeyAgreementKey)
     {
         using var authenticatorKey = authenticatorKeyAgreementKey.CreateECDsa(); // public key

diff --git a/Src/Fido2.Ctap2/Responses/AuthenticatorGetInfoResponse.cs b/Src/Fido2.Ctap2/Responses/AuthenticatorGetInfoResponse.cs
@@ -24,7 +24,7 @@ public sealed class AuthenticatorGetInfoResponse
     /// </summary>
     [CborMember(0x03)]
     public byte[] Aaguid { get; set; }
-    
+
     /// <summary>
     /// List of supported options.
     /// </summary>

diff --git a/Src/Fido2.Ctap2/Responses/AuthenticatorMakeCredentialResponse.cs b/Src/Fido2.Ctap2/Responses/AuthenticatorMakeCredentialResponse.cs
@@ -46,11 +46,13 @@ public static AuthenticatorMakeCredentialResponse FromCborObject(CborObject cbor
         {
             switch ((int)key)
             {
+                #pragma warning disable format                
                 case 0x01: result.Fmt          = (string)value;  break;
                 case 0x02: result.AuthData     = (byte[])value;  break;
                 case 0x03: result.AttStmt      = (CborMap)value; break;
                 case 0x04: result.EpAtt        = (bool)value;    break;
                 case 0x05: result.LargeBlobKey = (byte[])value;  break;
+                #pragma warning restore format
             }
         }
 

diff --git a/Src/Fido2.Ctap2/Responses/CtapStatusCode.cs b/Src/Fido2.Ctap2/Responses/CtapStatusCode.cs
@@ -1,5 +1,6 @@
 namespace Fido2NetLib.Ctap2;
 
+#pragma warning disable format
 public enum CtapStatusCode
 {
     OK                              = 0x00, // Indicates successful response

diff --git a/Src/Fido2.Ctap2/Responses/NegotiateSharedSecretResult.cs b/Src/Fido2.Ctap2/Responses/NegotiateSharedSecretResult.cs
@@ -5,8 +5,8 @@ namespace Fido2NetLib.Ctap2;
 public sealed class NegotiateSharedSecretResult
 {
     public NegotiateSharedSecretResult(
-        CredentialPublicKey authenticatorKey, 
-        CredentialPublicKey platformKey, 
+        CredentialPublicKey authenticatorKey,
+        CredentialPublicKey platformKey,
         byte[] sharedShared)
     {
         ArgumentNullException.ThrowIfNull(authenticatorKey);
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,7 +83,7 @@ public AuthenticatorMakeCredentialCommand( @@
             };
             var pubKeyCredParams = new CborArray();
             foreach (PubKeyCredParam pubKeyCredParam in PubKeyCredParams)
             {
                 pubKeyCredParams.Add(pubKeyCredParam.ToCborObject());
@@ Expand Down @@