fixed bug with not handling multiple buffers in the token reader prop…

…erly

Examples/SampleApp/Examples/SessionTracingExample.cs

@@ -21,9 +21,11 @@ public static void Run()
                 .Build();
 
             var server = new SmtpServer.SmtpServer(options, ServiceProvider.Default);
-
+            
             server.SessionCreated += OnSessionCreated;
             server.SessionCompleted += OnSessionCompleted;
+            server.SessionFaulted += OnSessionFaulted;
+            server.SessionCancelled += OnSessionCancelled;
 
             var serverTask = server.StartAsync(_cancellationTokenSource.Token);
 
@@ -32,6 +34,16 @@ public static void Run()
             serverTask.WaitWithoutException();
         }
 
+        static void OnSessionFaulted(object sender, SessionFaultedEventArgs e)
+        {
+            Console.WriteLine("SessionFaulted: {0}", e.Exception);
+        }
+
+        static void OnSessionCancelled(object sender, SessionEventArgs e)
+        {
+            Console.WriteLine("SessionCancelled");
+        }
+
         static void OnSessionCreated(object sender, SessionEventArgs e)
         {
             Console.WriteLine("SessionCreated: {0}", e.Context.Properties[EndpointListener.RemoteEndPointKey]);

Examples/SampleApp/Program.cs

@@ -8,6 +8,8 @@
 using MimeKit;
 using SampleApp.Examples;
 using SmtpServer.IO;
+using SmtpServer.Protocol;
+using SmtpServer.Tests;
 using SmtpServer.Text;
 
 namespace SampleApp
@@ -22,9 +24,12 @@ static void Main(string[] args)
             //SimpleServerExample.Run();
             //CustomEndpointListenerExample.Run();
             //ServerCancellingExample.Run();
-            //SessionTracingExample.Run();
+            SessionTracingExample.Run();
             //DependencyInjectionExample.Run();
-            SecureServerExample.Run();
+            //SecureServerExample.Run();
+
+            //SampleMailClient.Send(user: "user1", password: "password1", useSsl: false, port: 587);
+            //SampleMailClient.Send(useSsl: false, port: 587);
 
             //var files = Directory.GetFiles(@"C:\Temp\enron_mail_20150507.tar", "*.*", SearchOption.AllDirectories).ToList();
             //Console.WriteLine(files.OrderByDescending(file => new FileInfo(file).Length).First());

Examples/SampleApp/SampleApp.csproj

@@ -19,6 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Src\SmtpServer.Tests\SmtpServer.Tests.csproj" />
     <ProjectReference Include="..\..\Src\SmtpServer\SmtpServer.csproj" />
   </ItemGroup>
 

Examples/SampleApp/SampleMailClient.cs

@@ -13,13 +13,18 @@ public static void Send(
             string password = null,
             MimeEntity body = null,
             int count = 1,
-            bool useSsl = false)
+            bool useSsl = false,
+            int port = 9025)
         {
             //var message = MimeMessage.Load(@"C:\Dev\Cain\Temp\message.eml");
             var message = new MimeMessage();
 
             message.From.Add(MailboxAddress.Parse(from ?? "[email protected]"));
             message.To.Add(MailboxAddress.Parse(to ?? "[email protected]"));
+            //for (var i = 0; i < 400; i++)
+            //{
+            //    message.To.Add(MailboxAddress.Parse(to ?? $"testuser{i+1000}@longemaildomain1000001.com"));
+            //}
             message.Subject = subject ?? "Hello";
             message.Body = body ?? new TextPart("plain")
             {
@@ -28,7 +33,7 @@ public static void Send(
 
             using var client = new SmtpClient();
 
-            client.Connect("localhost", 9025, useSsl);
+            client.Connect("localhost", port, useSsl);
 
             if (user != null && password != null)
             {

Src/SmtpServer.Tests/SmtpParserTests.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Text;
+using SmtpServer.IO;
 using SmtpServer.Mail;
 using SmtpServer.Protocol;
 using SmtpServer.Text;
@@ -19,6 +20,18 @@ static TokenReader CreateReader(string text)
             return new TokenReader(new ReadOnlySequence<byte>(buffer, 0, buffer.Length));
         }
 
+        static TokenReader CreateReader(params byte[][] buffers)
+        {
+            var segmentList = new ByteArraySegmentList();
+
+            foreach (var buffer in buffers)
+            {
+                segmentList.Append(buffer);
+            }
+
+            return new TokenReader(segmentList.Build());
+        }
+
         static SmtpParser Parser => new SmtpParser(new SmtpCommandFactory());
 
         [Fact]
@@ -210,6 +223,9 @@ public void CanNotMakeMail(string input)
         [InlineData("RCPT TO:<[email protected]>", "cain.osullivan", "gmail.com")]
         [InlineData(@"RCPT TO:<""Abc@def""@example.com>", "Abc@def", "example.com")]
         [InlineData("RCPT TO:<pelé@example.com>", "pelé", "example.com")]
+        [InlineData("RCPT TO:<@example1.com:[email protected]>", "someone", "example.com")]
+        [InlineData("RCPT TO:<@example1.com,@example2.com:[email protected]>", "someone", "example.com")]
+        [InlineData("RCPT TO:<example/[email protected]>", "example/example", "example.com")]
         public void CanMakeRcpt(string input, string user, string host)
         {
             // arrange
@@ -225,6 +241,22 @@ public void CanMakeRcpt(string input, string user, string host)
             Assert.Equal(host, ((RcptCommand)command).Address.Host);
         }
 
+        [Theory]
+        [InlineData("RCPT TO:<someone@@example.com>")]
+        [InlineData("RCPT TO:<[email protected]>")]
+        [InlineData("RCPT TO:<someone@-examplecom>")]
+        public void CanNotMakeRcpt(string input)
+        {
+            // arrange
+            var reader = CreateReader(input);
+
+            // act
+            var result = Parser.TryMakeRcpt(ref reader, out _, out _);
+
+            // assert
+            Assert.False(result);
+        }
+
         [Fact]
         public void CanMakeProxyUnknown()
         {
@@ -389,6 +421,7 @@ public void CanMakeDomain()
         [InlineData(@"[email protected]", "$A12345", "example.com")]
         [InlineData(@"!def!xyz%[email protected]", "!def!xyz%abc", "example.com")]
         [InlineData(@"[email protected]", "_somename", "example.com")]
+        [InlineData(@"[email protected]", "somename", "127.0.0.1")]
         public void CanMakeMailbox(string email, string user, string host)
         {
             // arrange

Src/SmtpServer.Tests/TokenReaderTests.cs

@@ -44,5 +44,47 @@ public void CanTokenizeMultiSegmentWord()
             Assert.Equal("DEF", reader.Take().ToText());
             Assert.Equal(TokenKind.None, reader.Take().Kind);
         }
+
+        [Fact]
+        public void CanMakeSequences()
+        {
+            // arrange
+            var reader = CreateReader("1", "AB", "CDE", "F234", "5678");
+
+            // act
+            var made1 = reader.TryMake(TryMakeNumber, out var sequence1);
+            var made2 = reader.TryMake(TryMakeText, out var sequence2);
+            var made3 = reader.TryMake(TryMakeNumber, out var sequence3);
+
+            // assert
+            Assert.True(made1);
+            Assert.Equal("1", StringUtil.Create(sequence1));
+            Assert.True(made2);
+            Assert.Equal("ABCDEF", StringUtil.Create(sequence2));
+            Assert.True(made3);
+            Assert.Equal("2345678", StringUtil.Create(sequence3));
+
+            static bool TryMakeText(ref TokenReader r)
+            {
+                if (r.Peek().Kind == TokenKind.Text)
+                {
+                    r.Skip(TokenKind.Text);
+                    return true;
+                }
+
+                return false;
+            }
+
+            static bool TryMakeNumber(ref TokenReader r)
+            {
+                if (r.Peek().Kind == TokenKind.Number)
+                {
+                    r.Skip(TokenKind.Number);
+                    return true;
+                }
+
+                return false;
+            }
+        }
     }
 }

Src/SmtpServer/IO/BuffersExtension.cs

@@ -130,5 +130,65 @@ static bool TryMoveNext(ref ReadOnlySequence<byte> source, ref SequencePosition
             span = default;
             return false;
         }
+
+        internal static bool CaseInsensitiveStringEquals(this ReadOnlySequence<byte> buffer, ref Span<char> text)
+        {
+            if (buffer.IsSingleSegment)
+            {
+                var span = buffer.First.Span;
+
+                return CaseInsensitiveStringEquals(ref span, ref text, 0);
+            }
+
+            var i = 0;
+            var position = buffer.GetPosition(0);
+
+            while (buffer.TryGet(ref position, out var memory, advance: true))
+            {
+                var span = memory.Span;
+
+                if (CaseInsensitiveStringEquals(ref span, ref text, i) == false)
+                {
+                    return false;
+                }
+
+                i += span.Length;
+            }
+
+            return i > 0;
+        }
+
+        static bool CaseInsensitiveStringEquals(ref ReadOnlySpan<byte> span, ref Span<char> text, int offset)
+        {
+            if (text.Length - offset != span.Length)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < span.Length; i++)
+            {
+                var ch = (char)span[i];
+
+                if (char.ToUpper(ch) != char.ToUpper(text[i + offset]))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        internal static bool IsHex(this ref ReadOnlySpan<byte> buffer)
+        {
+            for (var i = 0; i < buffer.Length; i++)
+            {
+                if ((buffer[i] < 'a' || buffer[i] > 'f') && (buffer[i] < 'A' || buffer[i] > 'F'))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
     }
 }

Src/SmtpServer/Protocol/SmtpParser.cs

@@ -4,6 +4,7 @@
 using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
+using SmtpServer.IO;
 using SmtpServer.Mail;
 using SmtpServer.Text;
 

Src/SmtpServer/SmtpServer.cs

@@ -141,7 +141,10 @@ async Task ListenAsync(IEndpointDefinition endpointDefinition, CancellationToken
                     continue;
                 }
 
-                _sessions.Run(sessionContext, cancellationTokenSource.Token);
+                if (sessionContext.Pipe != null)
+                {
+                    _sessions.Run(sessionContext, cancellationTokenSource.Token);
+                }
             }
         }
 

Src/SmtpServer/SmtpServer.csproj

@@ -5,7 +5,7 @@
     <LangVersion>8.0</LangVersion>
     <AssemblyName>SmtpServer</AssemblyName>
     <RootNamespace>SmtpServer</RootNamespace>
-    <Version>9.0.0</Version>
+    <Version>9.0.1</Version>
     <Description>.NET SmtpServer</Description>
     <Authors>Cain O'Sullivan</Authors>
     <Company />
@@ -15,8 +15,8 @@
     <PackageTags>smtp smtpserver smtp server</PackageTags>
     <PackageLicenseUrl></PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
-    <AssemblyVersion>9.0.0.0</AssemblyVersion>
-    <FileVersion>9.0.0.0</FileVersion>
+    <AssemblyVersion>9.0.1.0</AssemblyVersion>
+    <FileVersion>9.0.1.0</FileVersion>
     <PackageReleaseNotes>Version 9
 Breaking API change by removing the Certificate from the server options and adding it to the endpoint.
 

Src/SmtpServer/SmtpSessionManager.cs

@@ -36,6 +36,8 @@ async Task RunAsync(SmtpSessionHandle handle, CancellationToken cancellationToke
         {
             try
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 _smtpServer.OnSessionCreated(new SessionEventArgs(handle.SessionContext));
 
                 await handle.Session.RunAsync(cancellationToken);