From 66015103bbc8229bd64e20f533d82deb61c37ffc Mon Sep 17 00:00:00 2001 From: martgil <46025304+martgil@users.noreply.github.com> Date: Thu, 3 Apr 2025 15:11:57 +0800 Subject: [PATCH 1/3] refactor: add reliable checks for ambigious file extensions --- extension/js/common/core/attachment.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/js/common/core/attachment.ts b/extension/js/common/core/attachment.ts index 25909141051..f21dea9b1f4 100644 --- a/extension/js/common/core/attachment.ts +++ b/extension/js/common/core/attachment.ts @@ -204,7 +204,7 @@ export class Attachment { } else if (this.name === 'message' && isBodyEmpty) { // treat message as encryptedMsg when empty body for the 'message' attachment return 'encryptedMsg'; - } else if (this.name.match(/(\.pgp$)|(\.gpg$)|(\.[a-zA-Z0-9]{3,4}\.asc$)/g)) { + } else if (this.name.match(/(\.pgp$)|(\.gpg$)|(\.[a-zA-Z0-9]{3,4}\.asc$)/g) && !this.isPublicKey() && !this.isPrivateKey()) { // ends with one of .gpg, .pgp, .???.asc, .????.asc return 'encryptedFile'; // todo: after #4906 is done we should "decrypt" the encryptedFile here to see if it's a binary 'publicKey' (as in message 1869220e0c8f16dd) From 31e9213e02257d814fa3a26c67cb3c3cbb74da9a Mon Sep 17 00:00:00 2001 From: martgil <46025304+martgil@users.noreply.github.com> Date: Mon, 7 Apr 2025 13:35:36 +0800 Subject: [PATCH 2/3] test: add test --- .../message-export-1960e404123e1cbc.json | 157 ++++++++++++++++++ test/source/tests/decrypt.ts | 15 ++ 2 files changed, 172 insertions(+) create mode 100644 test/source/mock/google/exported-messages/message-export-1960e404123e1cbc.json diff --git a/test/source/mock/google/exported-messages/message-export-1960e404123e1cbc.json b/test/source/mock/google/exported-messages/message-export-1960e404123e1cbc.json new file mode 100644 index 00000000000..0ca7d23c6b3 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-1960e404123e1cbc.json @@ -0,0 +1,157 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "1960e404123e1cbc", + "threadId": "1960e404123e1cbc", + "labelIds": [ + "Label_2" + ], + "snippet": "From: XYZ Secure Mail To: sender@domain.com Please find my PGP public key attached.", + "payload": { + "partId": "", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Date", + "value": "Wed, 2 Apr 2025 04:15:42 +0200 (CEST)" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "Reply-To", + "value": "securemail@domain.com" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "INFORMATION: Secure email PGP public key request response" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"----=_Part_87311_665893808.1743560149859\"" + }, + { + "name": "X-Mailer", + "value": "Totemo_TrustMail_(Notification)" + }, + { + "name": "X-Totemo_TrustMail_Notification_Name", + "value": "UBSreplyCertInfoPGP" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "multipart/alternative", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/alternative; boundary=\"----=_Part_87307_327781610.1743560142630\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0.0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain; charset=\"UTF-8\"" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + } + ], + "body": { + "size": 106, + "data": "RnJvbTpVQlMgU2VjdXJlIE1haWwgR2F0ZXdheVRvOnNpbW9uLnNoYW9AY2Fub3B5LmNsb3VkDQoNCg0KUGxlYXNlIGZpbmQgbXkgUEdQIHB1YmxpYyBrZXkgYXR0YWNoZWQuIA0KDQoNCg==" + } + }, + { + "partId": "0.1", + "mimeType": "text/html", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/html; charset=\"UTF-8\"" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + } + ], + "body": { + "size": 592, + "data": "IDxwDQogIHN0eWxlPSJmb250LWZhbWlseTogYXJpYWwgLCBoZWx2ZXRpY2EgLCBzYW5zLXNlcmlmO2ZvbnQtc2l6ZTogeC1zbWFsbDsiPg0KICAgIDx0YWJsZQ0KICAgIHN0eWxlPSJib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlO2JvcmRlcjogbm9uZTtmb250LWZhbWlseTogYXJpYWwgLCBoZWx2ZXRpY2EgLCBzYW5zLXNlcmlmO2ZvbnQtc2l6ZTogeC1zbWFsbDsiPiAgIDx0Ym9keT4NCiAgICAgIDx0cj4gIDx0ZD5Gcm9tOjwvdGQ-ICA8dGQgc3R5bGU9InBhZGRpbmctbGVmdDogNS4wcHg7Ij5VQlMgU2VjdXJlDQogICAgICAgICAgTWFpbCBHYXRld2F5PC90ZD4gICA8L3RyPg0KICAgICAgPHRyPiAgICAgPHRkPlRvOjwvdGQ-ICA8dGQNCiAgICAgICAgc3R5bGU9InBhZGRpbmctbGVmdDogNS4wcHg7Ij5zaW1vbi5zaGFvQGNhbm9weS5jbG91ZDwvdGQ-ICAgPC90cj4gPC90Ym9keT4NCiAgPC90YWJsZT4gPC9wPg0KIDxwDQogIHN0eWxlPSJmb250LWZhbWlseTogYXJpYWwgLCBoZWx2ZXRpY2EgLCBzYW5zLXNlcmlmO2ZvbnQtc2l6ZTogeC1zbWFsbDsiPg0KICBQbGVhc2UgZmluZCBteSBQR1AgcHVibGljIGtleSBhdHRhY2hlZC4gPC9wPg==" + } + } + ] + }, + { + "partId": "1", + "mimeType": "application/pgp-keys", + "filename": "piotr-za.wisniewski@ubs.com.asc", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-keys; name=\"piotr-za.wisniewski@ubs.com.asc\"" + }, + { + "name": "Content-Transfer-Encoding", + "value": "7bit" + }, + { + "name": "Content-Disposition", + "value": "attachment; filename=\"piotr-za.wisniewski@ubs.com.asc\"" + } + ], + "body": { + "attachmentId": "ANGjdJ-uMdPYym4OHGhBVnL8hnt1vJMpGHf6iygGsasqWEQyPan6mJPGOUsfjhtnRjqDMRIz2sg6-408I8mZUCieTwKdUUanksx5gSrMSoyaVmOpNOBT-BQ0tx7ADmoUc3NHoRIqPq_F9_pF4a5bKBJjkt3HPsyYAL2mQxei-6wBAJ81duW2URxfNrEKyogKMUfd5YeudJietJZnFgrir-d9OVsGXz_mMNth1Pz9Q5tLcJIbjnXgesKxpEVILPKNwP0NmXzcxv2ooELbWndrGBjH1jfsKQwRT2s5RuMsO4iQxhUEOmb2hUJCbaOj_zNMgPuuGupuNlLqGaFHFnLAih60N0HoMCBhElI3ZCQz3dfBI6n1PEByTXCV673C4eA", + "size": 1801 + } + } + ] + }, + "sizeEstimate": 7938, + "historyId": "1478989", + "internalDate": "1743560142000" + }, + "attachments": { + "ANGjdJ-uMdPYym4OHGhBVnL8hnt1vJMpGHf6iygGsasqWEQyPan6mJPGOUsfjhtnRjqDMRIz2sg6-408I8mZUCieTwKdUUanksx5gSrMSoyaVmOpNOBT-BQ0tx7ADmoUc3NHoRIqPq_F9_pF4a5bKBJjkt3HPsyYAL2mQxei-6wBAJ81duW2URxfNrEKyogKMUfd5YeudJietJZnFgrir-d9OVsGXz_mMNth1Pz9Q5tLcJIbjnXgesKxpEVILPKNwP0NmXzcxv2ooELbWndrGBjH1jfsKQwRT2s5RuMsO4iQxhUEOmb2hUJCbaOj_zNMgPuuGupuNlLqGaFHFnLAih60N0HoMCBhElI3ZCQz3dfBI6n1PEByTXCV673C4eA": { + "data": "LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tDQpWZXJzaW9uOiBPcGVuUEdQIEtpdGV3b3Jrcw0KQ29tbWVudDogS2l0ZXdvcmtzIE9wZW5QR1AgLSBodHRwOi8vd3d3LnRvdGVtby5jb20NCg0KbVFFTkJHZGx6Y2dCQ0FEUGx2UUQxS2VQMmEvY1Z3OHpqWFdZVWhHWE01NUorRFhFOEo0d2lYS3FEWitIbmFtNA0KQ2FIWHZ2UWlSSmlPVjQwR2Fwb3RSd2J3YTg3ZFdsbEJFWWF0WVIyNmZpR0I1NWhHM281RDBkNHFhOU01c1NZbw0KSHFJV01FREd2MWlXTVhIdzMyMC8rakJ2Mzc3Zy9lQWMyUXI1aWZUdWRjQnNGcVdnaG1Ja1R2ejBydzRXcjJEYw0KUFZTc3RWaE1wc05PeE4rNFZYa0lUMVRiZUM4WjRyT29nZ2RCR3RtVlI4Z2Fpcm5CVitMUkpYZ1J1TGVhU0pYZQ0Kd1FNdVJlc2E4UUk1Ykt6VUxuY3MwY1VxTlRtOGVZZHNHVEVqbEpKdkVhb1FkSG1UZlAwdkZGM3ZhWmN4ckVWSA0KejFtU2VpYTA3eDJVNTRzdndGdzQ1Ykc3WTRoYmMvcEpvSUluQUJFQkFBRzBPWEJwYjNSeUxYcGhMbmRwYzI1cA0KWlhkemEybEFkV0p6TG1OdmJTQThjR2x2ZEhJdGVtRXVkMmx6Ym1sbGQzTnJhVUIxWW5NdVkyOXRQb2tDSEFRVA0KQVFnQUJnVUNaMlhOeUFBS0NSQ0toNFBLUTJRajRtL1lELzBjdktsMWVqWXRDSHFZZGRETHdYUXMrZXA3R1Noag0KQ2x0K1ZoVjFLTW9OODMxekNFeHUvNnlwQ004Wkd2OVFDbTNpdDBVWXBINzZGbURqVEhJZlZTY2FhYStRR3ZTTg0KWlVScStaVk4wenV5YnRJZzI4eTVlUGpES1ltdFFrMGJsK2EyVC9meTdGbWFaMjVFQyt2L1oya3FQVnBROTk0WQ0KdDZYaEhpb0ZwMk5BbExtSE9xanBCUXk2MmkwOXF5QlVZd3FuYUJPV2dMbDA0SG1LT2NqcS9wRFZ0aE56bmdsZw0KSkNoT0hoSUJJZmplQkh6MXVDUUVUSWw3YU9FdG1sT1FJY1YwWEhkVjBwb0xFcnByV2ZoYjAraTl0VnFLWU1FMg0Kbzh2WXhxVDRUd1ovVDkvMzFXeENiMk1ESmJEaEI2TlRZajE5T0hDclJvelM3MDUraWUybEZGcjQ0cjBwRk9FdA0KMWZtNnBuZm9GVHMvRnhqZTV3VkV0U0xrUk05MmtTRlJlVHUzN2R3SEFsdkJNZll3a1FjUGxocWNaUFI3QzBPVQ0KQWxnQy9QeVdlMWJ4eVdxREtuUURtRmVFdm4vMEk1T2hiMENKZEkyd3FIVDAwSm90RDhHcks3RWREVk5YWDNtUQ0KcmZzZmRvczFxV2h4Ukd5SGFJODVqYi9FRXVwajhjeGhjVWFhdjZKRHViVGQ5NS9DYXhOa3ZxSEppaWdWVkQ1Nw0KRXN5TXVDOWRVUjJtWmNNNWxJelpNQzRmVVBMUVJmZ2poaGpGVHk1L0lxeld1bENqU201RmI4dHIwczczU200SA0Kd0RNMzFGSnEycldKQjJhVm9oUEJZQ2lEREkzdytxOEZHTGoxQXZVRkozWm9WTXpYTHBadjYwbzFHSDdqK1UxQg0KbDVkSms4MGJ5RjhpbElrQk9RUVRBUWdBSXdVQ1oyWE55QVlMQ1FnSEF3SUVGUWdKQ2dRV0FnTUJBaDRCQWhzUA0KQlFrRHdtY0FBQW9KRUc4THJWVUlYN3h0ckpBSC8zTjRlR3ZJRWZ5ajlpUTJ3ZDNUWFNYQUZ3LzZCNGRQWGFqUA0KNGxTc2tjc25vMUpNNjhBVzdPbmVDckJuRjdIR2RVTWpoSjZxTjcvYmxYUzdYbW9DekN5MzhFYmRvN0tvQ2tIZw0KU0xOekJ6RDYySTBZRHhSNWcvL0VsYml6SllGMThDQ3hDUkloT0s4NW9GK0VBNmNSd1MxM1NaSTQ3Tkxia0UzNQ0KdVlHWTZWS1g0bllPTUtOc2pPZDNOUC8zOWFtOUs4Z0RGME5VU2hLeVNEMXArSDVvTDRTODB0dWFETHB0RzhmZA0KTVQwMTh3SXJUTW9JN01yL2Rmblh1dzdFUmwrd3U3bEw3MG85eHd1RkhOWlkxakgwY1hza2lLVEZ2cDcrMnRaTg0KdHR3NzRXYnI0cG5wcDdBbDBnd0U2NUpIN1dTc1VsZ01GdlJXdlBINW9Vc2tyY0FjbDVjPQ0KPTFBN0UNCi0tLS0tRU5EIFBHUCBQVUJMSUMgS0VZIEJMT0NLLS0tLS0NCg", + "size": 1801 + } + }, + "raw": { + "id": "1960e404123e1cbc", + "threadId": "1960e404123e1cbc", + "labelIds": [ + "Label_2" + ], + "snippet": "From: XYZ Secure Mail To: sender@domain.com Please find my PGP public key attached.", + "sizeEstimate": 7938, + "raw": "Delivered-To: simon.shao@canopy.cloud
Received: by 2002:a2e:96d3:0:b0:30b:fe7b:63ef with SMTP id d19csp2492437ljj;
        Tue, 1 Apr 2025 19:15:50 -0700 (PDT)
X-Google-Smtp-Source: AGHT+IEYWcCiUSP+zle7b1pS6fvvSKbwJ6ZxOYqba12mRXKFBxOv3zNRyjcysO55WNljrnK1T2rK
X-Received: by 2002:a17:907:97c4:b0:ac7:18c9:2975 with SMTP id a640c23a62f3a-ac7a1abde58mr42206666b.48.1743560150498;
        Tue, 01 Apr 2025 19:15:50 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1743560150; cv=none;
        d=google.com; s=arc-20240605;
        b=a/FBrle+MThyzb7+HEpvkSOo7WJeZ4xDpPJ+vq+wubRzd8R+8nJKS7Inh5W84ZA7KS
         o1V7/Olxw4AARywDNnEUbqUjOyNMcbdqTX7QuqQgOtWvaFHzTCZoJVevCqYobp8Ry2FN
         1BXWAUv0zHj2gCQjiXCUi1SRAhBSEGFYJm5aigUbDSOb16nYa9ZlEDcR2JKfGNpqPFMV
         8riXjv4TT0y06cuAg7rQf6NsK/WGYQLP4Oc6nZro1KySMyF3x9wq2/ylPXQaOxH6l1XD
         bheBFuI7qYiFKzvjAWXRL8b4loRLiVTd9G9OeEkyo4psR016sB6qnPpXfgtK6glE693H
         QaJw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
        h=mime-version:subject:message-id:to:reply-to:from:date
         :dkim-signature;
        bh=GizKHByrXhzk7gwxOyH5W1obO5D2/OlKAImXFswk3hQ=;
        fh=lTaaxa9wnc0p1nfjmUUAAv22J62yr6BWS8ddEjgT2lM=;
        b=BdmhGp6mmMtL4iBDtG7wiESDBuHCJIbjM9ct9dlPVPAvD+AE5nFJ7gxgW4cYwso/7M
         Iqz/4togSkzLuIHBpFB9m0v1HHk7WhSzUFP5YauIThC2Zy99h5A0a5HYPCvqqkoO2g2N
         /hDhnY65Ew1l+UCfQhklRg3zIrbEsOYOQZavH26BHHmFu9KNRbgiFsfM+cBSbdir+7GP
         SPQ2q/l0VqgbwkfNAn4GfKDX4aYnZG1hxt03FiYlPz2rQ9GXPwD8xcWh2TnJ2qTwk5FS
         i9pm6KvDTiMlMr0Oj+4It80+7IlsZ+WBOQXtCzAETzQiMvTc+MyEFQ8mutQXHtOZlJ7h
         FYHg==;
        dara=google.com
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@ubs.com header.s=srsa2048 header.b=K7dpaAXo;
       spf=pass (google.com: domain of piotr-za.wisniewski@ubs.com designates 165.222.56.160 as permitted sender) smtp.mailfrom=piotr-za.wisniewski@ubs.com;
       dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=ubs.com
Return-Path: <piotr-za.wisniewski@ubs.com>
Received: from dmz-zur-gw1-wm.ubs.com (dmz-zur-gw1-wm.ubs.com. [165.222.56.160])
        by mx.google.com with ESMTPS id a640c23a62f3a-ac719691d2asi820479066b.728.2025.04.01.19.15.50
        for <simon.shao@canopy.cloud>
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Tue, 01 Apr 2025 19:15:50 -0700 (PDT)
Received-SPF: pass (google.com: domain of piotr-za.wisniewski@ubs.com designates 165.222.56.160 as permitted sender) client-ip=165.222.56.160;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@ubs.com header.s=srsa2048 header.b=K7dpaAXo;
       spf=pass (google.com: domain of piotr-za.wisniewski@ubs.com designates 165.222.56.160 as permitted sender) smtp.mailfrom=piotr-za.wisniewski@ubs.com;
       dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=ubs.com
Received: from localhost (localhost [127.0.0.1])
	by postfix.amavisd (Postfix) with ESMTP id 4ZS7kt0x3HzYkhYN
	for <simon.shao@canopy.cloud>; Wed,  2 Apr 2025 04:15:50 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ubs.com; h=
	x-mailer:content-type:content-type:mime-version:subject:subject
	:message-id:reply-to:from:from:date:date:received:received; s=
	srsa2048; t=1743560150; bh=GizKHByrXhzk7gwxOyH5W1obO5D2/OlKAImXF
	swk3hQ=; b=K7dpaAXoMZR0hCZQxhCeSBGkOhiBomuqKViNsi/SkVtc11xEdteKO
	wcNGzLTQf3gFj0M46pMy7zX3QMsKMpKnUdv0u0gQJWoDX7I7aZI2gBJ5L2W//W6z
	m7b+bBQE77t3+1sRdvX7V3C2yhNHnKSge4l96WpBgQJeQIb40lZ7cBI3yd5gFbEO
	FXTlR4IODVz2ReGRljaMlec9UT2BFoDW8KZr4t0xYuQ6Js7lJdnCD2a2AdY0+sZb
	woeSs+MWoGAfDB08kqvThSvz6myjbTb8NP/zwhyPrMaSxI4GHA0b9X7olPuK10gr
	vJ/JB+y52wHFth59c2NHQ/DiEmwp8WhJg==
Received: from dmz-zur-gw1-wm.ubs.com ([127.0.0.1])
	by localhost (a302-3644-7043.zur.ubs.net [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id R_mpzvZSSFja for <simon.shao@canopy.cloud>;
	Wed,  2 Apr 2025 04:15:50 +0200 (CEST)
Received: from TrustMail?B2B-PROD?OUTGOING?[smtp] (unknown [10.38.3.36])
	by postfix.bypass (Postfix) with SMTP id 4ZS7kt0VMxzYkhYM
	for <simon.shao@canopy.cloud>; Wed,  2 Apr 2025 04:15:50 +0200 (CEST)
Date: Wed, 2 Apr 2025 04:15:42 +0200 (CEST)
From: "piotr-za.wisniewski@ubs.com" <piotr-za.wisniewski@ubs.com>
Reply-To: securemail@ubs.com
To: simon.shao@canopy.cloud
Message-ID: <678947367.87310.1743560142631@xzur5593pap.zur.swissbank.com>
Subject: INFORMATION: Secure email PGP public key request response
MIME-Version: 1.0
Content-Type: multipart/mixed; 
	boundary="----=_Part_87311_665893808.1743560149859"
X-Mailer: Totemo_TrustMail_(Notification)
X-Totemo_TrustMail_Notification_Name: UBSreplyCertInfoPGP

------=_Part_87311_665893808.1743560149859
Content-Type: multipart/alternative; 
	boundary="----=_Part_87307_327781610.1743560142630"

------=_Part_87307_327781610.1743560142630
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

From:UBS Secure Mail GatewayTo:simon.shao@canopy.cloud


Please find my PGP public key attached.=20



------=_Part_87307_327781610.1743560142630
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

 <p
  style=3D"font-family: arial , helvetica , sans-serif;font-size: x-small;"=
>
    <table
    style=3D"border-collapse: collapse;border: none;font-family: arial , he=
lvetica , sans-serif;font-size: x-small;">   <tbody>
      <tr>  <td>From:</td>  <td style=3D"padding-left: 5.0px;">UBS Secure
          Mail Gateway</td>   </tr>
      <tr>     <td>To:</td>  <td
        style=3D"padding-left: 5.0px;">simon.shao@canopy.cloud</td>   </tr>=
 </tbody>
  </table> </p>
 <p
  style=3D"font-family: arial , helvetica , sans-serif;font-size: x-small;"=
>
  Please find my PGP public key attached. </p>
------=_Part_87307_327781610.1743560142630--

------=_Part_87311_665893808.1743560149859
Content-Type: application/pgp-keys; name="piotr-za.wisniewski@ubs.com.asc"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="piotr-za.wisniewski@ubs.com.asc"

-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: OpenPGP Kiteworks
Comment: Kiteworks OpenPGP - http://www.totemo.com

mQENBGdlzcgBCADPlvQD1KeP2a/cVw8zjXWYUhGXM55J+DXE8J4wiXKqDZ+Hnam4
CaHXvvQiRJiOV40GapotRwbwa87dWllBEYatYR26fiGB55hG3o5D0d4qa9M5sSYo
HqIWMEDGv1iWMXHw320/+jBv377g/eAc2Qr5ifTudcBsFqWghmIkTvz0rw4Wr2Dc
PVSstVhMpsNOxN+4VXkIT1TbeC8Z4rOoggdBGtmVR8gairnBV+LRJXgRuLeaSJXe
wQMuResa8QI5bKzULncs0cUqNTm8eYdsGTEjlJJvEaoQdHmTfP0vFF3vaZcxrEVH
z1mSeia07x2U54svwFw45bG7Y4hbc/pJoIInABEBAAG0OXBpb3RyLXphLndpc25p
ZXdza2lAdWJzLmNvbSA8cGlvdHItemEud2lzbmlld3NraUB1YnMuY29tPokCHAQT
AQgABgUCZ2XNyAAKCRCKh4PKQ2Qj4m/YD/0cvKl1ejYtCHqYddDLwXQs+ep7GShj
Clt+VhV1KMoN831zCExu/6ypCM8ZGv9QCm3it0UYpH76FmDjTHIfVScaaa+QGvSN
ZURq+ZVN0zuybtIg28y5ePjDKYmtQk0bl+a2T/fy7FmaZ25EC+v/Z2kqPVpQ994Y
t6XhHioFp2NAlLmHOqjpBQy62i09qyBUYwqnaBOWgLl04HmKOcjq/pDVthNznglg
JChOHhIBIfjeBHz1uCQETIl7aOEtmlOQIcV0XHdV0poLErprWfhb0+i9tVqKYME2
o8vYxqT4TwZ/T9/31WxCb2MDJbDhB6NTYj19OHCrRozS705+ie2lFFr44r0pFOEt
1fm6pnfoFTs/Fxje5wVEtSLkRM92kSFReTu37dwHAlvBMfYwkQcPlhqcZPR7C0OU
AlgC/PyWe1bxyWqDKnQDmFeEvn/0I5Ohb0CJdI2wqHT00JotD8GrK7EdDVNXX3mQ
rfsfdos1qWhxRGyHaI85jb/EEupj8cxhcUaav6JDubTd95/CaxNkvqHJiigVVD57
EsyMuC9dUR2mZcM5lIzZMC4fUPLQRfgjhhjFTy5/IqzWulCjSm5Fb8tr0s73Sm4H
wDM31FJq2rWJB2aVohPBYCiDDI3w+q8FGLj1AvUFJ3ZoVMzXLpZv60o1GH7j+U1B
l5dJk80byF8ilIkBOQQTAQgAIwUCZ2XNyAYLCQgHAwIEFQgJCgQWAgMBAh4BAhsP
BQkDwmcAAAoJEG8LrVUIX7xtrJAH/3N4eGvIEfyj9iQ2wd3TXSXAFw/6B4dPXajP
4lSskcsno1JM68AW7OneCrBnF7HGdUMjhJ6qN7/blXS7XmoCzCy38Ebdo7KoCkHg
SLNzBzD62I0YDxR5g//ElbizJYF18CCxCRIhOK85oF+EA6cRwS13SZI47NLbkE35
uYGY6VKX4nYOMKNsjOd3NP/39am9K8gDF0NUShKySD1p+H5oL4S80tuaDLptG8fd
MT018wIrTMoI7Mr/dfnXuw7ERl+wu7lL70o9xwuFHNZY1jH0cXskiKTFvp7+2tZN
ttw74Wbr4pnpp7Al0gwE65JH7WSsUlgMFvRWvPH5oUskrcAcl5c=
=1A7E
-----END PGP PUBLIC KEY BLOCK-----

------=_Part_87311_665893808.1743560149859--
", + "historyId": "1478989", + "internalDate": "1743560142000" + } +} \ No newline at end of file diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 1046bcfd19c..7ef113a4e78 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -272,6 +272,21 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }) ); + test( + `decrypt - render a plain text email with an ambiguous public key name as its attachment`, + testWithBrowser(async (t, browser) => { + const threadId = '1960e404123e1cbc'; + const { acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); + const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); + await inboxPage.waitForSelTestState('ready'); + await inboxPage.waitAll('iframe'); + expect(await inboxPage.isElementPresent('@container-attachments')).to.equal(true); + const attachmentsContainer = await inboxPage.waitAny('@container-attachments'); + const attachments = await attachmentsContainer.$$('.pgp_block.publicKey'); + expect(attachments.length).to.equal(1); + }) + ); + test( `decrypt - outlook message with ATTxxxx encrypted email is correctly decrypted`, testWithBrowser(async (t, browser) => { From fc628e9871b5b4ff02d0696ac5d1fe66f21ab6bd Mon Sep 17 00:00:00 2001 From: martgil <46025304+martgil@users.noreply.github.com> Date: Mon, 7 Apr 2025 13:42:14 +0800 Subject: [PATCH 3/3] refactor: update test material info --- .../exported-messages/message-export-1960e404123e1cbc.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/source/mock/google/exported-messages/message-export-1960e404123e1cbc.json b/test/source/mock/google/exported-messages/message-export-1960e404123e1cbc.json index 0ca7d23c6b3..f125294a069 100644 --- a/test/source/mock/google/exported-messages/message-export-1960e404123e1cbc.json +++ b/test/source/mock/google/exported-messages/message-export-1960e404123e1cbc.json @@ -110,11 +110,11 @@ { "partId": "1", "mimeType": "application/pgp-keys", - "filename": "piotr-za.wisniewski@ubs.com.asc", + "filename": "peter.xyz@domain.com.asc", "headers": [ { "name": "Content-Type", - "value": "application/pgp-keys; name=\"piotr-za.wisniewski@ubs.com.asc\"" + "value": "application/pgp-keys; name=\"peter.xyz@domain.com.asc\"" }, { "name": "Content-Transfer-Encoding", @@ -122,7 +122,7 @@ }, { "name": "Content-Disposition", - "value": "attachment; filename=\"piotr-za.wisniewski@ubs.com.asc\"" + "value": "attachment; filename=\"peter.xyz@domain.com.asc\"" } ], "body": {