[PB-6602] encrypt preview and session key too

package.json

@@ -1,6 +1,6 @@
 {
   "name": "internxt-crypto",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/index.js",

src/email-crypto/core.ts

@@ -56,10 +56,18 @@ export async function encryptEmailWithKey(
 ): Promise<EmailEncrypted> {
   try {
     const text = UTF8ToUint8(email.text);
+    const preview = UTF8ToUint8(email.preview);
 
     const encryptedText = await encryptSymmetrically(encryptionKey, text, aux);
     const encText = uint8ArrayToBase64(encryptedText);
-    return { encText };
+
+    const encryptedPreview = await encryptSymmetrically(encryptionKey, preview, aux);
+    const encPreview = uint8ArrayToBase64(encryptedPreview);
+
+    const encryptedAttachmentsSessionKey = await encryptSymmetrically(encryptionKey, email.attachmentsSessionKey, aux);
+    const encAttachmentsSessionKey = uint8ArrayToBase64(encryptedAttachmentsSessionKey);
+
+    return { encText, encPreview, encAttachmentsSessionKey };
   } catch (error) {
     throw new EmailSymmetricEncryptionError(error instanceof Error ? error.message : String(error));
   }
@@ -83,7 +91,14 @@ export async function decryptEmail(
     const textArray = await decryptSymmetrically(encryptionKey, encText, aux);
     const text = uint8ToUTF8(textArray);
 
-    return { text };
+    const encPreview = base64ToUint8Array(encEmail.encPreview);
+    const previewArray = await decryptSymmetrically(encryptionKey, encPreview, aux);
+    const preview = uint8ToUTF8(previewArray);
+
+    const encAttachementSessionKey = base64ToUint8Array(encEmail.encAttachmentsSessionKey);
+    const attachmentsSessionKey = await decryptSymmetrically(encryptionKey, encAttachementSessionKey, aux);
+
+    return { text, preview, attachmentsSessionKey };
   } catch (error) {
     throw new EmailSymmetricDecryptionError(error instanceof Error ? error.message : String(error));
   }

src/types.ts

@@ -48,6 +48,8 @@ export type PwdProtectedKey = {
 
 export type EmailEncrypted = {
   encText: string;
+  encPreview: string;
+  encAttachmentsSessionKey: string;
 };
 
 export type EmailAndSubjectEncrypted = EmailEncrypted & {
@@ -56,6 +58,8 @@ export type EmailAndSubjectEncrypted = EmailEncrypted & {
 
 export type Email = {
   text: string;
+  preview: string;
+  attachmentsSessionKey: Uint8Array;
 };
 
 export type EmailAndSubject = Email & {

tests/email-crypto/core.test.ts

@@ -16,11 +16,15 @@
 describe('Test email crypto functions', () => {
   const email: Email = {
     text: 'test email',
+    preview: 'email preview',
+    attachmentsSessionKey: new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]),
   };
 
   const emailAndSubject: EmailAndSubject = {
     text: 'test email text',
     subject: 'test email subject',
+    preview: 'email preview',
+    attachmentsSessionKey: new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]),
   };
 
   const aux = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]);
@@ -46,7 +50,7 @@
     await expect(decryptEmail(encEmail, encryptionKey, badAux)).rejects.toThrow(EmailSymmetricDecryptionError);
   });
 
   it('should throw an error if decryption fails', async () => {
     const { encEmail, encryptionKey } = await encryptEmailAndSubject(emailAndSubject, aux);
     const badEncryptionKey = await genSymmetricKey();
     await expect(decryptEmailAndSubject(encEmail, badEncryptionKey, aux)).rejects.toThrow(
@@ -70,7 +74,7 @@
   it('should derive symmetric key for database encryption', async () => {
     const mnemonic = genMnemonic();
     const key = await deriveDatabaseKey(mnemonic);
     expect(key.length).toBe(AES_KEY_BYTE_LENGTH);
     const key2 = await deriveDatabaseKey(mnemonic);
     expect(key2).toStrictEqual(key);
   });
@@ -78,16 +82,16 @@
   it('should derive symmetric key for email draft encryption', async () => {
     const mnemonic = genMnemonic();
     const key = await deriveEmailDraftKey(mnemonic);
     expect(key.length).toBe(AES_KEY_BYTE_LENGTH);
     const key2 = await deriveEmailDraftKey(mnemonic);
     expect(key2).toStrictEqual(key);
   });
 
   it('should derive symmetric key for email draft encryption', async () => {
     const mnemonic = genMnemonic();
     const keyDatabase = await deriveDatabaseKey(mnemonic);
     const keyDraft = await deriveEmailDraftKey(mnemonic);
     expect(keyDatabase.length).toBe(keyDraft.length);
     expect(keyDraft).not.toStrictEqual(keyDatabase);
   });
 });

tests/email-crypto/hybridEmail.test.ts

@@ -27,11 +27,15 @@
 describe('Test email crypto functions', async () => {
   const email: Email = {
     text: 'test email text',
+    preview: 'Hi Bib,',
+    attachmentsSessionKey: new Uint8Array([1, 2, 3, 4]),
   };
 
   const emailAndSubject: EmailAndSubject = {
     text: 'test email text',
     subject: 'test email subject',
+    preview: 'Hi Bib,',
+    attachmentsSessionKey: new Uint8Array([1, 2, 3, 4]),
   };
 
   const { secretKey: alicePrivateKeys, publicKey: alicePublicKeys } = await generateEmailKeys();
@@ -90,6 +94,8 @@
       encryptedKey: encKey,
       encEmail: {
         encText: 'mock encrypted text',
+        encPreview: 'mock encryped preview',
+        encAttachmentsSessionKey: 'mock encrypted attachement session key',
       },
     };
 
@@ -98,6 +104,8 @@
       encEmail: {
         encText: 'mock encrypted text',
         encSubject: 'mock encrypted subject',
+        encPreview: 'mock encryped preview',
+        encAttachmentsSessionKey: 'mock encrypted attachement session key',
       },
     };
 
@@ -114,7 +122,7 @@
       aliceWithPublicKeys,
     ]);
 
     expect(encryptedEmail.length).toBe(2);
     expect(encryptedEmail[0].encEmail).toBe(encryptedEmail[1].encEmail);
   });
 
@@ -124,7 +132,7 @@
       aliceWithPublicKeys,
     ]);
 
     expect(encryptedEmail.length).toBe(2);
     expect(encryptedEmail[0].encEmail).toBe(encryptedEmail[1].encEmail);
 
     const emailDecryptedByBob = await decryptEmailAndSubjectHybrid(encryptedEmail[0], bobPrivateKeys);

tests/email-crypto/pwdProtectedEmail.test.ts

@@ -13,11 +13,15 @@ import { Email, EmailAndSubject, PwdProtectedEmail, PwdProtectedEmailAndSubject
 describe('Test email crypto functions', () => {
   const email: Email = {
     text: 'Hi Bob, This is a test message. -Alice.',
+    preview: 'Hi Bib,',
+    attachmentsSessionKey: new Uint8Array([1, 2, 3, 4]),
   };
 
   const emailAndSubject: EmailAndSubject = {
     text: 'Hi Bob, This is a test message. -Alice.',
     subject: 'test subject',
+    preview: 'Hi Bib,',
+    attachmentsSessionKey: new Uint8Array([1, 2, 3, 4]),
   };
 
   const sharedSecret = 'test shared secret';

tests/email-crypto/pwdProtectedEmailCoreErrors.test.ts

@@ -26,11 +26,15 @@ describe('Test email crypto functions', () => {
 
   const email: Email = {
     text: 'Hi Bob, This is a test message. -Alice.',
+    preview: 'Hi Bib,',
+    attachmentsSessionKey: new Uint8Array([1, 2, 3, 4]),
   };
 
   const emailAndSubject: EmailAndSubject = {
     text: 'Hi Bob, This is a test message. -Alice.',
     subject: 'test subject',
+    preview: 'Hi Bib,',
+    attachmentsSessionKey: new Uint8Array([1, 2, 3, 4]),
   };
 
   const sharedSecret = 'test shared secret';

tests/email-crypto/pwdProtectedEmailNobleErrors.test.ts

@@ -37,11 +37,15 @@ describe('Test email crypto functions', () => {
 
   const email: Email = {
     text: 'Hi Bob, This is a test message. -Alice.',
+    preview: 'Hi Bib,',
+    attachmentsSessionKey: new Uint8Array([1, 2, 3, 4]),
   };
 
   const emailAndSubject: EmailAndSubject = {
     text: 'Hi Bob, This is a test message. -Alice.',
     subject: 'test subject',
+    preview: 'Hi Bib,',
+    attachmentsSessionKey: new Uint8Array([1, 2, 3, 4]),
   };
 
   const sharedSecret = 'test shared secret';