Fix log messages that refer to the PrivateKeyCredential identifier as…

… a public key. (#274)
tmds · Dec 13, 2024 · f7b26e8 · f7b26e8
1 parent 6db835a
commit f7b26e8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/Tmds.Ssh/SshClientLogger.cs b/src/Tmds.Ssh/SshClientLogger.cs
@@ -211,20 +211,20 @@ Name compressionAlgorithmServerToClient
     [LoggerMessage(
         EventId = 22,
         Level = LogLevel.Information,
-        Message = "Public key '{KeyIdentifier}' not found.")]
-    public static partial void PublicKeyFileNotFound(this ILogger<SshClient> logger, string keyIdentifier);
+        Message = "Private key '{KeyIdentifier}' not found.")]
+    public static partial void PrivateKeyNotFound(this ILogger<SshClient> logger, string keyIdentifier);
 
     [LoggerMessage(
         EventId = 23,
         Level = LogLevel.Error,
-        Message = "Failed to load public key '{KeyIdentifier}'.")]
-    public static partial void PublicKeyCanNotLoad(this ILogger<SshClient> logger, string keyIdentifier, Exception exception);
+        Message = "Failed to load private key '{KeyIdentifier}'.")]
+    public static partial void PrivateKeyCanNotLoad(this ILogger<SshClient> logger, string keyIdentifier, Exception exception);
 
     [LoggerMessage(
         EventId = 24,
         Level = LogLevel.Information,
-        Message = "Public key '{KeyIdentifier}' has no accepted algorithms. Accepted algorithms: {AcceptedAlgorithms}")]
-    public static partial void PublicKeyAlgorithmsNotAccepted(this ILogger<SshClient> logger, string keyIdentifier, List<Name> acceptedAlgorithms);
+        Message = "Private key '{KeyIdentifier}' has no accepted algorithms. Accepted algorithms: {AcceptedAlgorithms}")]
+    public static partial void PrivateKeyAlgorithmsNotAccepted(this ILogger<SshClient> logger, string keyIdentifier, List<Name> acceptedAlgorithms);
 
     [LoggerMessage(
         EventId = 25,

diff --git a/src/Tmds.Ssh/UserAuthentication.PublicKeyAuth.cs b/src/Tmds.Ssh/UserAuthentication.PublicKeyAuth.cs
@@ -19,13 +19,13 @@ public static async Task<AuthResult> TryAuthenticate(PrivateKeyCredential keyCre
                 pk = await keyCredential.LoadKeyAsync(ct);
                 if (pk is null)
                 {
-                    logger.PublicKeyFileNotFound(keyCredential.Identifier);
+                    logger.PrivateKeyNotFound(keyCredential.Identifier);
                     return AuthResult.Failure;
                 }
             }
             catch (Exception error)
             {
-                logger.PublicKeyCanNotLoad(keyCredential.Identifier, error);
+                logger.PrivateKeyCanNotLoad(keyCredential.Identifier, error);
                 throw new PrivateKeyLoadException(keyCredential.Identifier, error);
             }
 
@@ -68,7 +68,7 @@ public static async Task<AuthResult> TryAuthenticate(PrivateKeyCredential keyCre
 
                 if (!acceptedAlgorithm)
                 {
-                    logger.PublicKeyAlgorithmsNotAccepted(keyCredential.Identifier, context.PublicKeyAcceptedAlgorithms);
+                    logger.PrivateKeyAlgorithmsNotAccepted(keyCredential.Identifier, context.PublicKeyAcceptedAlgorithms);
                 }
             }