#2614 fix: decryption error for message sent via encrypted contact page

FlowCrypt/Core/CoreTypes.swift

@@ -215,9 +215,10 @@ struct MsgBlock: Decodable {
 
     struct AttMeta: Decodable {
         let name: String
-        let data: String
+        let data: String?
         let type: String
         let length: Int
+        let url: String?
         let treatAs: String?
     }
 

FlowCrypt/Functionality/Mail Provider/Message Provider/MessageAttachment.swift

@@ -54,10 +54,17 @@ extension MessageAttachment {
     }
 
     init?(attMeta: MsgBlock.AttMeta) {
-        guard let data = Data(base64Encoded: attMeta.data.data()) else {
+        if let urlString = attMeta.url, let url = URL(string: urlString) {
+            // Fetch data synchronously from the URL
+            if let urlData = try? Data(contentsOf: url) {
+                self.init(name: attMeta.name, data: urlData, mimeType: attMeta.type, treatAs: "encryptedFile")
+                return
+            }
+            return nil
+        }
+        guard let attData = attMeta.data, let data = Data(base64Encoded: attData.data()) else {
             return nil
         }
-
         self.init(name: attMeta.name, data: data, mimeType: attMeta.type, treatAs: attMeta.treatAs)
     }
 }

appium/api-mocks/apis/google/exported-messages/message-export-192d58178bf2ca46.json

@@ -0,0 +1,110 @@
+{
+  "acctEmail": "[email protected]",
+  "full": {
+    "id": "192d58178bf2ca46",
+    "threadId": "192d58178bf2ca46",
+    "labelIds": ["CATEGORY_PERSONAL", "INBOX"],
+    "snippet": "This message was submitted through a web form. The sender's email address was not verified. -----BEGIN PGP MESSAGE----- wV4DT2ZlSmhZ1GoSAQdAx0ulnySITf0eKoHAeLhiXsFsaVofBF6SSQdyJEAM",
+    "payload": {
+      "partId": "",
+      "mimeType": "multipart/mixed",
+      "filename": "",
+      "headers": [
+        {
+          "name": "Content-Type",
+          "value": "multipart/mixed; boundary=\"===============8921743240882101210==\""
+        },
+        {
+          "name": "MIME-Version",
+          "value": "1.0"
+        },
+        {
+          "name": "Subject",
+          "value": "Test encrypted message sent via encrypted contact page with attachment"
+        },
+        {
+          "name": "From",
+          "value": "[email protected]"
+        },
+        {
+          "name": "To",
+          "value": "[email protected]"
+        },
+        {
+          "name": "Reply-To",
+          "value": "[email protected]"
+        },
+        {
+          "name": "Date",
+          "value": "Mon, 28 Oct 2024 23:41:24 +0000"
+        },
+        {
+          "name": "X-SES-Outgoing",
+          "value": "2024.10.28-69.169.224.13"
+        }
+      ],
+      "body": {
+        "size": 0
+      },
+      "parts": [
+        {
+          "partId": "0",
+          "mimeType": "multipart/alternative",
+          "filename": "",
+          "headers": [
+            {
+              "name": "Content-Type",
+              "value": "multipart/alternative; boundary=\"===============0980079176639676948==\""
+            },
+            {
+              "name": "MIME-Version",
+              "value": "1.0"
+            }
+          ],
+          "body": {
+            "size": 0
+          },
+          "parts": [
+            {
+              "partId": "0.0",
+              "mimeType": "text/plain",
+              "filename": "",
+              "headers": [
+                {
+                  "name": "MIME-Version",
+                  "value": "1.0"
+                },
+                {
+                  "name": "Content-Type",
+                  "value": "text/plain; charset=\"utf-8\""
+                },
+                {
+                  "name": "Content-Transfer-Encoding",
+                  "value": "base64"
+                }
+              ],
+              "body": {
+                "size": 820,
+                "data": "VGhpcyBtZXNzYWdlIHdhcyBzdWJtaXR0ZWQgdGhyb3VnaCBhIHdlYiBmb3JtLiBUaGUgc2VuZGVyJ3MgZW1haWwgYWRkcmVzcyB3YXMgbm90IHZlcmlmaWVkLgoKLS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQoKCndWNERUMlpsU21oWjFHb1NBUWRBeDB1bG55U0lUZjBlS29IQWVMaGlYc0ZzYVZvZkJGNlNTUWR5SkVBTQpmWE13TU9ZUnNNU0hvQ0tONHdGVGxDTVJ4T2IvNFRDRVlCWkt5Ly84L2VLN3g3SzVBUUpiMkYrNGt1UzQKVW5FRWYrTUowc0RFQWJIOVZEZXJjMS9VMS9GMlBYQUFtOTBKdlk3SVEzVm4vUXl4eHp4czY5dmJncVlLCkMzMGNrMXBObEhRWGM3QmFMZk5HMFFvY3JIRFpmQWhvR0JHLzczVWxxbEkzemFkTC9JLy8rQ2dPbExGUApydVpOdWcrbytNVm42Yk5MdU1Gb1pHc1lueXI1aGdlcmVwZDFJTXF0MlIvdnI0K2U1Zzk5VTF2aGc2RkUKZ29RVmMyazhZS2tlSzlhNHN2MlVyRjFEalU4VzlCZXNXOHN4NmlrZjh2dlg1OXkrbmRqUW5GUStVVjN3CldaUFFGS0xJelVvVUVqYlArZDdQb2FJd1ZQUTJVcjZKZnJxS2VzYkJWOTBwVEhIQUNoc1N1Qzdzcjh5WgpFNmFtVURheEhqUkx4SzNhVTlBNnJiOUwxOWh0a01zelYwU01ZeHdhQ3V5VHJ3eUJ0bXNTMkVJZkhUa24Ka0YxeWx5Y3JpQVpIOEp6ZFVjaWFySkxUNTl4cmUyZk5kRXFYNFcrbjVSS1RUMks1UXFRSDlXbldBZEtnCkJab3NHTGlsTVZqbVVzalNKS0s5ZUVKNlNVZFF4WFpybW9FbXBkckhDY3pJTGtjSXJwSXNMOG90Y2dodwpQSVYrWGhneTl0MHVRQXR2bXBzN1ErOUU4UGpDRmtoOVpKTGpXcmM4c0ljUGtVV293dz09Cj16L0V2Ci0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg=="
+              }
+            }
+          ]
+        }
+      ]
+    },
+    "sizeEstimate": 6548,
+    "historyId": "320850",
+    "internalDate": "1730158884000"
+  },
+  "attachments": {},
+  "raw": {
+    "id": "192d58178bf2ca46",
+    "threadId": "192d58178bf2ca46",
+    "labelIds": ["CATEGORY_PERSONAL", "INBOX"],
+    "snippet": "This message was submitted through a web form. The sender's email address was not verified. -----BEGIN PGP MESSAGE----- wV4DT2ZlSmhZ1GoSAQdAx0ulnySITf0eKoHAeLhiXsFsaVofBF6SSQdyJEAM",
+    "sizeEstimate": 6548,
+    "raw": "Delivered-To: e2e.enterprise.test@flowcrypt.com
Received: by 2002:a05:6359:5f01:b0:1c0:c5b1:5f24 with SMTP id lf1csp1858226rwc;
        Mon, 28 Oct 2024 16:41:25 -0700 (PDT)
X-Google-Smtp-Source: AGHT+IFHUQqiC6N6We5xoSOaJY5cDqSnBnlZ1u5d+IP2GGBzLONvi4Dc0fwvJVUPoH0cphPwztmz
X-Received: by 2002:adf:f4c7:0:b0:37d:9508:194f with SMTP id ffacd0b85a97d-380611f4f40mr7397183f8f.47.1730158885016;
        Mon, 28 Oct 2024 16:41:25 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1730158885; cv=none;
        d=google.com; s=arc-20240605;
        b=Iv1Sqd1Egi932+yC5RMDwXKsIMBPlxWJKkpY4ucCTJA9hNMlbd9KuH95gOhTqsqK00
         JVsmJhPhzlC86da/C2HVyPP1g3nH6ECABLICv2eoWJY/O/5OMl1lrEbDoogj5F+MKxdP
         H8o7tJ4sPvAVEZKafmrFBtdhgt+GB2CIMhCnbY8ZIDJg9abVi7cp+KXw9XA2WEAwLcDh
         w5nA6Zy+99jCC6mCiy6Yz3ti6U0ngiC9kW/nhJQcVNyBZm4dOM7hcZxV1HskNSlxgyhq
         HNpQ+4wEDjdPguz240GSEb/i4SP383usTqW6XhdbWYjH3YXxwYseLFTSSOPvhfnIy4+1
         g/oA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
        h=feedback-id:date:message-id:reply-to:to:from:subject:mime-version
         :dkim-signature:dkim-signature;
        bh=VJ7duuGM4P43ZKthHd+W+sBUDFw2DejzKl6Brk98GzQ=;
        fh=t5nl6y2O6IgT0e/ZuzCiLyQqjUIoNfNuArPk5eRLqlg=;
        b=HVnsHdx4ZIUui3NwlPJiGTFqJz5ubI43uKujgvi1YqsZdYRyHzzI4sR7JLjPtt/+9K
         QPCOHLeQSfbzefaDU9n5dgItPHFqlUHjmIhYVf40Esdl4GaQaGMs0o/w4ACe/HNGzkyG
         96oO40ISWJdOdYam0jYNXi8Jn6assMv64zKV1O9t4yp2YOCdPecdcRtd0+nG/27ncYga
         hQJ2PiefCEeiJC9/hacTxWfSAm+ujhKkx7WVEXlSQ6tk4/SVBgvhF8wMnh59tFjl/aOg
         WiAY+34PMpkUutIMTM4f0FNEswpGLLbmcpgPaGD70LlTzx26gEzIioaL/1BD03pM6FL3
         IQ2Q==;
        dara=google.com
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@flowcrypt.com header.s=yjehtjjlvy2a4qphlkpas5iatxgdfgas header.b=XRLm4Kje;
       dkim=pass header.i=@amazonses.com header.s=54ecsf3zk7z4mwxwwox7z7bg6e5gwjsz header.b=oVBljSBL;
       spf=pass (google.com: domain of 01070192d5817629-61b39e7c-0e98-4d85-a699-832075958a2c-000000@eu-central-1.amazonses.com designates 69.169.224.13 as permitted sender) smtp.mailfrom=01070192d5817629-61b39e7c-0e98-4d85-a699-832075958a2c-000000@eu-central-1.amazonses.com;
       dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=flowcrypt.com
Return-Path: <01070192d5817629-61b39e7c-0e98-4d85-a699-832075958a2c-000000@eu-central-1.amazonses.com>
Received: from b224-13.smtp-out.eu-central-1.amazonses.com (b224-13.smtp-out.eu-central-1.amazonses.com. [69.169.224.13])
        by mx.google.com with ESMTPS id ffacd0b85a97d-38058b68048si5032326f8f.493.2024.10.28.16.41.24
        for <e2e.enterprise.test@flowcrypt.com>
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 28 Oct 2024 16:41:24 -0700 (PDT)
Received-SPF: pass (google.com: domain of 01070192d5817629-61b39e7c-0e98-4d85-a699-832075958a2c-000000@eu-central-1.amazonses.com designates 69.169.224.13 as permitted sender) client-ip=69.169.224.13;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@flowcrypt.com header.s=yjehtjjlvy2a4qphlkpas5iatxgdfgas header.b=XRLm4Kje;
       dkim=pass header.i=@amazonses.com header.s=54ecsf3zk7z4mwxwwox7z7bg6e5gwjsz header.b=oVBljSBL;
       spf=pass (google.com: domain of 01070192d5817629-61b39e7c-0e98-4d85-a699-832075958a2c-000000@eu-central-1.amazonses.com designates 69.169.224.13 as permitted sender) smtp.mailfrom=01070192d5817629-61b39e7c-0e98-4d85-a699-832075958a2c-000000@eu-central-1.amazonses.com;
       dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=flowcrypt.com
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple;
	s=yjehtjjlvy2a4qphlkpas5iatxgdfgas; d=flowcrypt.com; t=1730158884;
	h=Content-Type:MIME-Version:Subject:From:To:Reply-To:Message-ID:Date;
	bh=VJ7duuGM4P43ZKthHd+W+sBUDFw2DejzKl6Brk98GzQ=;
	b=XRLm4KjeMnFo/2tyFa1GAwylsLBtuaW8eeFOZJXoL3NU63v9VNv2gKHgP7VuBEFq
	ZNuTSE4JQcT5LDtxOYhivcZEoNh2G+EZl+1SS9fJlWsrEfkgdcUuKlNBYng4ZIq2TQA
	9W1hWCYfbU1ei7brBydwhdLhl3V5M4fSX4fQXopM=
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple;
	s=54ecsf3zk7z4mwxwwox7z7bg6e5gwjsz; d=amazonses.com; t=1730158884;
	h=Content-Type:MIME-Version:Subject:From:To:Reply-To:Message-ID:Date:Feedback-ID;
	bh=VJ7duuGM4P43ZKthHd+W+sBUDFw2DejzKl6Brk98GzQ=;
	b=oVBljSBL+Ryq2a89kpwBcjrBKE12YJD0Ons36L+U+VygMapMlvdXnMzrxUKMuVBC
	7IEYaH0beP5OdTMXqGqPhGkJanYwHVwLaMC1xr8laPwk/dv4mg19H3G4w793uHowjrc
	INIZtRQldU6b7eFznENC85t9q1kwxxXHjImQdZrw=
Content-Type: multipart/mixed; boundary="===============8921743240882101210=="
MIME-Version: 1.0
Subject: FlowCrypt Profile message from test@gmail.com
From: Encrypted Contact Page <robot@flowcrypt.com>
To: e2e.enterprise.test@flowcrypt.com
Reply-To: test@gmail.com
Message-ID: <01070192d5817629-61b39e7c-0e98-4d85-a699-832075958a2c-000000@eu-central-1.amazonses.com>
Date: Mon, 28 Oct 2024 23:41:24 +0000
Feedback-ID: ::1.eu-central-1.0VHf9wp8PNghVoi6sGceo9+9BOCqeuEduUkL8W73RUU=:AmazonSES
X-SES-Outgoing: 2024.10.28-69.169.224.13

--===============8921743240882101210==
Content-Type: multipart/alternative; boundary="===============0980079176639676948=="
MIME-Version: 1.0

--===============0980079176639676948==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

VGhpcyBtZXNzYWdlIHdhcyBzdWJtaXR0ZWQgdGhyb3VnaCBhIHdlYiBmb3JtLiBUaGUgc2VuZGVy
J3MgZW1haWwgYWRkcmVzcyB3YXMgbm90IHZlcmlmaWVkLgoKLS0tLS1CRUdJTiBQR1AgTUVTU0FH
RS0tLS0tDQoKCndWNERUMlpsU21oWjFHb1NBUWRBeDB1bG55U0lUZjBlS29IQWVMaGlYc0ZzYVZv
ZkJGNlNTUWR5SkVBTQpmWE13TU9ZUnNNU0hvQ0tONHdGVGxDTVJ4T2IvNFRDRVlCWkt5Ly84L2VL
N3g3SzVBUUpiMkYrNGt1UzQKVW5FRWYrTUowc0RFQWJIOVZEZXJjMS9VMS9GMlBYQUFtOTBKdlk3
SVEzVm4vUXl4eHp4czY5dmJncVlLCkMzMGNrMXBObEhRWGM3QmFMZk5HMFFvY3JIRFpmQWhvR0JH
LzczVWxxbEkzemFkTC9JLy8rQ2dPbExGUApydVpOdWcrbytNVm42Yk5MdU1Gb1pHc1lueXI1aGdl
cmVwZDFJTXF0MlIvdnI0K2U1Zzk5VTF2aGc2RkUKZ29RVmMyazhZS2tlSzlhNHN2MlVyRjFEalU4
VzlCZXNXOHN4NmlrZjh2dlg1OXkrbmRqUW5GUStVVjN3CldaUFFGS0xJelVvVUVqYlArZDdQb2FJ
d1ZQUTJVcjZKZnJxS2VzYkJWOTBwVEhIQUNoc1N1Qzdzcjh5WgpFNmFtVURheEhqUkx4SzNhVTlB
NnJiOUwxOWh0a01zelYwU01ZeHdhQ3V5VHJ3eUJ0bXNTMkVJZkhUa24Ka0YxeWx5Y3JpQVpIOEp6
ZFVjaWFySkxUNTl4cmUyZk5kRXFYNFcrbjVSS1RUMks1UXFRSDlXbldBZEtnCkJab3NHTGlsTVZq
bVVzalNKS0s5ZUVKNlNVZFF4WFpybW9FbXBkckhDY3pJTGtjSXJwSXNMOG90Y2dodwpQSVYrWGhn
eTl0MHVRQXR2bXBzN1ErOUU4UGpDRmtoOVpKTGpXcmM4c0ljUGtVV293dz09Cj16L0V2Ci0tLS0t
RU5EIFBHUCBNRVNTQUdFLS0tLS0NCg==

--===============0980079176639676948==--

--===============8921743240882101210==--
",
+    "historyId": "320850",
+    "internalDate": "1730158884000"
+  }
+}

appium/api-mocks/apis/google/google-messages.ts

@@ -30,4 +30,5 @@ export type GoogleMockMessage =
   | 'Test forward message with attached pub key'
   | 'Encrypted email with public key attached'
   | 'Email with another user public key attached'
-  | 'Test remote images #2414';
+  | 'Test remote images #2414'
+  | 'Test encrypted message sent via encrypted contact page with attachment';

appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts

@@ -0,0 +1,31 @@
+import { MockApi } from 'api-mocks/mock';
+import { MockApiConfig } from 'api-mocks/mock-config';
+import { SplashScreen, SetupKeyScreen, MailFolderScreen, EmailScreen } from '../../../screenobjects/all-screens';
+
+describe('INBOX: ', () => {
+  it('user is able to view correct attachment for email sent via encrypted contact page', async () => {
+    const mockApi = new MockApi();
+    const subject = 'Test encrypted message sent via encrypted contact page with attachment';
+
+    mockApi.fesConfig = MockApiConfig.defaultEnterpriseFesConfiguration;
+    mockApi.ekmConfig = MockApiConfig.defaultEnterpriseEkmConfiguration;
+    mockApi.addGoogleAccount('[email protected]', {
+      messages: [subject],
+    });
+
+    await mockApi.withMockedApis(async () => {
+      await SplashScreen.mockLogin();
+      await SetupKeyScreen.setPassPhrase();
+      await MailFolderScreen.checkInboxScreen();
+
+      // check if email is decrypted successfully
+      await MailFolderScreen.clickOnEmailBySubject(subject);
+      await EmailScreen.checkOpenedEmail(
+        '[email protected]',
+        subject,
+        'Test encrypted attachment sent via encrypted contact page',
+      );
+      await EmailScreen.checkAttachment('manifest.json.pgp');
+    });
+  });
+});