Fix(?) for issue #82

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}"

src/FubarDev.FtpServer/ConnectionHandlers/IFtpConnectionAdapter.cs

@@ -24,12 +24,5 @@ public interface IFtpConnectionAdapter : IFtpService
         /// Gets the pausable receiver for this connection adapter.
         /// </summary>
         IPausableFtpService Receiver { get; }
-
-        /// <summary>
-        /// Writes all pending data to the output.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The task.</returns>
-        Task FlushAsync(CancellationToken cancellationToken);
     }
 }

src/FubarDev.FtpServer/ConnectionHandlers/PassThroughConnectionAdapter.cs

@@ -52,13 +52,6 @@ public PassThroughConnectionAdapter(
         /// <inheritdoc />
         public IPausableFtpService Receiver => _receiverService;
 
-        /// <inheritdoc />
-        public async Task FlushAsync(CancellationToken cancellationToken)
-        {
-            await _transmitService.PauseAsync(cancellationToken);
-            await _transmitService.ContinueAsync(cancellationToken);
-        }
-
         /// <inheritdoc />
         public Task StartAsync(CancellationToken cancellationToken)
         {

src/FubarDev.FtpServer/ConnectionHandlers/SecureConnectionAdapter.cs

@@ -59,12 +59,6 @@ public SecureConnectionAdapter(
         /// <inheritdoc />
         public IPausableFtpService Receiver => _activeCommunicationService.Receiver;
 
-        /// <inheritdoc />
-        public Task FlushAsync(CancellationToken cancellationToken)
-        {
-            return _activeCommunicationService.FlushAsync(cancellationToken);
-        }
-
         /// <inheritdoc />
         public async Task ResetAsync(CancellationToken cancellationToken)
         {

src/FubarDev.FtpServer/ConnectionHandlers/SslStreamConnectionAdapter.cs

@@ -57,16 +57,6 @@ public IPausableFtpService Receiver
             => _info?.ReceiverService
                 ?? throw new InvalidOperationException("Receiver can only be accessed when the connection service was started.");
 
-        /// <inheritdoc />
-        public async Task FlushAsync(CancellationToken cancellationToken)
-        {
-            if (_info != null)
-            {
-                await _info.TransmitterService.PauseAsync(cancellationToken);
-                await _info.TransmitterService.ContinueAsync(cancellationToken);
-            }
-        }
-
         /// <inheritdoc />
         public async Task StartAsync(CancellationToken cancellationToken)
         {

src/FubarDev.FtpServer/Networking/PassThroughService.cs

@@ -76,9 +76,6 @@ protected override async Task ExecuteAsync(CancellationToken cancellationToken)
                     await _writer.WriteAsync(memory, CancellationToken.None)
                        .ConfigureAwait(false);
 
-                    await _writer.FlushAsync(CancellationToken.None)
-                       .ConfigureAwait(false);
-
                     if (readResult.IsCanceled || readResult.IsCompleted)
                     {
                         break;
@@ -87,6 +84,9 @@ await _writer.FlushAsync(CancellationToken.None)
 
                 _reader.AdvanceTo(buffer.End);
 
+                await _writer.FlushAsync(CancellationToken.None)
+                   .ConfigureAwait(false);
+
                 if (readResult.IsCanceled || readResult.IsCompleted)
                 {
                     Logger?.LogTrace("Cancelled={cancelled} or completed={completed}", readResult.IsCanceled, readResult.IsCompleted);

src/FubarDev.FtpServer/ServerCommandHandlers/CloseConnectionServerCommandHandler.cs

@@ -5,6 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
+using FubarDev.FtpServer.Features;
 using FubarDev.FtpServer.ServerCommands;
 
 using Microsoft.Extensions.DependencyInjection;
@@ -29,15 +30,16 @@ public CloseConnectionServerCommandHandler(
         }
 
         /// <inheritdoc />
-        public Task ExecuteAsync(CloseConnectionServerCommand command, CancellationToken cancellationToken)
+        public async Task ExecuteAsync(CloseConnectionServerCommand command, CancellationToken cancellationToken)
         {
             var connection = _connectionAccessor.FtpConnection;
 
+            var networkStreamFeature = connection.Features.Get<INetworkStreamFeature>();
+            await networkStreamFeature.SecureConnectionAdapter.StopAsync(cancellationToken);
+
             // Just abort the connection. This should avoid problems with an ObjectDisposedException.
             // The "StopAsync" will be called in CommandChannelDispatcherAsync.
             ((FtpConnection)connection).Abort();
-
-            return Task.CompletedTask;
         }
     }
 }

src/FubarDev.FtpServer/ServerCommandHandlers/SendResponseServerCommandHandler.cs

@@ -94,9 +94,6 @@ await WriteResponseAsync(connection, nextResponse, cancellationToken)
 
             await writer.FlushAsync(cancellationToken)
                .ConfigureAwait(false);
-
-            var connectionAdapter = networkStreamFeature.SecureConnectionAdapter;
-            await connectionAdapter.FlushAsync(cancellationToken);
         }
     }
 }

test/FubarDev.FtpServer.Tests/Issues/Issue82ProtocolViolation.cs

@@ -23,7 +23,7 @@ public Issue82ProtocolViolation(ITestOutputHelper testOutputHelper)
         [Fact]
         public async Task TestParallelRequests()
         {
-            const int maxTasks = 20;
+            const int maxTasks = 100;
             var tasks = new List<Task>();
             for (var i = 0; i != maxTasks; i++)
             {