This is a test message with 5 header fields and 4 lines in the message body. - HTML - , - $parsedMessage->htmlBody, - ); - - $this->assertStringContainsString( - "Subject: Test message\r -Date: Thu, 02 May 2024 16:01:33 +0000\r -To: Alice Doe
This is a test message with 5 header fields and 4 lines in the message body. - TEXT - , - ); - } - - public function buildEmailWithInlineAttachmentWithoutFilename(): Email - { - // Create a fake PNG content (simple base64 encoded 1x1 pixel PNG) - $pngContent = base64_decode( - 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==', - ); - - return (new Email()) - ->subject('Test message with inline attachment') - ->date(new \DateTimeImmutable('2024-05-02 16:01:33')) - ->addTo(new Address('alice@example.com', 'Alice Doe')) - ->addFrom(new Address('no-reply@site.com', 'Bob Example')) - ->addPart( - // Create inline attachment WITHOUT filename - this should trigger the issue - (new DataPart($pngContent, null, 'image/png'))->asInline()->setContentId('qr@domain.com'), - ) - ->html( - body: <<<'HTML' -
This email contains an inline attachment without a filename.
- HTML, - ); - } - - public function buildEmailWithCyrillic(): Email - { - // Similar to buildEmail but with Cyrillic content - return (new Email()) - ->subject('Test message with Cyrillic') - ->date(new \DateTimeImmutable('2024-05-02 16:01:33')) - ->addTo( - new Address('alice@example.com', 'Alice Doe'), - 'barney@example.com', - ) - ->addFrom(new Address('no-reply@site.com', 'Bob Example')) - ->attachFromPath(path: __DIR__ . '/hello.txt') - ->attachFromPath(path: __DIR__ . '/logo.svg') - ->addPart( - (new DataPart(new File(__DIR__ . '/logo.svg'), 'logo-embeddable'))->asInline()->setContentId( - 'test-cid@buggregator', - ), - ) - ->html( - body: <<<'TEXT' -съешь же ещё этих мягких французских булок, да выпей чаю
-съешь же ещё этих мягких французских булок, да выпей чаю
-съешь же ещё этих мягких французских булок, да выпей чаю
-съешь же ещё этих мягких французских булок, да выпей чаю
-съешь же ещё этих мягких французских булок, да выпей чаю
- TEXT - , - ); - } -} diff --git a/tests/Feature/Interfaces/TCP/Smtp/MessageTest.php b/tests/Feature/Interfaces/TCP/Smtp/MessageTest.php deleted file mode 100644 index 7bb07b12..00000000 --- a/tests/Feature/Interfaces/TCP/Smtp/MessageTest.php +++ /dev/null @@ -1,83 +0,0 @@ -appendBody("Hello World\r\n"); - $this->assertFalse($message->bodyHasEos()); - - // Add Cyrillic content - $message->appendBody("съешь же ещё этих мягких французских булок, да выпей чаю\r\n"); - $this->assertFalse($message->bodyHasEos()); - - // Add more Cyrillic content with varying lengths - $cyrillicRepeated = str_repeat("съешь же ещё этих мягких французских булок, да выпей чаю\r\n", 5); - $message->appendBody($cyrillicRepeated); - $this->assertFalse($message->bodyHasEos()); - - // Add end of stream marker - $message->appendBody(".\r\n"); - $this->assertTrue($message->bodyHasEos()); - - // Check that getBody removes the EOS marker - $body = $message->getBody(); - $this->assertStringNotContainsString("\r\n.\r\n", $body); - - // Verify content is preserved - $this->assertStringContainsString("Hello World", $body); - $this->assertStringContainsString("съешь же ещё этих мягких французских булок, да выпей чаю", $body); - } - - public function testMultipleEOSMarkers(): void - { - $message = new Message('test-uuid'); - - // Add content with a period at the start of a line (which should be escaped) - $message->appendBody("Line 1\r\n"); - $message->appendBody(".Line starting with period\r\n"); - $message->appendBody("Line 3\r\n"); - - // Add an EOS marker in the middle (shouldn't be considered as EOS) - $message->appendBody(".\r\nMore content\r\n"); - $this->assertFalse($message->bodyHasEos()); - - // Now add actual EOS marker at the end - $message->appendBody(".\r\n"); - $this->assertTrue($message->bodyHasEos()); - - // Verify the body content is correct - $body = $message->getBody(); - $this->assertStringContainsString("Line 1", $body); - $this->assertStringContainsString(".Line starting with period", $body); - $this->assertStringContainsString("Line 3", $body); - $this->assertStringContainsString(".\r\nMore content", $body); - } - - public function testLargeBodyWithEOS(): void - { - $message = new Message('test-uuid'); - - // Add a large body - $largeBody = str_repeat("Lorem ipsum dolor sit amet. ", 1000); - $message->appendBody($largeBody); - $message->appendBody("\r\n.\r\n"); - - $this->assertTrue($message->bodyHasEos()); - - // Verify the body content is correct - $body = $message->getBody(); - $this->assertStringContainsString("Lorem ipsum dolor sit amet.", $body); - $this->assertStringNotContainsString("\r\n.\r\n", $body); - } -} diff --git a/tests/Feature/Interfaces/TCP/Smtp/ServiceTest.php b/tests/Feature/Interfaces/TCP/Smtp/ServiceTest.php deleted file mode 100644 index a792cfad..00000000 --- a/tests/Feature/Interfaces/TCP/Smtp/ServiceTest.php +++ /dev/null @@ -1,202 +0,0 @@ -cache = $this->createMock(CacheInterface::class); - - // Create a real EmailBodyStorage with a mock cache - $this->emailBodyStorage = new EmailBodyStorage($this->cache); - - $this->attachments = $this->createMock(AttachmentStorageInterface::class); - $this->bus = $this->createMock(CommandBusInterface::class); - - $this->service = new Service( - $this->bus, - $this->emailBodyStorage, - $this->attachments, - $this->get(Parser::class), - ); - } - - public function testResetBodyOnDataCommand(): void - { - $connectionUuid = (string) Uuid::uuid4(); - $message = new Message($connectionUuid); - $message->body = 'Some existing content that should be cleared'; - - // Setup the cache mock to return our message with existing content - $this->cache - ->expects($this->once()) - ->method('get') - ->with($connectionUuid, $this->anything()) - ->willReturn($message); - - // Expect the cache to be updated with the reset message - $this->cache - ->expects($this->once()) - ->method('set') - ->with( - $connectionUuid, - $this->callback( - fn($persistedMessage) => $persistedMessage->body === '' && $persistedMessage->waitBody === true, - ), - $this->anything(), - ); - - // Create a request with DATA command - $request = new Request( - remoteAddr: '127.0.0.1', - event: TcpEvent::Data, - body: "DATA\r\n", - connectionUuid: $connectionUuid, - server: 'test-server', - ); - - // Handle the request - $response = $this->service->handle($request); - - // Verify response is correct - $this->assertInstanceOf(RespondMessage::class, $response); - $this->assertStringContainsString('354', $response->getBody()); - } - - public function testResetWaitBodyAfterMessageProcessing(): void - { - $connectionUuid = (string) Uuid::uuid4(); - $message = new Message($connectionUuid); - $message->waitBody = true; - $message->body = "Test message content\r\n.\r\n"; // With EOS marker - - // Create a real MailMessage object instead of a mock - new MailMessage( - id: 'test-message-id', - raw: $message->getBody(), - sender: [['email' => 'test@example.com', 'name' => 'Test Sender']], - recipients: [], - ccs: [], - subject: 'Test Subject', - htmlBody: 'Test HTML
', - textBody: 'Test plain text', - replyTo: [], - allRecipients: [], - attachments: [], - ); - - // Set up the cache mock - $this->cache - ->expects($this->once()) - ->method('get') - ->with($connectionUuid, $this->anything()) - ->willReturn($message); - - // Setup mocks for dispatchMessage - $this->attachments - ->expects($this->once()) - ->method('store') - ->willReturn([]); - - $this->bus - ->expects($this->once()) - ->method('dispatch') - ->with($this->isInstanceOf(HandleReceivedEvent::class)); - - // Create a request with the last part of message body - $request = new Request( - remoteAddr: '127.0.0.1', - event: TcpEvent::Data, - body: "Final line of the message\r\n.\r\n", - connectionUuid: $connectionUuid, - server: 'test-server', - ); - - // Handle the request - $response = $this->service->handle($request); - - // Verify the waitBody flag was reset - $this->assertFalse($message->waitBody, 'waitBody flag should be reset after processing a message'); - - // Verify response code is 250 (message accepted) - $this->assertInstanceOf(RespondMessage::class, $response); - $this->assertStringContainsString('250', $response->getBody()); - } - - public function testCorrectResponseForDataWithCyrillic(): void - { - $connectionUuid = (string) Uuid::uuid4(); - $message = new Message($connectionUuid); - $message->waitBody = true; - - // Setup the cache mock - $this->cache - ->expects($this->once()) - ->method('get') - ->with($connectionUuid, $this->anything()) - ->willReturn($message); - - // Expect the cache to be updated - $this->cache - ->expects($this->once()) - ->method('set') - ->with( - $connectionUuid, - $this->callback(fn($persistedMessage) => str_contains( - $persistedMessage->body, - "съешь же ещё этих мягких французских булок, да выпей чаю", - )), - $this->anything(), - ); - - // Create a request with Cyrillic content - $request = new Request( - remoteAddr: '127.0.0.1', - event: TcpEvent::Data, - body: "съешь же ещё этих мягких французских булок, да выпей чаю\r\n", - connectionUuid: $connectionUuid, - server: 'test-server', - ); - - // Handle the request - $response = $this->service->handle($request); - - // Verify the body contains the Cyrillic content - $this->assertStringContainsString( - "съешь же ещё этих мягких французских булок, да выпей чаю", - $message->body, - ); - - // Verify correct response for partial data - $this->assertInstanceOf(RespondMessage::class, $response); - $this->assertStringContainsString('250', $response->getBody()); // OK response - } -} diff --git a/tests/Feature/Interfaces/TCP/Smtp/hello.txt b/tests/Feature/Interfaces/TCP/Smtp/hello.txt deleted file mode 100644 index cd087558..00000000 --- a/tests/Feature/Interfaces/TCP/Smtp/hello.txt +++ /dev/null @@ -1 +0,0 @@ -Hello world! diff --git a/tests/Feature/Interfaces/TCP/Smtp/logo.svg b/tests/Feature/Interfaces/TCP/Smtp/logo.svg deleted file mode 100644 index 2330ca97..00000000 --- a/tests/Feature/Interfaces/TCP/Smtp/logo.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/tests/Feature/Interfaces/TCP/Smtp/sample.pdf b/tests/Feature/Interfaces/TCP/Smtp/sample.pdf deleted file mode 100644 index c172e182..00000000 Binary files a/tests/Feature/Interfaces/TCP/Smtp/sample.pdf and /dev/null differ diff --git a/tests/Feature/Modules/Smtp/Application/Mail/InlineAttachmentParsingTest.php b/tests/Feature/Modules/Smtp/Application/Mail/InlineAttachmentParsingTest.php deleted file mode 100644 index f70528f5..00000000 --- a/tests/Feature/Modules/Smtp/Application/Mail/InlineAttachmentParsingTest.php +++ /dev/null @@ -1,287 +0,0 @@ -parser = $this->get(Parser::class); - } - - public function testParseEmailWithInlineAttachmentWithoutFilename(): void - { - // This simulates the problematic case where an inline attachment has no filename - $rawEmail = $this->buildRawEmailWithInlineAttachmentWithoutFilename(); - - $message = $this->parser->parse($rawEmail); - - // Verify the message was parsed successfully - $this->assertSame('Test with inline attachment', $message->subject); - $this->assertCount(1, $message->attachments); - - // Verify the attachment was processed correctly - $attachment = $message->attachments[0]; - - $this->assertSame('qr_domain.com.png', $attachment->getFilename()); - $this->assertSame('image/png', $attachment->getType()); - $this->assertSame('qr@domain.com', $attachment->getContentId()); - $this->assertNotEmpty($attachment->getContent()); - } - - public function testParseEmailWithComplexContentId(): void - { - $rawEmail = $this->buildRawEmailWithComplexContentId(); - - $message = $this->parser->parse($rawEmail); - - $this->assertCount(1, $message->attachments); - $attachment = $message->attachments[0]; - - // Complex content-id should be sanitized to valid filename - $this->assertSame('logo-embeddable_test.buggregator.svg', $attachment->getFilename()); - $this->assertSame('image/svg+xml', $attachment->getType()); - $this->assertSame('logo-embeddable@test.buggregator', $attachment->getContentId()); - } - - public function testParseEmailWithMixedAttachments(): void - { - $rawEmail = $this->buildRawEmailWithMixedAttachments(); - - $message = $this->parser->parse($rawEmail); - - $this->assertCount(2, $message->attachments); - - // First attachment: inline without filename - $inlineAttachment = $message->attachments[0]; - $this->assertSame('test-id_example.com.jpg', $inlineAttachment->getFilename()); - $this->assertSame('image/jpeg', $inlineAttachment->getType()); - $this->assertSame('test-id@example.com', $inlineAttachment->getContentId()); - - // Second attachment: regular with filename - $regularAttachment = $message->attachments[1]; - $this->assertSame('document.pdf', $regularAttachment->getFilename()); - $this->assertSame('application/pdf', $regularAttachment->getType()); - $this->assertNull($regularAttachment->getContentId()); - } - - private function buildRawEmailWithInlineAttachmentWithoutFilename(): string - { - return <<<'EMAIL' - From: sender@example.com - To: recipient@example.com - Subject: Test with inline attachment - Content-Type: multipart/related; boundary="boundary123" - - --boundary123 - Content-Type: text/html; charset=UTF-8 - - - -This is a test with inline attachment:
-This is a test with complex content-id:
-This email has both inline and regular attachments:
-And a regular attachment below.
- - - - --boundary789 - Content-Type: image/jpeg - Content-Disposition: inline - Content-ID:This has an empty content-id:
-