#5569 Add compliance with Trusted Types (#5575)

* #5569 Add temporary fix for trusted types * fix tests * fix print page * update purify.d.ts
FlowCrypt · Jan 24, 2024 · 7dbae7d · 7dbae7d
1 parent a403966
commit 7dbae7d
Show file tree

Hide file tree

Showing 42 changed files with 322 additions and 397 deletions.
diff --git a/extension/chrome/dev/ci_unit_test.htm b/extension/chrome/dev/ci_unit_test.htm
@@ -10,6 +10,7 @@
     <h1 id="h1">loading..</h1>
     <p>running..</p>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/openpgp.js"></script>
     <script src="/lib/jquery.min.js"></script>

diff --git a/extension/chrome/dev/export.htm b/extension/chrome/dev/export.htm
@@ -12,6 +12,7 @@
   <body id="settings">
     <pre style="text-align: left; font-family: monospace"></pre>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/elements/add_pubkey.htm b/extension/chrome/elements/add_pubkey.htm
@@ -48,6 +48,7 @@ <h1>Add a public key to email address</h1>
       <div id="fineuploader" class="display_none"></div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/elements/attachment.htm b/extension/chrome/elements/attachment.htm
@@ -21,6 +21,7 @@
     </div>
     <div id="name" data-test="attachment-name"></div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/elements/attachment_preview.htm b/extension/chrome/elements/attachment_preview.htm
@@ -21,6 +21,7 @@
 
     <div id="attachment-preview-container"></div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/elements/backup.htm b/extension/chrome/elements/backup.htm
@@ -25,6 +25,7 @@
       </div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/elements/compose.htm b/extension/chrome/elements/compose.htm
@@ -228,6 +228,7 @@ <h1 id="header_title" data-test="header-title">New Secure Message</h1>
         <div id="attachments" data-test="replied-attachments"></div>
       </div>
     </div>
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/openpgp.js"></script>
     <script src="/lib/jquery.min.js"></script>

diff --git a/extension/chrome/elements/oauth2.htm b/extension/chrome/elements/oauth2.htm
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <title>OAuth 2.0 Finish Page</title>

diff --git a/extension/chrome/elements/passphrase.htm b/extension/chrome/elements/passphrase.htm
@@ -1,6 +1,6 @@
 <!-- © 2016-2018 FlowCrypt Limited. Limitations apply. Contact [email protected] -->
 
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta content="text/html;charset=utf-8" http-equiv="Content-Type" />
@@ -45,6 +45,7 @@ <h1 class="passphrase_text" data-test="passphrase-text"></h1>
       >
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/elements/pgp_block.htm b/extension/chrome/elements/pgp_block.htm
@@ -34,6 +34,7 @@
       <div id="pgp_block" data-test="pgp-block-content">Loading...</div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/openpgp.js"></script>
     <script src="/lib/jquery.min.js"></script>

diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-print-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-print-module.ts
@@ -15,7 +15,7 @@ export class PgpBlockViewPrintModule {
       return;
     }
     const w = window.open();
-    const html = `
+    let html = `
       <!DOCTYPE html>
       <html lang="en-us">
       <head>
@@ -81,6 +81,12 @@ export class PgpBlockViewPrintModule {
       </body>
       </html>
     `;
+    if (w?.trustedTypes && w?.trustedTypes.createPolicy) {
+      const policy = w?.trustedTypes.createPolicy('print-policy', {
+        createHTML: (string: string) => string,
+      });
+      html = policy.createHTML(html);
+    }
     w?.document.write(html);
     // Give some time for above dom to load in print dialog
     // https://stackoverflow.com/questions/31725373/google-chrome-not-showing-image-in-print-preview

diff --git a/extension/chrome/elements/pgp_pubkey.htm b/extension/chrome/elements/pgp_pubkey.htm
@@ -35,6 +35,7 @@
       <pre class="pubkey hide_if_compact"></pre>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/popups/default.htm b/extension/chrome/popups/default.htm
@@ -25,6 +25,7 @@
       </div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/popups/select_account.htm b/extension/chrome/popups/select_account.htm
@@ -19,6 +19,7 @@
       <a href="#" class="action_add_account">Add Account</a>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/fatal.htm b/extension/chrome/settings/fatal.htm
@@ -23,6 +23,7 @@
       <div class="details">loading details..</div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/inbox/inbox.htm b/extension/chrome/settings/inbox/inbox.htm
@@ -45,6 +45,7 @@ <h1></h1>
       </tr>
     </table>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/index.htm b/extension/chrome/settings/index.htm
@@ -240,6 +240,7 @@ <h1 class="text-center">FlowCrypt Settings</h1>
       </div>
     </section>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/initial.htm b/extension/chrome/settings/initial.htm
@@ -46,6 +46,7 @@
       </div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="initial.js" type="module"></script>
   </body>

diff --git a/extension/chrome/settings/initial.ts b/extension/chrome/settings/initial.ts
@@ -8,10 +8,10 @@ import { View } from '../../js/common/view.js';
 View.run(
   class InitialView extends View {
     public render = async () => {
-      if (Catch.browser().name === 'chrome' && Number(Catch.browser().v) >= 76) {
-        $('#chrome-steps').css('display', 'block');
-      } else {
-        $('#firefox-steps').css('display', 'block');
+      const browserName = Catch.browser().name === 'chrome' && Number(Catch.browser().v) >= 76 ? 'chrome' : 'firefox';
+      const stepsEl = document.getElementById(`${browserName}-steps`);
+      if (stepsEl) {
+        stepsEl.style.display = 'block';
       }
     };
 

diff --git a/extension/chrome/settings/modules/add_key.htm b/extension/chrome/settings/modules/add_key.htm
@@ -68,6 +68,7 @@ <h1>Add Private Key <span id="spinner_container"></span></h1>
       <div id="compatibility_fix" class="compatibility_fix_container"></div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/fine-uploader.js"></script>
     <script src="/lib/jquery.min.js"></script>

diff --git a/extension/chrome/settings/modules/backup.htm b/extension/chrome/settings/modules/backup.htm
@@ -16,6 +16,7 @@
   <body id="settings" data-test="container-backup-dialog">
     <div id="backup-template-container"></div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/modules/change_passphrase.htm b/extension/chrome/settings/modules/change_passphrase.htm
@@ -55,6 +55,7 @@
       </div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/modules/compatibility.htm b/extension/chrome/settings/modules/compatibility.htm
@@ -54,6 +54,7 @@ <h1>OpenPGP key compatibility test</h1>
       </div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/modules/contacts.htm b/extension/chrome/settings/modules/contacts.htm
@@ -87,6 +87,7 @@ <h1></h1>
       </div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/modules/debug_api.htm b/extension/chrome/settings/modules/debug_api.htm
@@ -14,6 +14,7 @@
       <p>This page is meant for debugging purposes. If you have questions, please email [email protected]</p>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/modules/decrypt.htm b/extension/chrome/settings/modules/decrypt.htm
@@ -36,6 +36,7 @@ <h1>Decrypt a file</h1>
       </div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/modules/experimental.htm b/extension/chrome/settings/modules/experimental.htm
@@ -37,6 +37,7 @@ <h1>Experimental functionality</h1>
     <div class="line">
       <a href="#" class="action_reset_account bad" data-test="action-reset-account">Reset <span class="email"></span> and set it up again</a>
     </div>
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/modules/help.htm b/extension/chrome/settings/modules/help.htm
@@ -29,6 +29,7 @@ <h2>Send message to FlowCrypt developers</h2>
       </div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/modules/keyserver.htm b/extension/chrome/settings/modules/keyserver.htm
@@ -23,6 +23,7 @@ <h1>Let others encrypt for you easier</h1>
       <div class="line summary"></div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/modules/my_key.htm b/extension/chrome/settings/modules/my_key.htm
@@ -58,6 +58,7 @@
       </div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/modules/my_key_update.htm b/extension/chrome/settings/modules/my_key_update.htm
@@ -51,6 +51,7 @@
     </div>
     <div id="compatibility_fix" class="compatibility_fix_container"></div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/fine-uploader.js"></script>
     <script src="/lib/jquery.min.js"></script>

diff --git a/extension/chrome/settings/modules/my_key_user_ids.htm b/extension/chrome/settings/modules/my_key_user_ids.htm
@@ -26,6 +26,7 @@
       <div class="line"><a href="#" class="action_show_public_key">Back to Public Key</a></div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/modules/security.htm b/extension/chrome/settings/modules/security.htm
@@ -71,6 +71,7 @@ <h3>Password protected messages</h3>
     </p> -->
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/modules/test_passphrase.htm b/extension/chrome/settings/modules/test_passphrase.htm
@@ -28,6 +28,7 @@
       <div class="line">Cannot remember? <a href="#" class="action_change_passphrase">Change your pass phrase</a></div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>

diff --git a/extension/chrome/settings/setup.htm b/extension/chrome/settings/setup.htm
@@ -369,6 +369,7 @@ <h1>Set Up FlowCrypt</h1>
       </div>
     </div>
 
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/fine-uploader.js"></script>
     <script src="/lib/jquery.min.js"></script>

diff --git a/extension/js/background_page/background_page.htm b/extension/js/background_page/background_page.htm
@@ -4,6 +4,7 @@
   </head>
 
   <body>
+    <script src="/lib/trusted-types.js"></script>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/openpgp.js"></script>
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,7 @@ @@
           </div>
         </div>
+        <script src="/lib/trusted-types.js"></script>
         <script src="/lib/jquery.min.js"></script>
         <script src="initial.js" type="module"></script>
       </body>
@@ Expand Down @@