If AUTH=<> parameter is used in MAIL FROM command, hMailServer reject…

…ed the message. #164
hmailserver · Apr 28, 2016 · 1c9c33e · 1c9c33e
1 parent 000131a
commit 1c9c33e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/hmailserver/source/Server/SMTP/SMTPConnection.cpp b/hmailserver/source/Server/SMTP/SMTPConnection.cpp
@@ -470,7 +470,7 @@ namespace HM
          String parameter = (*iterParam);
          if (parameter.Left(4).CompareNoCase(_T("SIZE")) == 0)
             iEstimatedMessageSize = _ttoi(parameter.Mid(5));
-         else if (parameter.Left(5).CompareNoCase(_T("AUTH")) == 0)
+         else if (parameter.Left(4).CompareNoCase(_T("AUTH")) == 0)
             sAuthParam = parameter.Mid(5);
          else
          {

diff --git a/hmailserver/test/RegressionTests/SMTP/Basics.cs b/hmailserver/test/RegressionTests/SMTP/Basics.cs
@@ -609,6 +609,27 @@ public void TestPostmasterToPostmasterOnOtherDomain()
          Pop3ClientSimulator.AssertMessageCount(account.Address, "test", 1);
       }
 
+
+      [Test]
+      [Category("SMTP")]
+      public void MailFromWithAuthParameterShouldBeAccepted()
+      {
+         Account account1 = SingletonProvider<TestSetup>.Instance.AddAccount(_domain, "test@test.com", "test");
+
+         var smtpClientSimulator = new TcpConnection();
+         smtpClientSimulator.Connect(25);
+
+         Assert.IsTrue(smtpClientSimulator.Receive().StartsWith("220"));
+         smtpClientSimulator.Send("HELO test\r\n");
+         Assert.IsTrue(smtpClientSimulator.Receive().StartsWith("250"));
+
+         // A few tests of invalid syntax.
+         Assert.IsTrue(smtpClientSimulator.SendAndReceive("MAIL FROM: <test@test.com> AUTH=<>\r\n").StartsWith("250"));
+
+         smtpClientSimulator.Disconnect();
+      }
+
+
       [Test]
       [Category("SMTP")]
       [Description("Confirm that it's OK to send MAIL FROM without the < and >")]