Merge remote-tracking branch 'origin/master' into snyk-upgrade-b2d13a45dde8d6a84bc14386121a8e42

Author: martgil

.github/dependabot.yml

@@ -26,15 +26,11 @@ updates:
       # https://github.com/FlowCrypt/flowcrypt-browser/pull/3961#issuecomment-921335748
       - dependency-name: "iso-8859-2"
         versions: [ ">=1.0.1" ]
-      - dependency-name: "@openpgp/web-stream-tools"
-        versions: [">= 0.0.14"]
       - dependency-name: "ava"
         update-types: ["version-update:semver-major"]
       - dependency-name: "chai"
         update-types: ["version-update:semver-major"]
       - dependency-name: "chai-as-promised"
         update-types: ["version-update:semver-major"]
-      - dependency-name: "openpgp"
-        update-types: ["version-update:semver-major"]
       - dependency-name: "filesize"
-        versions: [ ">= 10.1.3" ]
+        versions: [ ">= 10.1.3" ]

.semaphore/semaphore.yml

@@ -61,7 +61,7 @@ blocks:
     run:
       when: branch = 'master' OR branch =~ 'live-test'  OR branch =~ 'gmail-test'
     execution_time_limit:
-      minutes: 45
+      minutes: 60
     task:
       secrets:
         - name: flowcrypt-browser-ci-secrets

extension/changelog.txt

@@ -1,5 +1,7 @@
 <div class="lightboxed">
 
+version 8.5.9 on February 5, 2025: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/482?closed=1" target="_blank">Password-protected messages improvements, fixes for switching to secure mode</a>
+
 version 8.5.8 on December 20, 2024: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/481?closed=1" target="_blank">Encryption keys generation, encrypted messages parsing improvements</a>
 
 version 8.5.7 on June 13, 2024: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/480?closed=1" target="_blank">Exception reports improvements</a>

extension/chrome/elements/compose-modules/formatters/encrypted-mail-msg-formatter.ts

@@ -181,10 +181,11 @@ export class EncryptedMsgMailFormatter extends BaseMailFormatter {
     { msgUrl, externalId }: { msgUrl: string; externalId?: string },
     signingPrv?: Key
   ) => {
-    // encoded as: PGP/MIME-like structure but with attachments as external files due to email size limit (encrypted for pubkeys only)
+    // encoded as: PGP/MIME-like structure
     const msgBody = this.richtext ? { 'text/plain': newMsg.plaintext, 'text/html': newMsg.plainhtml } : { 'text/plain': newMsg.plaintext };
+    const attachments = await this.view.attachmentsModule.attachment.collectEncryptAttachments(pubs);
     // eslint-disable-next-line @typescript-eslint/naming-convention
-    const pgpMimeNoAttachments = await Mime.encode(msgBody, { Subject: newMsg.subject }, []); // no attachments, attached to email separately
+    const pgpMimeNoAttachments = await Mime.encode(msgBody, { Subject: newMsg.subject }, attachments);
     const { data: pubEncryptedNoAttachments } = await this.encryptDataArmor(Buf.fromUtfStr(pgpMimeNoAttachments), undefined, pubs, signingPrv); // encrypted only for pubs
     const emailIntroAndLinkBody = await this.formatPwdEncryptedMsgBodyLink(msgUrl);
     return await SendableMsg.createPwdMsg(

extension/css/cryptup.css

@@ -2675,6 +2675,10 @@ div#contacts .select_contact .select_contact_email {
   text-overflow: ellipsis;
 }
 
+div#contacts .select_contact:hover {
+  background: #eee;
+}
+
 div#contacts ul li img,
 div#contacts div.allow-google-contact-search img {
   padding-left: 6px;

extension/img/svgs/reply-all-icon.svg

@@ -269,9 +269,15 @@ export class XssSafeFactory {
       </div>`;
   };
 
-  public actionsMenuBtn = (action: 'reply' | 'forward') => {
-    return `<div class="action_${action}_message_button action_menu_message_button" data-test="action-${action}-message-button">
-    <img src="${this.srcImg(`svgs/${action}-icon.svg`)}" /><span>secure ${action}</span>
+  public btnSecureMenuBtn = (replyOption: ReplyOption) => {
+    const actionText = replyOption.replace('a_', '').replace('_', ' ');
+    const action = {
+      underscore: actionText.replace(' ', '_'),
+      hyphen: actionText.replace(' ', '-'),
+    };
+    // * The action_${action.underscore}_message_button is used as an identifier in GmailElementReplacer.actionActivateSecureReplyHandler()
+    return `<div class="action_${action.underscore}_message_button action_menu_message_button" data-test="action-${action.hyphen}-message-button">
+    <img src="${this.srcImg(`svgs/${action.hyphen}-icon.svg`)}" /><span>secure ${actionText}</span>
     </div>`;
   };
 

extension/js/common/xss-safe-factory.ts

@@ -14,7 +14,6 @@ export abstract class WebmailElementReplacer {
   public abstract reinsertReplyBox: (replyMsgId: string) => void;
   public abstract scrollToReplyBox: (replyMsgId: string) => void;
   public abstract scrollToCursorInReplyBox: (replyMsgId: string, cursorOffsetTop: number) => void;
-  public abstract addSecureActionsToMessageMenu: () => void;
 
   public runIntervalFunctionsPeriodically = () => {
     const intervalFunctions = this.getIntervalFunctions();

extension/js/content_scripts/webmail/generic/webmail-element-replacer.ts

@@ -79,6 +79,7 @@ export class GmailElementReplacer extends WebmailElementReplacer {
     super();
     this.webmailCommon = new WebmailCommon(acctEmail, injector);
     this.pubLookup = new PubLookup(clientConfiguration);
+    this.setupSecureActionsOnGmailMenu();
   }
 
   public getIntervalFunctions = (): IntervalFunction[] => {
@@ -148,14 +149,14 @@ export class GmailElementReplacer extends WebmailElementReplacer {
     }
   };
 
-  public addSecureActionsToMessageMenu = () => {
-    $(document).on('click', 'div.aHU.hx', event => {
-      const $actionsBtn = $(event.currentTarget).find(this.sel.msgActionsBtn);
-      if ($actionsBtn.length && !$('.action_menu_message_button').length) {
-        this.addMenuButton('reply', '#r');
-        this.addMenuButton('forward', '#r3');
+  public setupSecureActionsOnGmailMenu = () => {
+    const observer = new MutationObserver(() => {
+      const gmailActionsMenu = document.querySelector(this.sel.msgActionsMenu);
+      if (gmailActionsMenu && (gmailActionsMenu as HTMLElement).offsetParent !== undefined) {
+        this.addSecureActionsToMessageMenu();
       }
     });
+    observer.observe(document.body, { childList: true, subtree: true });
   };
 
   private everything = () => {
@@ -291,13 +292,14 @@ export class GmailElementReplacer extends WebmailElementReplacer {
     return !!$('iframe.pgp_block').filter(':visible').length;
   };
 
-  private addMenuButton = (action: 'reply' | 'forward', selector: string) => {
-    const gmailActionsMenuContainer = $(this.sel.msgActionsMenu).find(selector);
-    const button = $(this.factory.actionsMenuBtn(action)).insertAfter(gmailActionsMenuContainer); // xss-safe-factory
-    button.on(
-      'click',
-      Ui.event.handle((el, ev: JQuery.Event) => this.actionActivateSecureReplyHandler(el, ev))
-    );
+  private addMenuButton = (replyOption: ReplyOption, gmailContextMenuBtn: string) => {
+    if ($(gmailContextMenuBtn).is(':visible')) {
+      const button = $(this.factory.btnSecureMenuBtn(replyOption)).insertAfter(gmailContextMenuBtn); // xss-safe-factory
+      button.on(
+        'click',
+        Ui.event.handle((el, ev: JQuery.Event) => this.actionActivateSecureReplyHandler(el, ev))
+      );
+    }
   };
 
   private replaceConvoBtns = (force = false) => {
@@ -371,7 +373,14 @@ export class GmailElementReplacer extends WebmailElementReplacer {
   private actionActivateSecureReplyHandler = async (btn: HTMLElement, event: JQuery.Event) => {
     event.stopImmediatePropagation();
     const secureReplyInvokedFromMenu = btn.className.includes('action_menu_message_button');
-    const replyOption: ReplyOption = btn.className.includes('reply') ? 'a_reply' : 'a_forward';
+    let replyOption: ReplyOption;
+    if (btn.className.includes('reply-all')) {
+      replyOption = 'a_reply_all';
+    } else if (btn.className.includes('forward')) {
+      replyOption = 'a_forward';
+    } else {
+      replyOption = 'a_reply';
+    }
     if ($('#switch_to_encrypted_reply').length) {
       $('#switch_to_encrypted_reply').trigger('click');
       return;
@@ -922,4 +931,13 @@ export class GmailElementReplacer extends WebmailElementReplacer {
       }
     }
   };
+
+  private addSecureActionsToMessageMenu = () => {
+    if ($('.action_menu_message_button').length) {
+      return;
+    }
+    this.addMenuButton('a_reply', '#r');
+    this.addMenuButton('a_reply_all', '#r2');
+    this.addMenuButton('a_forward', '#r3');
+  };
 }

extension/js/content_scripts/webmail/gmail/gmail-element-replacer.ts

@@ -45,7 +45,6 @@ export class GmailWebmailStartup {
     const messageRenderer = await MessageRenderer.newInstance(acctEmail, new Gmail(acctEmail), relayManager, factory);
     this.replacer = new GmailElementReplacer(factory, clientConfiguration, acctEmail, messageRenderer, injector, notifications, relayManager);
     await notifications.showInitial(acctEmail);
-    this.replacer.addSecureActionsToMessageMenu();
     this.replacer.runIntervalFunctionsPeriodically();
   };