Fixed SmtpClient to disconnect during Authenticate/Async on socket er…

…rors
jstedfast · Jan 15, 2024 · d5770f9 · d5770f9
1 parent cb86726
commit d5770f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/MailKit/Net/Smtp/AsyncSmtpClient.cs b/MailKit/Net/Smtp/AsyncSmtpClient.cs
@@ -234,6 +234,9 @@ public override async Task AuthenticateAsync (SaslMechanism mechanism, Cancellat
 					response = await Stream.SendCommandAsync ("\r\n", cancellationToken).ConfigureAwait (false);
 					saslException = ex;
 				}
+			} catch {
+				Disconnect (uri.Host, uri.Port, GetSecureSocketOptions (uri), false);
+				throw;
 			} finally {
 				detector.IsAuthenticating = false;
 			}
@@ -367,6 +370,9 @@ public override async Task AuthenticateAsync (Encoding encoding, ICredentials cr
 						response = await Stream.SendCommandAsync ("\r\n", cancellationToken).ConfigureAwait (false);
 						saslException = ex;
 					}
+				} catch {
+					Disconnect (uri.Host, uri.Port, GetSecureSocketOptions (uri), false);
+					throw;
 				} finally {
 					detector.IsAuthenticating = false;
 				}

diff --git a/MailKit/Net/Smtp/SmtpClient.cs b/MailKit/Net/Smtp/SmtpClient.cs
@@ -990,6 +990,9 @@ public override void Authenticate (SaslMechanism mechanism, CancellationToken ca
 					response = Stream.SendCommand ("\r\n", cancellationToken);
 					saslException = ex;
 				}
+			} catch {
+				Disconnect (uri.Host, uri.Port, GetSecureSocketOptions (uri), false);
+				throw;
 			} finally {
 				detector.IsAuthenticating = false;
 			}
@@ -1142,6 +1145,9 @@ public override void Authenticate (Encoding encoding, ICredentials credentials,
 						response = Stream.SendCommand ("\r\n", cancellationToken);
 						saslException = ex;
 					}
+				} catch {
+					Disconnect (uri.Host, uri.Port, GetSecureSocketOptions (uri), false);
+					throw;
 				} finally {
 					detector.IsAuthenticating = false;
 				}