From bf18d8779e980da0cda4ec87609340c0fc4b18c9 Mon Sep 17 00:00:00 2001 From: Ioan Moldovan Date: Fri, 25 Oct 2024 07:56:24 -0500 Subject: [PATCH 1/6] fix: decryption error for message sent via encrypted contact page --- FlowCrypt/Core/CoreTypes.swift | 3 ++- .../Message Provider/MessageAttachment.swift | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/FlowCrypt/Core/CoreTypes.swift b/FlowCrypt/Core/CoreTypes.swift index 7675ba26e..b2407a9b7 100644 --- a/FlowCrypt/Core/CoreTypes.swift +++ b/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? } diff --git a/FlowCrypt/Functionality/Mail Provider/Message Provider/MessageAttachment.swift b/FlowCrypt/Functionality/Mail Provider/Message Provider/MessageAttachment.swift index 819f7f048..b9525708d 100644 --- a/FlowCrypt/Functionality/Mail Provider/Message Provider/MessageAttachment.swift +++ b/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) } } From da002a95fbc82d1f4467028411efa0544cdf191c Mon Sep 17 00:00:00 2001 From: Ioan Moldovan Date: Mon, 28 Oct 2024 05:07:48 -0500 Subject: [PATCH 2/6] feat: added ui test --- .../Message Provider/MessageAttachment.swift | 1 - .../message-export-192034e00bf60620.json | 110 ++++++++++++++++++ .../api-mocks/apis/google/google-messages.ts | 3 +- ...achmentSentViaEncryptedContactPage.spec.ts | 34 ++++++ 4 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 appium/api-mocks/apis/google/exported-messages/message-export-192034e00bf60620.json create mode 100644 appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts diff --git a/FlowCrypt/Functionality/Mail Provider/Message Provider/MessageAttachment.swift b/FlowCrypt/Functionality/Mail Provider/Message Provider/MessageAttachment.swift index b9525708d..4342739ca 100644 --- a/FlowCrypt/Functionality/Mail Provider/Message Provider/MessageAttachment.swift +++ b/FlowCrypt/Functionality/Mail Provider/Message Provider/MessageAttachment.swift @@ -58,7 +58,6 @@ extension MessageAttachment { // 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 } diff --git a/appium/api-mocks/apis/google/exported-messages/message-export-192034e00bf60620.json b/appium/api-mocks/apis/google/exported-messages/message-export-192034e00bf60620.json new file mode 100644 index 000000000..690458e6a --- /dev/null +++ b/appium/api-mocks/apis/google/exported-messages/message-export-192034e00bf60620.json @@ -0,0 +1,110 @@ +{ + "acctEmail": "ioan@flowcrypt.com", + "full": { + "id": "192034e00bf60620", + "threadId": "192034e00bf60620", + "labelIds": ["IMPORTANT", "CATEGORY_PERSONAL", "INBOX"], + "snippet": "This message was submitted through a web form. The sender's email address was not verified. -----BEGIN PGP MESSAGE----- wV4DFoVj1Xbgy4YSAQdAcYqPTAS8/JcgxG3IDH5g9giRTqAXVb+OI0U1MMhU", + "payload": { + "partId": "", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"===============3114123543569651689==\"" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Subject", + "value": "Test encrypted message sent via encrypted contact page with attachment" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Reply-To", + "value": "free.dev.soft@gmail.com" + }, + { + "name": "Date", + "value": "Wed, 18 Sep 2024 04:04:56 +0000" + }, + { + "name": "X-SES-Outgoing", + "value": "2024.09.18-69.169.224.13" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "multipart/alternative", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/alternative; boundary=\"===============7260904729130733508==\"" + }, + { + "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": 763, + "data": "VGhpcyBtZXNzYWdlIHdhcyBzdWJtaXR0ZWQgdGhyb3VnaCBhIHdlYiBmb3JtLiBUaGUgc2VuZGVyJ3MgZW1haWwgYWRkcmVzcyB3YXMgbm90IHZlcmlmaWVkLgoKLS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQoKCndWNERGb1ZqMVhiZ3k0WVNBUWRBY1lxUFRBUzgvSmNneEczSURINWc5Z2lSVHFBWFZiK09JMFUxTU1oVQpOQUF3MW5DZ2xjOHZ2Z1p0U1FUdjZDaE1hRkh2SEZMSGNqemNzZkhKd05uTjVDVDNkK1hJQjJpY2EydnEKSlpPYk45Qkwwc0NhQVhRVkk5Q1VTT3JZQ0RqSkNqdlJtMGh6WlJBTVhmbFdlV1QxeE5iOWRZcWJsUGpICi9GU2VtanJid3FBNmhNa01KTWIzYnJXNHhxRkxJcnN2b0YxNWlEcDNaQUE0YVl6a1lqWWVrY2RxcStlYQpsU3dxd2p6ODNpcjI3UnhJYWhLakptekF6eEdtaC95L3pyWHhHWkNLY3dQTGZvSXo2WEZLdjRjVy9yYWMKVEQ5K1B4akhKV1ZOdUcwdzBHdExEeHpKcXEydDlvUnlBUHhTYzk2RWdha08yZVZlMElrSVk1UW5ycUQ2CmhkeEZGQVBxeE50a2xvOCsyOWo4ZTV4WThuVDNZeDJoRnNwSVFjZy9mcFpXRlBBdU1Oc1BGakZzZUpPcAp2R0JpeE95dHVGazA4L2dRK3UwL1Eza3lMR3ZSaHlSb0pvTDF2T2tXdjhscHFLd0dwYW9FTVlGeUt3QXQKeUlSeW5SL1dnZzI0Uk5za2Foa0Y2T09qeU9VRDN1VXNyeE1GUU9jcnllMXozSjdxaThGQjVLTGJEVE5vCkVYTDBwZXlqZkxQOTRwMlM2NXlocElENUNkb20xUlJQcGhvK2U5Nm10Ly8xY0F6MEdFVGFxQT09Cj1Rd1VUCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg==" + } + } + ] + } + ] + }, + "sizeEstimate": 6445, + "historyId": "296121", + "internalDate": "1726632296000" + }, + "attachments": {}, + "raw": { + "id": "192034e00bf60620", + "threadId": "192034e00bf60620", + "labelIds": ["IMPORTANT", "CATEGORY_PERSONAL", "INBOX"], + "snippet": "This message was submitted through a web form. The sender's email address was not verified. -----BEGIN PGP MESSAGE----- wV4DFoVj1Xbgy4YSAQdAcYqPTAS8/JcgxG3IDH5g9giRTqAXVb+OI0U1MMhU", + "sizeEstimate": 6445, + "raw": "Delivered-To: ioan@flowcrypt.com
Received: by 2002:a05:6358:2d86:b0:1b8:35dc:1a1f with SMTP id m6csp419531rwn;
        Tue, 17 Sep 2024 21:04:56 -0700 (PDT)
X-Google-Smtp-Source: AGHT+IF42CCMxRwbXu6aL0PAEL0P5UCjbwZrNwqQHeRQTT6zYnO94X4PQE+htJUxbeOcFM2j01Uu
X-Received: by 2002:a05:600c:1c88:b0:42c:c1f6:6ded with SMTP id 5b1f17b1804b1-42cdb56f049mr162468825e9.29.1726632296737;
        Tue, 17 Sep 2024 21:04:56 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1726632296; cv=none;
        d=google.com; s=arc-20240605;
        b=lq+TpB9gXnbNfGZJ1zpUePVxeG6VfaEqQRSsRLoZJLUcnWpt9/ASbXHA2W4iuw+Md0
         Ol3VpWbnchjURakmFDCspZKXFnvyAYANLccP9O7nWM6r9oANXWYvrV9TGRbqH6JCIsFi
         X7xKCszOOKC836oqAy4Rxt6C2T9sjbZv5/tQ+U5zIdAiKiMmPoohOrixSXsZb3f7VN+Z
         9yYqIP593bU5HDdXbGbLagJCAPpfmwqaKR8Hh0SuGzY1S8ZF75zkacEOTTw6Hvg9FIch
         E9sEnZQPYIIRM8qbiAJ02JzZYaSG8rawbE755J0JmvZsFKdPrXeDERVnMaU0T4pjv+iM
         /iOw==
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=mf7qGsDLh67NjvbucRuJjeeqNAMX8+vqPKIGvazDq/U=;
        fh=rV6ZMracmg9X5MGmjoXuRzbfxtjDRWRfA3ZFKA3Qd/c=;
        b=j1Kgz1eXciOFveSnFUwKbq7wATz/fxIXPzP9O2RAPnMN67G06bavrNDafL/iMggkIt
         dX5dHo5B4kBARDbpb7iwf1KEJSx0Xnm1aFxe855irvVxoqKesoLfTmIDY9QBUAnXIplp
         s+KJ9pBt/RtjfimdFgBuzSe7zP4mMtnilfBN9h3Mi5u7W4uQ8G0joX9Fm3g/5cz2nWCD
         gNZKvy9N3F6XubUtk0dxEzwV0QS2zKqXgbKC52Dr1WUicfQahyJKQAISNk/spVMpe3N4
         Zx1j1uoSqYLyzqJU+YBDcdoHnpf2XeWPn7G5pnAtLXePUwBfuuAr3sqH2oTAtwjgCr3A
         rR/Q==;
        dara=google.com
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@flowcrypt.com header.s=n2my7aiqplahqgr5fk3vt772xbxoat4i header.b=JGXedkAT;
       dkim=pass header.i=@amazonses.com header.s=qftdzk2dqsatjnlrq4r5brjbihpfcrsh header.b=TQ0Crfhz;
       spf=pass (google.com: domain of 01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-000000@eu-central-1.amazonses.com designates 69.169.224.13 as permitted sender) smtp.mailfrom=01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-000000@eu-central-1.amazonses.com;
       dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=flowcrypt.com
Return-Path: <01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-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-378e7802e6dsi3844989f8f.367.2024.09.17.21.04.56
        for <ioan@flowcrypt.com>
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Tue, 17 Sep 2024 21:04:56 -0700 (PDT)
Received-SPF: pass (google.com: domain of 01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-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=n2my7aiqplahqgr5fk3vt772xbxoat4i header.b=JGXedkAT;
       dkim=pass header.i=@amazonses.com header.s=qftdzk2dqsatjnlrq4r5brjbihpfcrsh header.b=TQ0Crfhz;
       spf=pass (google.com: domain of 01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-000000@eu-central-1.amazonses.com designates 69.169.224.13 as permitted sender) smtp.mailfrom=01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-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=n2my7aiqplahqgr5fk3vt772xbxoat4i; d=flowcrypt.com; t=1726632296;
	h=Content-Type:MIME-Version:Subject:From:To:Reply-To:Message-ID:Date;
	bh=mf7qGsDLh67NjvbucRuJjeeqNAMX8+vqPKIGvazDq/U=;
	b=JGXedkATBXbtAnJUWZkpUXWfhDMmiWbQxaWhbxBocyATWmYVn70ZfyYCTR02UL3/
	KVkklLtQKmRWPcfjkswAMeFneMRq2PZuG9eS3gzSz6JV0eFXnkyCYteECvIwcwmf4y8
	zpY+BouMT4cqoZ/lubbvFTik5M/J1YKquZ4wyQrM=
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple;
	s=qftdzk2dqsatjnlrq4r5brjbihpfcrsh; d=amazonses.com; t=1726632296;
	h=Content-Type:MIME-Version:Subject:From:To:Reply-To:Message-ID:Date:Feedback-ID;
	bh=mf7qGsDLh67NjvbucRuJjeeqNAMX8+vqPKIGvazDq/U=;
	b=TQ0CrfhzMebB2ZL16caks4v2mYx+E8jejb/XfAjt6c3dZKxeZINsDvUyoMiB2JpS
	eQ1+KqpLuZDJmrFWnlXQEtgB88U6igCod3yd61jLMS49Q4Y/uIBbdB4Xb/bXNKwAwyv
	OTqmqiCPRfaywuGSpEBwatjFnR4f2PMJUhik9FKk=
Content-Type: multipart/mixed; boundary="===============3114123543569651689=="
MIME-Version: 1.0
Subject: FlowCrypt Profile message from free.dev.soft@gmail.com
From: Encrypted Contact Page <robot@flowcrypt.com>
To: ioan@flowcrypt.com
Reply-To: free.dev.soft@gmail.com
Message-ID: <01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-000000@eu-central-1.amazonses.com>
Date: Wed, 18 Sep 2024 04:04:56 +0000
Feedback-ID: ::1.eu-central-1.0VHf9wp8PNghVoi6sGceo9+9BOCqeuEduUkL8W73RUU=:AmazonSES
X-SES-Outgoing: 2024.09.18-69.169.224.13

--===============3114123543569651689==
Content-Type: multipart/alternative; boundary="===============7260904729130733508=="
MIME-Version: 1.0

--===============7260904729130733508==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

VGhpcyBtZXNzYWdlIHdhcyBzdWJtaXR0ZWQgdGhyb3VnaCBhIHdlYiBmb3JtLiBUaGUgc2VuZGVy
J3MgZW1haWwgYWRkcmVzcyB3YXMgbm90IHZlcmlmaWVkLgoKLS0tLS1CRUdJTiBQR1AgTUVTU0FH
RS0tLS0tDQoKCndWNERGb1ZqMVhiZ3k0WVNBUWRBY1lxUFRBUzgvSmNneEczSURINWc5Z2lSVHFB
WFZiK09JMFUxTU1oVQpOQUF3MW5DZ2xjOHZ2Z1p0U1FUdjZDaE1hRkh2SEZMSGNqemNzZkhKd05u
TjVDVDNkK1hJQjJpY2EydnEKSlpPYk45Qkwwc0NhQVhRVkk5Q1VTT3JZQ0RqSkNqdlJtMGh6WlJB
TVhmbFdlV1QxeE5iOWRZcWJsUGpICi9GU2VtanJid3FBNmhNa01KTWIzYnJXNHhxRkxJcnN2b0Yx
NWlEcDNaQUE0YVl6a1lqWWVrY2RxcStlYQpsU3dxd2p6ODNpcjI3UnhJYWhLakptekF6eEdtaC95
L3pyWHhHWkNLY3dQTGZvSXo2WEZLdjRjVy9yYWMKVEQ5K1B4akhKV1ZOdUcwdzBHdExEeHpKcXEy
dDlvUnlBUHhTYzk2RWdha08yZVZlMElrSVk1UW5ycUQ2CmhkeEZGQVBxeE50a2xvOCsyOWo4ZTV4
WThuVDNZeDJoRnNwSVFjZy9mcFpXRlBBdU1Oc1BGakZzZUpPcAp2R0JpeE95dHVGazA4L2dRK3Uw
L1Eza3lMR3ZSaHlSb0pvTDF2T2tXdjhscHFLd0dwYW9FTVlGeUt3QXQKeUlSeW5SL1dnZzI0Uk5z
a2Foa0Y2T09qeU9VRDN1VXNyeE1GUU9jcnllMXozSjdxaThGQjVLTGJEVE5vCkVYTDBwZXlqZkxQ
OTRwMlM2NXlocElENUNkb20xUlJQcGhvK2U5Nm10Ly8xY0F6MEdFVGFxQT09Cj1Rd1VUCi0tLS0t
RU5EIFBHUCBNRVNTQUdFLS0tLS0NCg==

--===============7260904729130733508==--

--===============3114123543569651689==--
", + "historyId": "296121", + "internalDate": "1726632296000" + } +} diff --git a/appium/api-mocks/apis/google/google-messages.ts b/appium/api-mocks/apis/google/google-messages.ts index f5a9f6402..011b62476 100644 --- a/appium/api-mocks/apis/google/google-messages.ts +++ b/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'; diff --git a/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts b/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts new file mode 100644 index 000000000..93442e633 --- /dev/null +++ b/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts @@ -0,0 +1,34 @@ +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('e2e.enterprise.test@flowcrypt.com', { + messages: [subject], + }); + + await mockApi.withMockedApis(async () => { + await SplashScreen.mockLogin(); + await SetupKeyScreen.setPassPhrase(); + await MailFolderScreen.checkInboxScreen(); + + // signed+encrypted message + await MailFolderScreen.clickOnEmailBySubject(subject); + + await EmailScreen.checkEncryptionBadge('encrypted'); + await EmailScreen.checkSignatureBadge('signed'); + await EmailScreen.clickBackButton(); + + // signed only message + await MailFolderScreen.clickOnEmailBySubject(subject); + await EmailScreen.checkOpenedEmail('sender@domain.com', subject, 'Test attachment'); + await EmailScreen.checkAttachment('manifest.json'); + }); + }); +}); From 142b5418201272c4cec3e3243359aaf07013e4c9 Mon Sep 17 00:00:00 2001 From: Ioan Moldovan Date: Mon, 28 Oct 2024 18:44:53 -0500 Subject: [PATCH 3/6] fix: ui test --- .../message-export-192034e00bf60620.json | 110 ------------------ .../message-export-192d58178bf2ca46.json | 110 ++++++++++++++++++ ...achmentSentViaEncryptedContactPage.spec.ts | 6 +- 3 files changed, 115 insertions(+), 111 deletions(-) delete mode 100644 appium/api-mocks/apis/google/exported-messages/message-export-192034e00bf60620.json create mode 100644 appium/api-mocks/apis/google/exported-messages/message-export-192d58178bf2ca46.json diff --git a/appium/api-mocks/apis/google/exported-messages/message-export-192034e00bf60620.json b/appium/api-mocks/apis/google/exported-messages/message-export-192034e00bf60620.json deleted file mode 100644 index 690458e6a..000000000 --- a/appium/api-mocks/apis/google/exported-messages/message-export-192034e00bf60620.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "acctEmail": "ioan@flowcrypt.com", - "full": { - "id": "192034e00bf60620", - "threadId": "192034e00bf60620", - "labelIds": ["IMPORTANT", "CATEGORY_PERSONAL", "INBOX"], - "snippet": "This message was submitted through a web form. The sender's email address was not verified. -----BEGIN PGP MESSAGE----- wV4DFoVj1Xbgy4YSAQdAcYqPTAS8/JcgxG3IDH5g9giRTqAXVb+OI0U1MMhU", - "payload": { - "partId": "", - "mimeType": "multipart/mixed", - "filename": "", - "headers": [ - { - "name": "Content-Type", - "value": "multipart/mixed; boundary=\"===============3114123543569651689==\"" - }, - { - "name": "MIME-Version", - "value": "1.0" - }, - { - "name": "Subject", - "value": "Test encrypted message sent via encrypted contact page with attachment" - }, - { - "name": "From", - "value": "sender@domain.com" - }, - { - "name": "To", - "value": "flowcrypt.compatibility@gmail.com" - }, - { - "name": "Reply-To", - "value": "free.dev.soft@gmail.com" - }, - { - "name": "Date", - "value": "Wed, 18 Sep 2024 04:04:56 +0000" - }, - { - "name": "X-SES-Outgoing", - "value": "2024.09.18-69.169.224.13" - } - ], - "body": { - "size": 0 - }, - "parts": [ - { - "partId": "0", - "mimeType": "multipart/alternative", - "filename": "", - "headers": [ - { - "name": "Content-Type", - "value": "multipart/alternative; boundary=\"===============7260904729130733508==\"" - }, - { - "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": 763, - "data": "VGhpcyBtZXNzYWdlIHdhcyBzdWJtaXR0ZWQgdGhyb3VnaCBhIHdlYiBmb3JtLiBUaGUgc2VuZGVyJ3MgZW1haWwgYWRkcmVzcyB3YXMgbm90IHZlcmlmaWVkLgoKLS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQoKCndWNERGb1ZqMVhiZ3k0WVNBUWRBY1lxUFRBUzgvSmNneEczSURINWc5Z2lSVHFBWFZiK09JMFUxTU1oVQpOQUF3MW5DZ2xjOHZ2Z1p0U1FUdjZDaE1hRkh2SEZMSGNqemNzZkhKd05uTjVDVDNkK1hJQjJpY2EydnEKSlpPYk45Qkwwc0NhQVhRVkk5Q1VTT3JZQ0RqSkNqdlJtMGh6WlJBTVhmbFdlV1QxeE5iOWRZcWJsUGpICi9GU2VtanJid3FBNmhNa01KTWIzYnJXNHhxRkxJcnN2b0YxNWlEcDNaQUE0YVl6a1lqWWVrY2RxcStlYQpsU3dxd2p6ODNpcjI3UnhJYWhLakptekF6eEdtaC95L3pyWHhHWkNLY3dQTGZvSXo2WEZLdjRjVy9yYWMKVEQ5K1B4akhKV1ZOdUcwdzBHdExEeHpKcXEydDlvUnlBUHhTYzk2RWdha08yZVZlMElrSVk1UW5ycUQ2CmhkeEZGQVBxeE50a2xvOCsyOWo4ZTV4WThuVDNZeDJoRnNwSVFjZy9mcFpXRlBBdU1Oc1BGakZzZUpPcAp2R0JpeE95dHVGazA4L2dRK3UwL1Eza3lMR3ZSaHlSb0pvTDF2T2tXdjhscHFLd0dwYW9FTVlGeUt3QXQKeUlSeW5SL1dnZzI0Uk5za2Foa0Y2T09qeU9VRDN1VXNyeE1GUU9jcnllMXozSjdxaThGQjVLTGJEVE5vCkVYTDBwZXlqZkxQOTRwMlM2NXlocElENUNkb20xUlJQcGhvK2U5Nm10Ly8xY0F6MEdFVGFxQT09Cj1Rd1VUCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg==" - } - } - ] - } - ] - }, - "sizeEstimate": 6445, - "historyId": "296121", - "internalDate": "1726632296000" - }, - "attachments": {}, - "raw": { - "id": "192034e00bf60620", - "threadId": "192034e00bf60620", - "labelIds": ["IMPORTANT", "CATEGORY_PERSONAL", "INBOX"], - "snippet": "This message was submitted through a web form. The sender's email address was not verified. -----BEGIN PGP MESSAGE----- wV4DFoVj1Xbgy4YSAQdAcYqPTAS8/JcgxG3IDH5g9giRTqAXVb+OI0U1MMhU", - "sizeEstimate": 6445, - "raw": "Delivered-To: ioan@flowcrypt.com
Received: by 2002:a05:6358:2d86:b0:1b8:35dc:1a1f with SMTP id m6csp419531rwn;
        Tue, 17 Sep 2024 21:04:56 -0700 (PDT)
X-Google-Smtp-Source: AGHT+IF42CCMxRwbXu6aL0PAEL0P5UCjbwZrNwqQHeRQTT6zYnO94X4PQE+htJUxbeOcFM2j01Uu
X-Received: by 2002:a05:600c:1c88:b0:42c:c1f6:6ded with SMTP id 5b1f17b1804b1-42cdb56f049mr162468825e9.29.1726632296737;
        Tue, 17 Sep 2024 21:04:56 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1726632296; cv=none;
        d=google.com; s=arc-20240605;
        b=lq+TpB9gXnbNfGZJ1zpUePVxeG6VfaEqQRSsRLoZJLUcnWpt9/ASbXHA2W4iuw+Md0
         Ol3VpWbnchjURakmFDCspZKXFnvyAYANLccP9O7nWM6r9oANXWYvrV9TGRbqH6JCIsFi
         X7xKCszOOKC836oqAy4Rxt6C2T9sjbZv5/tQ+U5zIdAiKiMmPoohOrixSXsZb3f7VN+Z
         9yYqIP593bU5HDdXbGbLagJCAPpfmwqaKR8Hh0SuGzY1S8ZF75zkacEOTTw6Hvg9FIch
         E9sEnZQPYIIRM8qbiAJ02JzZYaSG8rawbE755J0JmvZsFKdPrXeDERVnMaU0T4pjv+iM
         /iOw==
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=mf7qGsDLh67NjvbucRuJjeeqNAMX8+vqPKIGvazDq/U=;
        fh=rV6ZMracmg9X5MGmjoXuRzbfxtjDRWRfA3ZFKA3Qd/c=;
        b=j1Kgz1eXciOFveSnFUwKbq7wATz/fxIXPzP9O2RAPnMN67G06bavrNDafL/iMggkIt
         dX5dHo5B4kBARDbpb7iwf1KEJSx0Xnm1aFxe855irvVxoqKesoLfTmIDY9QBUAnXIplp
         s+KJ9pBt/RtjfimdFgBuzSe7zP4mMtnilfBN9h3Mi5u7W4uQ8G0joX9Fm3g/5cz2nWCD
         gNZKvy9N3F6XubUtk0dxEzwV0QS2zKqXgbKC52Dr1WUicfQahyJKQAISNk/spVMpe3N4
         Zx1j1uoSqYLyzqJU+YBDcdoHnpf2XeWPn7G5pnAtLXePUwBfuuAr3sqH2oTAtwjgCr3A
         rR/Q==;
        dara=google.com
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@flowcrypt.com header.s=n2my7aiqplahqgr5fk3vt772xbxoat4i header.b=JGXedkAT;
       dkim=pass header.i=@amazonses.com header.s=qftdzk2dqsatjnlrq4r5brjbihpfcrsh header.b=TQ0Crfhz;
       spf=pass (google.com: domain of 01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-000000@eu-central-1.amazonses.com designates 69.169.224.13 as permitted sender) smtp.mailfrom=01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-000000@eu-central-1.amazonses.com;
       dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=flowcrypt.com
Return-Path: <01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-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-378e7802e6dsi3844989f8f.367.2024.09.17.21.04.56
        for <ioan@flowcrypt.com>
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Tue, 17 Sep 2024 21:04:56 -0700 (PDT)
Received-SPF: pass (google.com: domain of 01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-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=n2my7aiqplahqgr5fk3vt772xbxoat4i header.b=JGXedkAT;
       dkim=pass header.i=@amazonses.com header.s=qftdzk2dqsatjnlrq4r5brjbihpfcrsh header.b=TQ0Crfhz;
       spf=pass (google.com: domain of 01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-000000@eu-central-1.amazonses.com designates 69.169.224.13 as permitted sender) smtp.mailfrom=01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-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=n2my7aiqplahqgr5fk3vt772xbxoat4i; d=flowcrypt.com; t=1726632296;
	h=Content-Type:MIME-Version:Subject:From:To:Reply-To:Message-ID:Date;
	bh=mf7qGsDLh67NjvbucRuJjeeqNAMX8+vqPKIGvazDq/U=;
	b=JGXedkATBXbtAnJUWZkpUXWfhDMmiWbQxaWhbxBocyATWmYVn70ZfyYCTR02UL3/
	KVkklLtQKmRWPcfjkswAMeFneMRq2PZuG9eS3gzSz6JV0eFXnkyCYteECvIwcwmf4y8
	zpY+BouMT4cqoZ/lubbvFTik5M/J1YKquZ4wyQrM=
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple;
	s=qftdzk2dqsatjnlrq4r5brjbihpfcrsh; d=amazonses.com; t=1726632296;
	h=Content-Type:MIME-Version:Subject:From:To:Reply-To:Message-ID:Date:Feedback-ID;
	bh=mf7qGsDLh67NjvbucRuJjeeqNAMX8+vqPKIGvazDq/U=;
	b=TQ0CrfhzMebB2ZL16caks4v2mYx+E8jejb/XfAjt6c3dZKxeZINsDvUyoMiB2JpS
	eQ1+KqpLuZDJmrFWnlXQEtgB88U6igCod3yd61jLMS49Q4Y/uIBbdB4Xb/bXNKwAwyv
	OTqmqiCPRfaywuGSpEBwatjFnR4f2PMJUhik9FKk=
Content-Type: multipart/mixed; boundary="===============3114123543569651689=="
MIME-Version: 1.0
Subject: FlowCrypt Profile message from free.dev.soft@gmail.com
From: Encrypted Contact Page <robot@flowcrypt.com>
To: ioan@flowcrypt.com
Reply-To: free.dev.soft@gmail.com
Message-ID: <01070192034dfec7-30528ce3-75b4-4d20-a1d5-2962f5a97091-000000@eu-central-1.amazonses.com>
Date: Wed, 18 Sep 2024 04:04:56 +0000
Feedback-ID: ::1.eu-central-1.0VHf9wp8PNghVoi6sGceo9+9BOCqeuEduUkL8W73RUU=:AmazonSES
X-SES-Outgoing: 2024.09.18-69.169.224.13

--===============3114123543569651689==
Content-Type: multipart/alternative; boundary="===============7260904729130733508=="
MIME-Version: 1.0

--===============7260904729130733508==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

VGhpcyBtZXNzYWdlIHdhcyBzdWJtaXR0ZWQgdGhyb3VnaCBhIHdlYiBmb3JtLiBUaGUgc2VuZGVy
J3MgZW1haWwgYWRkcmVzcyB3YXMgbm90IHZlcmlmaWVkLgoKLS0tLS1CRUdJTiBQR1AgTUVTU0FH
RS0tLS0tDQoKCndWNERGb1ZqMVhiZ3k0WVNBUWRBY1lxUFRBUzgvSmNneEczSURINWc5Z2lSVHFB
WFZiK09JMFUxTU1oVQpOQUF3MW5DZ2xjOHZ2Z1p0U1FUdjZDaE1hRkh2SEZMSGNqemNzZkhKd05u
TjVDVDNkK1hJQjJpY2EydnEKSlpPYk45Qkwwc0NhQVhRVkk5Q1VTT3JZQ0RqSkNqdlJtMGh6WlJB
TVhmbFdlV1QxeE5iOWRZcWJsUGpICi9GU2VtanJid3FBNmhNa01KTWIzYnJXNHhxRkxJcnN2b0Yx
NWlEcDNaQUE0YVl6a1lqWWVrY2RxcStlYQpsU3dxd2p6ODNpcjI3UnhJYWhLakptekF6eEdtaC95
L3pyWHhHWkNLY3dQTGZvSXo2WEZLdjRjVy9yYWMKVEQ5K1B4akhKV1ZOdUcwdzBHdExEeHpKcXEy
dDlvUnlBUHhTYzk2RWdha08yZVZlMElrSVk1UW5ycUQ2CmhkeEZGQVBxeE50a2xvOCsyOWo4ZTV4
WThuVDNZeDJoRnNwSVFjZy9mcFpXRlBBdU1Oc1BGakZzZUpPcAp2R0JpeE95dHVGazA4L2dRK3Uw
L1Eza3lMR3ZSaHlSb0pvTDF2T2tXdjhscHFLd0dwYW9FTVlGeUt3QXQKeUlSeW5SL1dnZzI0Uk5z
a2Foa0Y2T09qeU9VRDN1VXNyeE1GUU9jcnllMXozSjdxaThGQjVLTGJEVE5vCkVYTDBwZXlqZkxQ
OTRwMlM2NXlocElENUNkb20xUlJQcGhvK2U5Nm10Ly8xY0F6MEdFVGFxQT09Cj1Rd1VUCi0tLS0t
RU5EIFBHUCBNRVNTQUdFLS0tLS0NCg==

--===============7260904729130733508==--

--===============3114123543569651689==--
", - "historyId": "296121", - "internalDate": "1726632296000" - } -} diff --git a/appium/api-mocks/apis/google/exported-messages/message-export-192d58178bf2ca46.json b/appium/api-mocks/apis/google/exported-messages/message-export-192d58178bf2ca46.json new file mode 100644 index 000000000..98e9a57e8 --- /dev/null +++ b/appium/api-mocks/apis/google/exported-messages/message-export-192d58178bf2ca46.json @@ -0,0 +1,110 @@ +{ + "acctEmail": "e2e.enterprise.test@flowcrypt.com", + "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": "sender@domain.com" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Reply-To", + "value": "test@gmail.com" + }, + { + "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" + } +} diff --git a/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts b/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts index 93442e633..c6d144380 100644 --- a/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts +++ b/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts @@ -27,7 +27,11 @@ describe('INBOX: ', () => { // signed only message await MailFolderScreen.clickOnEmailBySubject(subject); - await EmailScreen.checkOpenedEmail('sender@domain.com', subject, 'Test attachment'); + await EmailScreen.checkOpenedEmail( + 'sender@domain.com', + subject, + 'Test encrypted attachment sent via encrypted contact page', + ); await EmailScreen.checkAttachment('manifest.json'); }); }); From 6ed7d40cd852f19da8f7dc5e8022b53cd50834c5 Mon Sep 17 00:00:00 2001 From: Ioan Moldovan Date: Mon, 28 Oct 2024 18:47:02 -0500 Subject: [PATCH 4/6] fix: ui test --- ...mailWithAttachmentSentViaEncryptedContactPage.spec.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts b/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts index c6d144380..3a6abbafc 100644 --- a/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts +++ b/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts @@ -18,14 +18,7 @@ describe('INBOX: ', () => { await SetupKeyScreen.setPassPhrase(); await MailFolderScreen.checkInboxScreen(); - // signed+encrypted message - await MailFolderScreen.clickOnEmailBySubject(subject); - - await EmailScreen.checkEncryptionBadge('encrypted'); - await EmailScreen.checkSignatureBadge('signed'); - await EmailScreen.clickBackButton(); - - // signed only message + // check if email is decrypted successfully await MailFolderScreen.clickOnEmailBySubject(subject); await EmailScreen.checkOpenedEmail( 'sender@domain.com', From 81c2772901dae943382461c1216f6b89ae3942db Mon Sep 17 00:00:00 2001 From: Ioan Moldovan Date: Tue, 29 Oct 2024 20:28:15 -0500 Subject: [PATCH 5/6] fix: test --- .../Mail Provider/Message Provider/MessageAttachment.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/FlowCrypt/Functionality/Mail Provider/Message Provider/MessageAttachment.swift b/FlowCrypt/Functionality/Mail Provider/Message Provider/MessageAttachment.swift index 4342739ca..b9525708d 100644 --- a/FlowCrypt/Functionality/Mail Provider/Message Provider/MessageAttachment.swift +++ b/FlowCrypt/Functionality/Mail Provider/Message Provider/MessageAttachment.swift @@ -58,6 +58,7 @@ extension MessageAttachment { // 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 } From 8f7485defe02b245ed02bb1504d1d9e54bea93a5 Mon Sep 17 00:00:00 2001 From: Ioan Moldovan Date: Tue, 29 Oct 2024 22:57:13 -0500 Subject: [PATCH 6/6] fix: ui test --- .../CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts b/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts index 3a6abbafc..ebe6807d5 100644 --- a/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts +++ b/appium/tests/specs/mock/inbox/CheckEmailWithAttachmentSentViaEncryptedContactPage.spec.ts @@ -25,7 +25,7 @@ describe('INBOX: ', () => { subject, 'Test encrypted attachment sent via encrypted contact page', ); - await EmailScreen.checkAttachment('manifest.json'); + await EmailScreen.checkAttachment('manifest.json.pgp'); }); }); });