Detect outgoing messages in Locals Folder (#114)

Author: lieser

CHANGELOG.md

@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 ### Enhancements
 
 - Authentication-Results header: Sort DKIM, SPF and DMARC results from ARH, even when not replacing the add-ons verification (#534).
+- Detect outgoing messages in Locals Folder (#114).
 
 ### Fixes
 

modules/extensionUtils.mjs.js

@@ -85,13 +85,16 @@ async function isOutgoing(message, fromAddr) {
 		return false;
 	}
 	// return true if one of the accounts identities contain the from address
-	const account = await browser.accounts.get(message.folder.accountId);
-	const identities = account?.identities;
-	if (identities) {
-		for (const identity of identities) {
-			if (fromAddr === identity.email) {
-				log.debug("email is from own identity, no need fo it to be signed");
-				return true;
+	const containingAccount = await browser.accounts.get(message.folder.accountId);
+	const accounts = containingAccount?.type === "none" ? await browser.accounts.list() : [containingAccount];
+	for (const account of accounts) {
+		const identities = account?.identities;
+		if (identities) {
+			for (const identity of identities) {
+				if (fromAddr === identity.email) {
+					log.debug("email is from own identity, no need fo it to be signed");
+					return true;
+				}
 			}
 		}
 	}

test/unittest/extensionUtilsSpec.mjs.js

@@ -106,5 +106,55 @@ describe("ExtensionUtils [unittest]", function () {
 				await ExtensionUtils.isOutgoing(createFakeMessageHeader("fakeAccount", undefined), "[email protected]")
 			).to.be.equal(true);
 		});
+
+		it("For local folder all identities are used", async function () {
+			const browserAccountsGet = sinon.stub(browser.accounts, "get");
+			// eslint-disable-next-line require-await
+			browserAccountsGet.callsFake(async (accountId) => {
+				if (accountId !== "fakeLocal") {
+					return null;
+				}
+				return {
+					id: accountId,
+					identities: [],
+					name: "A fake local account",
+					type: "none",
+				};
+			});
+			const browserAccountsList = sinon.stub(browser.accounts, "list");
+			// eslint-disable-next-line require-await
+			browserAccountsList.callsFake(async () => {
+				return [{
+					id: "fakeLocal",
+					identities: [],
+					name: "A fake local account",
+					type: "none",
+				}, {
+					id: "fakeImap",
+					identities: [
+						{ email: "[email protected]" },
+					],
+					name: "A fake IMAP account",
+					type: "imap",
+				}, {
+					id: "fakePop3",
+					identities: [
+						{ email: "[email protected]" },
+					],
+					name: "A fake POP3 account",
+					type: "pop3",
+				}];
+			});
+
+			expect(
+				await ExtensionUtils.isOutgoing(createFakeMessageHeader("fakeLocal", undefined), "[email protected]")
+			).to.be.equal(false);
+			expect(
+				await ExtensionUtils.isOutgoing(createFakeMessageHeader("fakeLocal", undefined), "[email protected]")
+			).to.be.equal(true);
+			expect(
+				await ExtensionUtils.isOutgoing(createFakeMessageHeader("fakeLocal", undefined), "[email protected]")
+			).to.be.equal(true);
+		});
 	});
 });