Catch InvalidArgumentException from Zend Mail Header. #16

TheFox · Sep 9, 2018 · f9751dd · f9751dd
1 parent 7f512e2
commit f9751dd
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/Client.php b/src/Client.php
@@ -5,6 +5,7 @@
 use RuntimeException;
 use PHPUnit_Framework_MockObject_MockObject;
 use TheFox\Network\AbstractSocket;
+use Zend\Mail\Header\Exception\InvalidArgumentException;
 use Zend\Mail\Message;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Psr\Log\NullLogger;
@@ -468,7 +469,11 @@ public function handleMessage(string $msgRaw): string
                 if ($msgRaw == '.') {
                     $this->mail = substr($this->mail, 0, -strlen(static::MSG_SEPARATOR));
 
-                    $zmail = Message::fromString($this->mail);
+                    try {
+                        $zmail = Message::fromString($this->mail);
+                    } catch (InvalidArgumentException $e) {
+                        return $this->sendSyntaxErrorInParameters();
+                    }
 
                     $server = $this->getServer();
                     $server->newMail($this->from, $this->rcpt, $zmail);
@@ -633,6 +638,14 @@ private function sendCommandNotImplemented(): string
         return $this->dataSend('502 Command not implemented');
     }
 
+    /**
+     * @return string
+     */
+    private function sendBadSequenceOrAuth(): string
+    {
+        return $this->dataSend('503 Bad sequence of commands');
+    }
+
     /**
      * @return string
      */