Merge pull request #1492 from Hirobreak/reencrypt

Reencrypting Email

Author: danieltigse

electron_app/package.json

@@ -150,7 +150,7 @@
     "electron-notarize": "^0.1.1"
   },
   "dependencies": {
-    "@criptext/api": "^0.17.0",
+    "@criptext/api": "^0.17.1",
     "@criptext/data-transfer-client": "^0.1.1",
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
     "@criptext/electron-push-receiver": "^2.1.3",

electron_app/src/clientManager.js

@@ -538,6 +538,14 @@ const postUser = async params => {
   return await client.postUser(params);
 };
 
+const reencryptEmail = async ({ recipientId, metadataKey, eventid }) => {
+  const client = await createClient({ recipientId });
+  const res = await client.reencryptEmail({ metadataKey, eventid });
+  return res.status === 200
+    ? res
+    : await checkExpiredSession(res, resendConfirmationEmail, recipientId);
+};
+
 const registerDomain = async ({ domain, recipientId }) => {
   const client = await createClient({ recipientId });
   const res = await client.registerDomain(domain);
@@ -805,6 +813,7 @@ module.exports = {
   postPeerEvent,
   pushPeerEvents,
   postUser,
+  reencryptEmail,
   registerDomain,
   removeAvatar,
   removeDevice,

electron_app/src/ipc/client.js

@@ -162,6 +162,13 @@ ipc.answerRenderer('client-post-peer-event', params => {
   return clientManager.postPeerEvent(data);
 });
 
+ipc.answerRenderer('client-reencrypt-email', params => {
+  const data = params.recipientId
+    ? params
+    : { ...params, recipientId: myAccount.recipientId };
+  return clientManager.reencryptEmail(data);
+});
+
 ipc.answerRenderer('client-register-domain', domain => {
   const data = { domain, recipientId: myAccount.recipientId };
   return clientManager.registerDomain(data);

electron_app/yarn.lock

@@ -115,10 +115,10 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@criptext/api@^0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@criptext/api/-/api-0.17.0.tgz#7bc102b7c2afd6d971ee3b51c27e20e145cb8c99"
-  integrity sha512-w7jxkzxlKqM371wyXrO8YUkgph8RhU5IxYdMmL9L0hx0tdbLAko8DHjHlub7yO2OmStEOUyk7k/RqBfEawlntA==
+"@criptext/api@^0.17.1":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@criptext/api/-/api-0.17.1.tgz#63e7f3cfc4c5d8fa10e0859c7017fb3acf0bc84c"
+  integrity sha512-UWWU3eOR/a5lB7Od0mYUKUUPZ2EypAyFtc1Ps3Dcv7DJh1v4EZCcK1X69KonoSbqNjo0ymqYoCt2SaL8KaEENw==
   dependencies:
     superagent "^3.8.2"
 

email_mailbox/src/components/SettingAccountWrapper.js

@@ -150,6 +150,7 @@ class SettingAccountWrapper extends Component {
       },
       changeRecoveryEmailPopupParams: {
         isDisabledSubmitButton: true,
+        recoveryEmailConfirmed: props.recoveryEmailConfirmed,
         recoveryEmailInput: {
           name: 'recoveryEmailInput',
           type: 'text',
@@ -470,6 +471,8 @@ class SettingAccountWrapper extends Component {
         newState = {
           changeRecoveryEmailPopupParams: {
             isDisabledSubmitButton: true,
+            recoveryEmailConfirmed: this.state.recoveryEmailParams
+              .recoveryEmailConfirmed,
             recoveryEmailInput: {
               name: 'recoveryEmailInput',
               type: 'text',
@@ -1405,6 +1408,10 @@ class SettingAccountWrapper extends Component {
       recoveryEmailParams: {
         recoveryEmail: recoveryEmail,
         recoveryEmailConfirmed: false
+      },
+      changeRecoveryEmailPopupParams: {
+        ...this.state.changeRecoveryEmailPopupParams,
+        recoveryEmailConfirmed: false
       }
     });
   };
@@ -1414,6 +1421,10 @@ class SettingAccountWrapper extends Component {
       recoveryEmailParams: {
         ...this.state.recoveryEmailParams,
         recoveryEmailConfirmed: true
+      },
+      changeRecoveryEmailPopupParams: {
+        ...this.state.changeRecoveryEmailPopupParams,
+        recoveryEmailConfirmed: true
       }
     });
   };

email_mailbox/src/components/SettingsPopup.js

@@ -103,6 +103,9 @@ const SettingsPopup = props => {
           recoveryEmailPopupInputPassword={
             props.changeRecoveryEmailPopupParams.recoveryEmailPasswordInput
           }
+          recoveryEmailConfirmed={
+            props.changeRecoveryEmailPopupParams.recoveryEmailConfirmed
+          }
           theme={'dark'}
         />
       );

email_mailbox/src/libs/signal.js

@@ -62,9 +62,13 @@ const decryptEmail = async ({
     throw new Error(ALICE_ERROR);
   } else if (res.status === 500) {
     const aliceError = await res.text();
-    throw new Error(`${CONTENT_UNENCRYPTED} - ${aliceError}`);
+    return {
+      signalError: new Error(`${CONTENT_UNENCRYPTED} - ${aliceError}`)
+    };
   } else if (res.status === 409) {
-    throw new Error(DUPLICATE_MESSAGE);
+    return {
+      signalError: new Error(DUPLICATE_MESSAGE)
+    };
   } else if (res.status !== 200) {
     throw new Error(ALICE_ERROR);
   }

email_mailbox/src/utils/electronEventInterface.js

@@ -41,6 +41,7 @@ import {
   getLabelByUuid,
   logoutApp,
   openFilledComposerWindow,
+  reencryptEmail,
   reportContentUnencrypted,
   reportContentUnencryptedBob,
   restartConnection,
@@ -63,7 +64,8 @@ import {
   updateDeviceType,
   initAutoBackupMonitor,
   updateAccountDefaultAddress,
-  createOrUpdateContact
+  createOrUpdateContact,
+  reportUncaughtError
 } from './ipc';
 import {
   checkEmailIsTo,
@@ -132,6 +134,8 @@ let profileHasChanged = false;
 let newEmailNotificationList = [];
 let deleteDataIntervalId = null;
 
+const FATAL_ERROR = 1;
+
 const stopGettingEvents = () => {
   isGettingEvents = false;
   emitter.emit(Event.STOP_LOAD_SYNC, {});
@@ -615,7 +619,8 @@ const formEmailIfNotExists = async params => {
     isSpam,
     recipients,
     guestEncryption,
-    external
+    external,
+    rowid
   } = params;
 
   const labelIds = [];
@@ -624,11 +629,7 @@ const formEmailIfNotExists = async params => {
     myFileKeys;
 
   try {
-    const {
-      decryptedBody,
-      decryptedHeaders,
-      decryptedFileKeys
-    } = await signal.decryptEmail({
+    const decryptResult = await signal.decryptEmail({
       accountRecipientId,
       optionalToken,
       bodyKey: metadataKey,
@@ -637,37 +638,56 @@ const formEmailIfNotExists = async params => {
       messageType,
       fileKeys: fileKeys || (fileKey ? [fileKey] : null)
     });
-    body = cleanEmailBody(decryptedBody);
-    headers = decryptedHeaders;
-    myFileKeys = decryptedFileKeys
-      ? decryptedFileKeys.map(fileKey => {
-          const fileKeySplit = fileKey.split(':');
-          return {
-            key: fileKeySplit[0],
-            iv: fileKeySplit[1]
-          };
-        })
-      : null;
-  } catch (e) {
-    if (
-      e.message === signal.ALICE_ERROR ||
-      e.message === signal.CONTENT_NOT_AVAILABLE ||
-      e instanceof TypeError
-    ) {
-      return {
-        error: 1
-      };
-    } else if (e.message === signal.DUPLICATE_MESSAGE) {
-      return {
-        error: 2
-      };
-    }
-    body = 'Content unencrypted';
-    if (external) {
-      reportContentUnencryptedBob(e.stack);
+    if (decryptResult.signalError) {
+      if (external) {
+        const reencryptRes = await reencryptEmail({
+          metadataKey,
+          eventid: rowid,
+          recipientId: accountRecipientId
+        });
+        if (!reencryptRes) return { error: FATAL_ERROR };
+
+        switch (reencryptRes.status) {
+          case 200:
+            return {
+              error: FATAL_ERROR
+            };
+          case 429:
+            reportContentUnencryptedBob(decryptResult.signalError);
+            break;
+          default:
+            return {
+              error: FATAL_ERROR
+            };
+        }
+        body = 'Content unencrypted';
+      } else {
+        reportContentUnencrypted(decryptResult.signalError);
+        body = 'Content unencrypted';
+      }
     } else {
-      reportContentUnencrypted(e.stack);
+      const {
+        decryptedBody,
+        decryptedHeaders,
+        decryptedFileKeys
+      } = decryptResult;
+      body = cleanEmailBody(decryptedBody);
+      headers = decryptedHeaders;
+      myFileKeys = decryptedFileKeys
+        ? decryptedFileKeys.map(fileKey => {
+            const fileKeySplit = fileKey.split(':');
+            return {
+              key: fileKeySplit[0],
+              iv: fileKeySplit[1]
+            };
+          })
+        : null;
     }
+  } catch (e) {
+    reportUncaughtError(e.stack);
+    return {
+      error: FATAL_ERROR
+    };
   }
 
   if (!fileKeys && fileKey) {
@@ -881,7 +901,8 @@ const handleNewMessageEvent = async (
         isSpam,
         recipients,
         guestEncryption,
-        external
+        external,
+        rowid
       })
     : await formEmailIfExists({
         accountId,
@@ -894,7 +915,7 @@ const handleNewMessageEvent = async (
 
   if (error) {
     return {
-      rowid: error === 1 ? null : rowid
+      rowid: error === FATAL_ERROR ? null : rowid
     };
   }
 

email_mailbox/src/utils/ipc.js

@@ -226,6 +226,10 @@ export const postPeerEvent = async params => {
   return await ipc.callMain('client-post-peer-event', params);
 };
 
+export const reencryptEmail = async params => {
+  return await ipc.callMain('client-reencrypt-email', params);
+};
+
 export const registerDomain = async domain => {
   return await ipc.callMain('client-register-domain', domain);
 };