fixup! feat: One-click unsubscribe

Signed-off-by: Daniel Kesselberg <[email protected]>
nextcloud · May 4, 2023 · efebc54 · efebc54
1 parent 90721d2
commit efebc54
Showing 1 changed file with 22 additions and 17 deletions.
diff --git a/lib/IMAP/ImapMessageFetcher.php b/lib/IMAP/ImapMessageFetcher.php
@@ -515,24 +515,29 @@ private function parseHeaders(Horde_Imap_Client_Data_Fetch $fetch): void {
 			$this->dispositionNotificationTo = $dispositionNotificationTo->value_single;
 		}
 
-		$listUnsubscribeHeader = $parsedHeaders->getHeader('list-unsubscribe');
-		if ($listUnsubscribeHeader !== null) {
-			$listHeaders = new Horde_ListHeaders();
-			/** @var Horde_ListHeaders_Base[] $headers */
-			$headers = $listHeaders->parse($listUnsubscribeHeader->name, $listUnsubscribeHeader->value_single);
-			foreach ($headers as $header) {
-				if (str_starts_with($header->url, 'http')) {
-					$this->unsubscribeUrl = $header->url;
-
-					$unsubscribePostHeader = $parsedHeaders->getHeader('List-Unsubscribe-Post');
-					if ($unsubscribePostHeader !== null) {
-						$this->isOneClickUnsubscribe = strtolower($unsubscribePostHeader->value_single) === 'list-unsubscribe=one-click';
+		$dkimSignatureHeader = $parsedHeaders->getHeader('dkim-signature');
+		$hasDkimSignature = $dkimSignatureHeader !== null;
+
+		if ($hasDkimSignature) {
+			$listUnsubscribeHeader = $parsedHeaders->getHeader('list-unsubscribe');
+			if ($listUnsubscribeHeader !== null) {
+				$listHeaders = new Horde_ListHeaders();
+				/** @var Horde_ListHeaders_Base[] $headers */
+				$headers = $listHeaders->parse($listUnsubscribeHeader->name, $listUnsubscribeHeader->value_single);
+				foreach ($headers as $header) {
+					if (str_starts_with($header->url, 'http')) {
+						$this->unsubscribeUrl = $header->url;
+
+						$unsubscribePostHeader = $parsedHeaders->getHeader('List-Unsubscribe-Post');
+						if ($unsubscribePostHeader !== null) {
+							$this->isOneClickUnsubscribe = strtolower($unsubscribePostHeader->value_single) === 'list-unsubscribe=one-click';
+						}
+						break;
+					}
+					if (str_starts_with($header->url, 'mailto')) {
+						$this->unsubscribeMailto = $header->url;
+						break;
 					}
-					break;
-				}
-				if (str_starts_with($header->url, 'mailto')) {
-					$this->unsubscribeMailto = $header->url;
-					break;
 				}
 			}
 		}