Allow Exceptions in the session to be bubbled up by raising a Session…

…Faulted event. (cosullivan#107)
dosper7 · Jun 15, 2019 · 7712401 · 7712401
1 parent 60154eb
commit 7712401
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 27 deletions.
diff --git a/Src/SmtpServer/SessionFaultedEventArgs.cs b/Src/SmtpServer/SessionFaultedEventArgs.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace SmtpServer
+{
+    public class SessionFaultedEventArgs : SessionEventArgs
+    {
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="context">The session context.</param>
+        /// <param name="exception">The exception that occured</param>
+        public SessionFaultedEventArgs(ISessionContext context, Exception exception) : base(context)
+        {
+            Exception = exception;
+        }
+
+        /// <summary>
+        /// Returns the exception.
+        /// </summary>
+        public Exception Exception { get; }
+    }
+}
diff --git a/Src/SmtpServer/SmtpServer.cs b/Src/SmtpServer/SmtpServer.cs
@@ -19,6 +19,11 @@ public class SmtpServer
         /// </summary>
         public event EventHandler<SessionEventArgs> SessionCompleted;
 
+        /// <summary>
+        /// Raised when a session has faulted.
+        /// </summary>
+        public event EventHandler<SessionFaultedEventArgs> SessionFaulted;
+
         readonly ISmtpServerOptions _options;
 
         /// <summary>
@@ -48,6 +53,15 @@ protected virtual void OnSessionCompleted(SessionEventArgs args)
             SessionCompleted?.Invoke(this, args);
         }
 
+        /// <summary>
+        /// Raises the SessionCompleted Event.
+        /// </summary>
+        /// <param name="args">The event data.</param>
+        protected virtual void OnSessionFaulted(SessionFaultedEventArgs args)
+        {
+            SessionFaulted?.Invoke(this, args);
+        }
+
         /// <summary>
         /// Starts the SMTP server.
         /// </summary>
@@ -75,39 +89,52 @@ async Task ListenAsync(IEndpointDefinition endpointDefinition, CancellationToken
                 {
                     var sessionContext = new SmtpSessionContext(_options, endpointDefinition);
 
-                    // wait for a client connection
-                    var stream = await endpointListener.GetStreamAsync(sessionContext, cancellationToken).ConfigureAwait(false);
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    sessionContext.NetworkClient = new NetworkClient(stream, _options.NetworkBufferSize, _options.NetworkBufferReadTimeout);
-
-                    if (endpointDefinition.IsSecure && _options.ServerCertificate != null)
+                    try
                     {
-                        await sessionContext.NetworkClient.UpgradeAsync(_options.ServerCertificate, _options.SupportedSslProtocols, cancellationToken).ConfigureAwait(false);
+                        // wait for a client connection
+                        var stream = await endpointListener.GetStreamAsync(sessionContext, cancellationToken).ConfigureAwait(false);
                         cancellationToken.ThrowIfCancellationRequested();
-                    }
-
-                    // create a new session to handle the connection
-                    var session = new SmtpSession(sessionContext);
-                    sessions.TryAdd(session, session);
-
-                    OnSessionCreated(new SessionEventArgs(sessionContext));
 
-                    session.Run(cancellationToken);
+                        sessionContext.NetworkClient = new NetworkClient(stream, _options.NetworkBufferSize, _options.NetworkBufferReadTimeout);
 
-                    #pragma warning disable 4014
-                    session.Task
-                        .ContinueWith(t =>
+                        if (endpointDefinition.IsSecure && _options.ServerCertificate != null)
                         {
-                            if (sessions.TryRemove(session, out var s))
-                            {
-                                sessionContext.NetworkClient.Dispose();
-                            }
+                            await sessionContext.NetworkClient.UpgradeAsync(_options.ServerCertificate, _options.SupportedSslProtocols, cancellationToken).ConfigureAwait(false);
+                            cancellationToken.ThrowIfCancellationRequested();
+                        }
+
+                        // create a new session to handle the connection
+                        var session = new SmtpSession(sessionContext);
+                        sessions.TryAdd(session, session);
+
+                        OnSessionCreated(new SessionEventArgs(sessionContext));
 
-                            OnSessionCompleted(new SessionEventArgs(sessionContext));
-                        },
-                        cancellationToken);
-                    #pragma warning restore 4014
+                        session.Run(cancellationToken);
+
+                        #pragma warning disable 4014
+                        session.Task
+                            .ContinueWith(t =>
+                            {
+                                if (sessions.TryRemove(session, out var s))
+                                {
+                                    sessionContext.NetworkClient.Dispose();
+                                }
+
+                                if (t.Exception != null)
+                                {
+                                    OnSessionFaulted(new SessionFaultedEventArgs(sessionContext, t.Exception));
+                                }
+
+                                OnSessionCompleted(new SessionEventArgs(sessionContext));
+                            },
+                            cancellationToken);
+                        #pragma warning restore 4014
+                    }
+                    catch (OperationCanceledException) { }
+                    catch (Exception ex)
+                    {
+                        OnSessionFaulted(new SessionFaultedEventArgs(sessionContext, ex));
+                    }
                 }
 
                 // the server has been cancelled, wait for the tasks to complete

diff --git a/Src/SmtpServer/SmtpSession.cs b/Src/SmtpServer/SmtpSession.cs
@@ -38,6 +38,11 @@ public void Run(CancellationToken cancellationToken)
                 {
                     try
                     {
+                        if (t.Exception != null)
+                        {
+                            _taskCompletionSource.TrySetException(t.Exception.InnerExceptions);
+                        }
+
                         _taskCompletionSource.SetResult(t.IsCompleted);
                     }
                     catch
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,11 @@ public void Run(CancellationToken cancellationToken) @@
                     {
                         try
                         {
+                            if (t.Exception != null)
+                            {
+                                _taskCompletionSource.TrySetException(t.Exception.InnerExceptions);
+                            }
                             _taskCompletionSource.SetResult(t.IsCompleted);
                         }
                         catch
@@ Expand Down @@