Skip to content

issue #3943 Fix encrypted subject of Thunderbird messages #4054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2021
Merged

issue #3943 Fix encrypted subject of Thunderbird messages #4054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion extension/js/common/core/mime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,16 @@ export class Mime {
};
return await new Promise((resolve, reject) => {
try {
parser.onend = () => {
parser.onend = async () => {
try {
for (const name of Object.keys(parser.node.headers)) {
mimeContent.headers[name] = parser.node.headers[name][0].value;
}
mimeContent.rawSignedContent = Mime.retrieveRawSignedContent([parser.node]);
if (!mimeContent.subject && mimeContent.rawSignedContent) {
const rawSignedContentDecoded = await Mime.decode(Buf.fromUtfStr(mimeContent.rawSignedContent));
mimeContent.subject = rawSignedContentDecoded.subject;
}
for (const node of Object.values(leafNodes)) {
if (Mime.getNodeType(node) === 'application/pgp-signature') {
mimeContent.signature = node.rawContent;
Expand Down
3 changes: 3 additions & 0 deletions test/source/tests/gmail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,9 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test

ava.default('mail.google.com - pubkey gets rendered with new signed and encrypted Thunderbird signature', testWithBrowser('ci.tests.gmail', async (t, browser) => {
const gmailPage = await openGmailPage(t, browser, '/FMfcgzGkbDZKPLBqWFzbgWqCrplTQdNz');
const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 20 });
const url = pgpBlockUrls[0].split('/chrome/elements/pgp_block.htm')[1];
await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: url, content: ['Encrypted Subject: [ci.test] Thunderbird html signed + encrypted', '1234'] });
const urls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_pubkey.htm'], { sleep: 10, appearIn: 20 });
expect(urls.length).to.equal(1);
await pageHasSecureReplyContainer(t, browser, gmailPage);
Expand Down