Skip notifications for users with invalid email address.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
nextcloud · Apr 4, 2020 · 220c68a · 220c68a
1 parent 6626d9b
commit 220c68a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/lib/MailQueueHandler.php b/lib/MailQueueHandler.php
@@ -325,6 +325,11 @@ protected function sendEmailToUser($userName, $email, $lang, $timezone, $maxTime
 			return true;
 		}
 
+		if (!$this->mailer->validateMailAddress($email)) {
+			$this->logger->warning('Notification for user "{user}" not sent because the email address "{email}" is invalid.', ['user' => $userName, 'email' => $email]);
+			return true;
+		}
+
 		list($mailData, $skippedCount) = $this->getItemsForUser($userName, $maxTime);
 
 		$l = $this->getLanguage($lang);

diff --git a/tests/MailQueueHandlerTest.php b/tests/MailQueueHandlerTest.php
@@ -242,6 +242,10 @@ public function testSendEmailToUser(): void {
 		$this->mailer->expects($this->once())
 			->method('createEMailTemplate')
 			->willReturn($template);
+		$this->mailer->expects($this->once())
+			->method('validateMailAddress')
+			->with($email)
+			->willReturn(true);
 
 		$template->expects($this->once())
 			->method('addHeader');