fixup! fix(phishing): NPEs

Signed-off-by: Christoph Wurst <[email protected]>
nextcloud · Nov 19, 2024 · 0639a9e · 0639a9e
1 parent 4c6200f
commit 0639a9e
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/lib/Service/PhishingDetection/PhishingDetectionService.php b/lib/Service/PhishingDetection/PhishingDetectionService.php
@@ -33,15 +33,9 @@ public function __construct(
 	public function checkHeadersForPhishing(Horde_Mime_Headers $headers, bool $hasHtmlMessage, string $htmlMessage = ''): array {
 		$list = new PhishingDetectionList();
 		$fromHeader = $headers->getHeader('From');
-		if (!($fromHeader instanceof Horde_Mime_Headers_Element_Address)) {
-			return $list->jsonSerialize();
-		}
 		$sender = AddressList::fromHorde($fromHeader->getAddressList(true))->first();
-		if ($sender === null) {
-			return $list->jsonSerialize();
-		}
-		$fromFN = $sender->getLabel();
-		$fromEmail = $sender->getEmail();
+		$fromFN = $sender?->getLabel();
+		$fromEmail = $sender?->getEmail();
 		$replyToHeader = $headers->getHeader('Reply-To');
 		if ($replyToHeader instanceof Horde_Mime_Headers_Element_Address) {
 			$replyToEmailHeader = $replyToHeader->getAddressList(true);
@@ -50,7 +44,7 @@ public function checkHeadersForPhishing(Horde_Mime_Headers $headers, bool $hasHt
 			$replyToEmail = null;
 		}
 		$date = $headers->getHeader('Date')->__get('value');
-		$customEmail = $sender->getCustomEmail();
+		$customEmail = $sender?->getCustomEmail();
 		if ($fromEmail !== null) {
 			$list->addCheck($this->replyToCheck->run($fromEmail, $replyToEmail));
 		}