Merge branch 'feature/connection-feature-collection' into release/3.0

Author: fubar-coder

FubarDev.FtpServer.sln.DotSettings

@@ -40,6 +40,7 @@ Copyright (c) Fubar Development Junker. All rights reserved.
 	<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=UNION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=UNION_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IAC/@EntryIndexedValue">IAC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IO/@EntryIndexedValue">IO</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PAM/@EntryIndexedValue">PAM</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
@@ -89,5 +90,7 @@ Copyright (c) Fubar Development Junker. All rights reserved.&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=abortable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Fubar/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=NLST/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=PASV/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

samples/TestFtpServer/Program.cs

@@ -16,6 +16,7 @@
 using FubarDev.FtpServer.AccountManagement.Directories.RootPerUser;
 using FubarDev.FtpServer.AccountManagement.Directories.SingleRootWithoutHome;
 using FubarDev.FtpServer.Authentication;
+using FubarDev.FtpServer.Features;
 using FubarDev.FtpServer.FileSystem;
 using FubarDev.FtpServer.FileSystem.DotNet;
 using FubarDev.FtpServer.FileSystem.GoogleDrive;
@@ -120,6 +121,7 @@ private static int Main(string[] args)
                         options.PassivePortRange = (iPorts[0], iPorts[1]) ;
                     }
                 },
+                { "promiscuous", "Allows promiscuous PASV", v => options.PromiscuousPasv = v != null },
                 "FTPS",
                 { "c|certificate=", "Set the SSL certificate", v => options.ServerCertificateFile = v },
                 { "P|password=", "Password for the SSL certificate", v => options.ServerCertificatePassword = v },
@@ -314,6 +316,7 @@ private static IServiceCollection CreateServices(TestFtpServerOptions options)
                             opt.PasvMaxPort = options.PassivePortRange.Value.Item2;
                         }
                     })
+               .Configure<PasvCommandOptions>(opt => opt.PromiscuousPasv = options.PromiscuousPasv)
                .Configure<GoogleDriveOptions>(opt => opt.UseBackgroundUpload = options.UseBackgroundUpload)
                .Configure<PamMembershipProviderOptions>(opt => opt.IgnoreAccountManagement = options.NoPamAccountManagement);
 
@@ -354,13 +357,14 @@ private static IServiceCollection CreateServices(TestFtpServerOptions options)
                         // Use an implicit SSL connection (without the AUTHTLS command)
                         ftpServer.ConfigureConnection += (s, e) =>
                         {
+                            var secureConnectionFeature = e.Connection.Features.Get<ISecureConnectionFeature>();
                             var sslStream = sslStreamWrapperFactory.WrapStreamAsync(
-                                    e.Connection.OriginalStream,
+                                    secureConnectionFeature.OriginalStream,
                                     false,
                                     authTlsOptions.Value.ServerCertificate,
                                     CancellationToken.None)
                                .Result;
-                            e.Connection.SocketStream = sslStream;
+                            secureConnectionFeature.SocketStream = sslStream;
                         };
 
                         return ftpServer;

samples/TestFtpServer/TestFtpServerOptions.cs

@@ -81,6 +81,15 @@ public class TestFtpServerOptions
         /// </summary>
         public DirectoryLayout DirectoryLayout { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to accept PASV connections from any source.
+        /// </summary>
+        /// <remarks>
+        /// If false (default), connections to a PASV port will only be accepted from the same IP that issued
+        /// the respective PASV command.
+        /// </remarks>
+        public bool PromiscuousPasv { get; set; }
+
         /// <summary>
         /// Gets the requested or the default port.
         /// </summary>

src/FubarDev.FtpServer.Abstractions/Authentication/AuthenticationMechanism.cs

@@ -5,6 +5,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 
+using FubarDev.FtpServer.Features;
+
 using JetBrains.Annotations;
 
 namespace FubarDev.FtpServer.Authentication
@@ -54,7 +56,7 @@ protected AuthenticationMechanism([NotNull] IFtpConnection connection)
         /// <returns>The translated message.</returns>
         protected string T(string message)
         {
-            return Connection.Data.Catalog.GetString(message);
+            return Connection.Features.Get<ILocalizationFeature>().Catalog.GetString(message);
         }
 
         /// <summary>
@@ -66,7 +68,7 @@ protected string T(string message)
         [StringFormatMethod("message")]
         protected string T(string message, params object[] args)
         {
-            return Connection.Data.Catalog.GetString(message, args);
+            return Connection.Features.Get<ILocalizationFeature>().Catalog.GetString(message, args);
         }
     }
 }

src/FubarDev.FtpServer.Abstractions/Authorization/Actions/FillConnectionAccountDataAction.cs

@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 
 using FubarDev.FtpServer.AccountManagement;
+using FubarDev.FtpServer.Features;
 
 using JetBrains.Annotations;
 
@@ -37,7 +38,7 @@ public Task AuthorizedAsync(IAccountInformation accountInformation, Cancellation
         {
             var connection = _ftpConnectionAccessor.FtpConnection;
 
-            connection.Data.User = accountInformation.User;
+            connection.Features.Get<IAuthorizationInformationFeature>().User = accountInformation.User;
 
 #pragma warning disable 618
             connection.Data.IsAnonymous = accountInformation.User is IAnonymousFtpUser;

src/FubarDev.FtpServer.Abstractions/Authorization/Actions/FillConnectionFileSystemDataAction.cs

@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 
 using FubarDev.FtpServer.AccountManagement;
+using FubarDev.FtpServer.Features;
 using FubarDev.FtpServer.FileSystem;
 
 using JetBrains.Annotations;
@@ -45,11 +46,12 @@ public async Task AuthorizedAsync(IAccountInformation accountInformation, Cancel
         {
             var connection = _ftpConnectionAccessor.FtpConnection;
 
-            connection.Data.FileSystem = await _fileSystemFactory
+            var fsFeature = connection.Features.Get<IFileSystemFeature>();
+            fsFeature.FileSystem = await _fileSystemFactory
                .Create(accountInformation)
                .ConfigureAwait(false);
 
-            connection.Data.Path = new Stack<IUnixDirectoryEntry>();
+            fsFeature.Path = new Stack<IUnixDirectoryEntry>();
         }
     }
 }

src/FubarDev.FtpServer.Abstractions/Authorization/Actions/SetHomeDirectoryAction.cs

@@ -6,6 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
+using FubarDev.FtpServer.Features;
 using FubarDev.FtpServer.FileSystem;
 
 using JetBrains.Annotations;
@@ -57,7 +58,8 @@ public SetHomeDirectoryAction(
         public async Task AuthorizedAsync(IAccountInformation accountInformation, CancellationToken cancellationToken)
         {
             var connection = _ftpConnectionAccessor.FtpConnection;
-            var fileSystem = connection.Data.FileSystem;
+            var fsFeature = connection.Features.Get<IFileSystemFeature>();
+            var fileSystem = fsFeature.FileSystem;
             var directories = _accountDirectoryQuery.GetDirectories(accountInformation);
             Stack<IUnixDirectoryEntry> path = null;
             if (!string.IsNullOrEmpty(directories.HomePath))
@@ -92,7 +94,7 @@ public async Task AuthorizedAsync(IAccountInformation accountInformation, Cancel
                 }
             }
 
-            connection.Data.Path = path ?? new Stack<IUnixDirectoryEntry>();
+            fsFeature.Path = path ?? new Stack<IUnixDirectoryEntry>();
         }
     }
 }

src/FubarDev.FtpServer.Abstractions/Authorization/AuthorizationMechanism.cs

@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 
 using FubarDev.FtpServer.Authentication;
+using FubarDev.FtpServer.Features;
 
 using JetBrains.Annotations;
 
@@ -50,7 +51,7 @@ protected AuthorizationMechanism([NotNull] IFtpConnection connection)
         /// <returns>The translated message.</returns>
         protected string T(string message)
         {
-            return Connection.Data.Catalog.GetString(message);
+            return Connection.Features.Get<ILocalizationFeature>().Catalog.GetString(message);
         }
 
         /// <summary>
@@ -62,7 +63,7 @@ protected string T(string message)
         [StringFormatMethod("message")]
         protected string T(string message, params object[] args)
         {
-            return Connection.Data.Catalog.GetString(message, args);
+            return Connection.Features.Get<ILocalizationFeature>().Catalog.GetString(message, args);
         }
     }
 }

src/FubarDev.FtpServer.Abstractions/Authorization/PasswordAuthorization.cs

@@ -10,6 +10,7 @@
 
 using FubarDev.FtpServer.AccountManagement;
 using FubarDev.FtpServer.Authentication;
+using FubarDev.FtpServer.Features;
 
 using JetBrains.Annotations;
 
@@ -91,7 +92,7 @@ public override Task<IFtpResponse> HandleUserAsync(string userIdentifier, Cancel
             _userName = userIdentifier;
             _needsPassword = true;
 
-            Connection.Data.User = new UnauthenticatedUser(userIdentifier);
+            Connection.Features.Get<IAuthorizationInformationFeature>().User = new UnauthenticatedUser(userIdentifier);
 
             return Task.FromResult<IFtpResponse>(new FtpResponse(331, T("User {0} logged in, needs password", userIdentifier)));
         }

src/FubarDev.FtpServer.Abstractions/CommandExtensions/FtpCommandHandlerExtensionAttribute.cs

@@ -0,0 +1,59 @@
+// <copyright file="FtpCommandHandlerExtensionAttribute.cs" company="Fubar Development Junker">
+// Copyright (c) Fubar Development Junker. All rights reserved.
+// </copyright>
+
+using System;
+
+using JetBrains.Annotations;
+
+namespace FubarDev.FtpServer.CommandExtensions
+{
+    /// <summary>
+    /// Marks a class as being an FTP command handler extension.
+    /// </summary>
+    /// <remarks>
+    /// The class must implement <see cref="IFtpCommandHandlerExtension"/>.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+    public class FtpCommandHandlerExtensionAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FtpCommandHandlerExtensionAttribute"/> class.
+        /// </summary>
+        /// <param name="name">The name of the FTP command this handler accepts.</param>
+        /// <param name="extensionOf">The na of the FTP command this extension belongs to.</param>
+        public FtpCommandHandlerExtensionAttribute([NotNull] string name, [NotNull] string extensionOf)
+        {
+            Name = name;
+            ExtensionOf = extensionOf;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FtpCommandHandlerExtensionAttribute"/> class.
+        /// </summary>
+        /// <param name="name">The name of the FTP command this handler accepts.</param>
+        /// <param name="extensionOf">The na of the FTP command this extension belongs to.</param>
+        /// <param name="isLoginRequired">Indicates whether this command is abortable.</param>
+        public FtpCommandHandlerExtensionAttribute([NotNull] string name, [NotNull] string extensionOf, bool isLoginRequired)
+        {
+            Name = name;
+            ExtensionOf = extensionOf;
+            IsLoginRequired = isLoginRequired;
+        }
+
+        /// <summary>
+        /// Gets the name of the FTP command extension.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether a login is required to execute this command.
+        /// </summary>
+        public bool? IsLoginRequired { get; }
+
+        /// <summary>
+        /// Gets the name of the FTP command this extension belongs to.
+        /// </summary>
+        public string ExtensionOf { get; }
+    }
+}