Merge branch 'release/3.1.2'

Author: fubar-coder

FubarDev.FtpServer.sln

@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		PackageLibrary.props = PackageLibrary.props
 		README.md = README.md
 		stylecop.json = stylecop.json
+		DotNetSdkMono.props = DotNetSdkMono.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FubarDev.FtpServer.FileSystem.DotNet", "src\FubarDev.FtpServer.FileSystem.DotNet\FubarDev.FtpServer.FileSystem.DotNet.csproj", "{9A83C6F5-378B-48B3-B32A-151DB90B390C}"

samples/TestFtpServer/ServiceCollectionExtensions.cs

@@ -3,18 +3,13 @@
 // </copyright>
 
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 
 using FubarDev.FtpServer;
 using FubarDev.FtpServer.AccountManagement.Directories.RootPerUser;
 using FubarDev.FtpServer.AccountManagement.Directories.SingleRootWithoutHome;
-using FubarDev.FtpServer.Authentication;
 using FubarDev.FtpServer.CommandExtensions;
 using FubarDev.FtpServer.Commands;
 using FubarDev.FtpServer.FileSystem;
@@ -226,33 +221,6 @@ public static IServiceCollection AddFtpServices(
                     break;
             }
 
-            if (options.Ftps.Implicit)
-            {
-                var implicitFtpsCertificate = options.GetCertificate();
-                if (implicitFtpsCertificate != null)
-                {
-                    services
-                       .AddSingleton(new ImplicitFtpsControlConnectionStreamAdapterOptions(implicitFtpsCertificate))
-                       .AddSingleton<IFtpControlStreamAdapter, ImplicitFtpsControlConnectionStreamAdapter>();
-
-                    // Ensure that PROT and PBSZ commands are working.
-                    services.Decorate<IFtpServer>(
-                        (ftpServer, _) =>
-                        {
-                            ftpServer.ConfigureConnection += (s, e) =>
-                            {
-                                var serviceProvider = e.Connection.ConnectionServices;
-                                var stateMachine = serviceProvider.GetRequiredService<IFtpLoginStateMachine>();
-                                var authTlsMechanism = serviceProvider.GetRequiredService<IEnumerable<IAuthenticationMechanism>>()
-                                   .Single(x => x.CanHandle("TLS"));
-                                stateMachine.Activate(authTlsMechanism);
-                            };
-
-                            return ftpServer;
-                        });
-                }
-            }
-
 #if NETCOREAPP
             services.Decorate<IFtpServer>(
                 (ftpServer, serviceProvider) =>
@@ -302,6 +270,15 @@ private static IFtpServerBuilder ConfigureServer(this IFtpServerBuilder builder,
                    .EnableConnectionCheck();
             }
 
+            if (options.Ftps.Implicit)
+            {
+                var implicitFtpsCertificate = options.GetCertificate();
+                if (implicitFtpsCertificate != null)
+                {
+                    builder = builder.UseImplicitTls(implicitFtpsCertificate);
+                }
+            }
+
             return builder;
         }
 
@@ -329,41 +306,11 @@ private static UserCredential GetUserCredential(
             return credential;
         }
 
-        private class ImplicitFtpsControlConnectionStreamAdapterOptions
-        {
-            public ImplicitFtpsControlConnectionStreamAdapterOptions(X509Certificate2 certificate)
-            {
-                Certificate = certificate;
-            }
-
-            public X509Certificate2 Certificate { get; }
-        }
-
         private static TimeSpan? ToTimeSpan(int? seconds)
         {
             return seconds == null
                 ? (TimeSpan?)null
                 : TimeSpan.FromSeconds(seconds.Value);
         }
-
-        private class ImplicitFtpsControlConnectionStreamAdapter : IFtpControlStreamAdapter
-        {
-            private readonly ImplicitFtpsControlConnectionStreamAdapterOptions _options;
-            private readonly ISslStreamWrapperFactory _sslStreamWrapperFactory;
-
-            public ImplicitFtpsControlConnectionStreamAdapter(
-                ImplicitFtpsControlConnectionStreamAdapterOptions options,
-                ISslStreamWrapperFactory sslStreamWrapperFactory)
-            {
-                _options = options;
-                _sslStreamWrapperFactory = sslStreamWrapperFactory;
-            }
-
-            /// <inheritdoc />
-            public Task<Stream> WrapAsync(Stream stream, CancellationToken cancellationToken)
-            {
-                return _sslStreamWrapperFactory.WrapStreamAsync(stream, false, _options.Certificate, cancellationToken);
-            }
-        }
     }
 }

samples/TestFtpServer/appsettings.json

@@ -7,10 +7,13 @@
         "Microsoft": "Information",
         "FubarDev.FtpServer.CommandHandlers.ListCommandHandler": "Verbose",
         "FubarDev.FtpServer.CommandHandlers.MlstCommandHandler": "Verbose"
-      },
+      }
     },
      "WriteTo": [
-      { "Name": "Console" }
+      {
+        "Name": "Console",
+        "OutputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {ConnectionId} {Message:lj}{NewLine}{Exception}"
+      }
     ],
     "Enrich": ["FromLogContext"]
   },

src/FubarDev.FtpServer.Abstractions/IFtpConnectionConfigurator.cs

@@ -0,0 +1,23 @@
+// <copyright file="IFtpConnectionConfigurator.cs" company="Fubar Development Junker">
+// Copyright (c) Fubar Development Junker. All rights reserved.
+// </copyright>
+
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FubarDev.FtpServer
+{
+    /// <summary>
+    /// Interface for services that need to reconfigure the connection.
+    /// </summary>
+    public interface IFtpConnectionConfigurator
+    {
+        /// <summary>
+        /// Changes the connections configuration.
+        /// </summary>
+        /// <param name="connection">The FTP connection.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The task.</returns>
+        Task Configure(IFtpConnection connection, CancellationToken cancellationToken);
+    }
+}

src/FubarDev.FtpServer.Abstractions/IFtpServer.cs

@@ -14,12 +14,13 @@ public interface IFtpServer : IPausableFtpService
         /// <summary>
         /// This event is raised when the connection is ready to be configured.
         /// </summary>
-        event EventHandler<ConnectionEventArgs> ConfigureConnection;
+        [Obsolete("Register a service of type IFtpConnectionConfigurator instead.")]
+        event EventHandler<ConnectionEventArgs>? ConfigureConnection;
 
         /// <summary>
         /// This event is raised when the listener was started.
         /// </summary>
-        event EventHandler<ListenerStartedEventArgs> ListenerStarted;
+        event EventHandler<ListenerStartedEventArgs>? ListenerStarted;
 
         /// <summary>
         /// Gets the public IP address (required for <c>PASV</c> and <c>EPSV</c>).

src/FubarDev.FtpServer/AuthTlsOptions.cs

@@ -14,7 +14,7 @@ public class AuthTlsOptions
         /// <summary>
         /// Gets or sets the server certificate.
         /// </summary>
-        public X509Certificate2? ServerCertificate { get; set; }
+        public X509Certificate? ServerCertificate { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether implicit FTPS is used.

src/FubarDev.FtpServer/ConnectionHandlers/IFtpConnectionAdapter.cs

@@ -2,6 +2,9 @@
 // Copyright (c) Fubar Development Junker. All rights reserved.
 // </copyright>
 
+using System.Threading;
+using System.Threading.Tasks;
+
 namespace FubarDev.FtpServer.ConnectionHandlers
 {
     /// <summary>

src/FubarDev.FtpServer/ConnectionHandlers/IFtpSecureConnectionAdapter.cs

@@ -27,6 +27,6 @@ public interface IFtpSecureConnectionAdapter : IFtpConnectionAdapter
         /// <param name="certificate">The server certificate (with private key).</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The task.</returns>
-        Task EnableSslStreamAsync(X509Certificate2 certificate, CancellationToken cancellationToken);
+        Task EnableSslStreamAsync(X509Certificate certificate, CancellationToken cancellationToken);
     }
 }

src/FubarDev.FtpServer/ConnectionHandlers/PassThroughConnectionAdapter.cs

@@ -18,7 +18,7 @@ namespace FubarDev.FtpServer.ConnectionHandlers
     /// </summary>
     internal class PassThroughConnectionAdapter : IFtpConnectionAdapter
     {
-        private readonly IFtpService _transmitService;
+        private readonly IPausableFtpService _transmitService;
         private readonly IPausableFtpService _receiverService;
 
         /// <summary>
@@ -38,12 +38,12 @@ public PassThroughConnectionAdapter(
                 socketPipe.Input,
                 connectionPipe.Output,
                 connectionClosed,
-                loggerFactory?.CreateLogger(typeof(PassThroughConnectionAdapter).FullName + ":Receiver"));
+                loggerFactory?.CreateLogger(typeof(PassThroughConnectionAdapter).FullName + ".Receiver"));
             _transmitService = new NonClosingNetworkPassThrough(
                 connectionPipe.Input,
                 socketPipe.Output,
                 connectionClosed,
-                loggerFactory?.CreateLogger(typeof(PassThroughConnectionAdapter).FullName + ":Transmitter"));
+                loggerFactory?.CreateLogger(typeof(PassThroughConnectionAdapter).FullName + ".Transmitter"));
         }
 
         /// <inheritdoc />

src/FubarDev.FtpServer/ConnectionHandlers/SecureConnectionAdapter.cs

@@ -74,7 +74,7 @@ await StartAsync(cancellationToken)
         }
 
         /// <inheritdoc />
-        public async Task EnableSslStreamAsync(X509Certificate2 certificate, CancellationToken cancellationToken)
+        public async Task EnableSslStreamAsync(X509Certificate certificate, CancellationToken cancellationToken)
         {
             await StopAsync(cancellationToken)
                .ConfigureAwait(false);