release: New release v5.10.5.

Signed-off-by: Anders Kaseorg <anders@zulip.com>

app/common/config-util.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 
-import * as Sentry from "@sentry/electron";
+import * as Sentry from "@sentry/core";
 import {JsonDB} from "node-json-db";
 import {DataError} from "node-json-db/dist/lib/Errors";
 import type {z} from "zod";

app/main/autoupdater.ts

@@ -2,7 +2,7 @@ import {shell} from "electron/common";
 import {app, dialog, session} from "electron/main";
 import process from "node:process";
 
-import log from "electron-log";
+import log from "electron-log/main";
 import type {UpdateDownloadedEvent, UpdateInfo} from "electron-updater";
 import {autoUpdater} from "electron-updater";
 
@@ -31,9 +31,10 @@ export async function appUpdater(updateFromMenu = false): Promise<void> {
   let updateAvailable = false;
 
   // Log what's happening
-  log.transports.file.fileName = "updates.log";
-  log.transports.file.level = "info";
-  autoUpdater.logger = log;
+  const updateLogger = log.create({logId: "updates"});
+  updateLogger.transports.file.fileName = "updates.log";
+  updateLogger.transports.file.level = "info";
+  autoUpdater.logger = updateLogger;
 
   // Handle auto updates for beta/pre releases
   const isBetaUpdate = ConfigUtil.getConfigItem("betaUpdate", false);

app/main/index.ts

@@ -1,7 +1,14 @@
 import type {Event} from "electron/common";
 import {clipboard} from "electron/common";
 import type {IpcMainEvent, WebContents} from "electron/main";
-import {BrowserWindow, app, dialog, powerMonitor, session} from "electron/main";
+import {
+  BrowserWindow,
+  app,
+  dialog,
+  powerMonitor,
+  session,
+  webContents,
+} from "electron/main";
 import {Buffer} from "node:buffer";
 import crypto from "node:crypto";
 import path from "node:path";
@@ -389,6 +396,21 @@ ${error}`,
     },
   );
 
+  ipcMain.on(
+    "forward-to",
+    <Channel extends keyof RendererMessage>(
+      _event: IpcMainEvent,
+      webContentsId: number,
+      listener: Channel,
+      ...parameters: Parameters<RendererMessage[Channel]>
+    ) => {
+      const contents = webContents.fromId(webContentsId);
+      if (contents !== undefined) {
+        send(contents, listener, ...parameters);
+      }
+    },
+  );
+
   ipcMain.on("update-menu", (_event, props: MenuProps) => {
     AppMenu.setMenu(props);
     if (props.activeTabIndex !== undefined) {

app/main/request.ts

@@ -6,7 +6,7 @@ import {Readable} from "node:stream";
 import {pipeline} from "node:stream/promises";
 import type {ReadableStream} from "node:stream/web";
 
-import * as Sentry from "@sentry/electron";
+import * as Sentry from "@sentry/electron/main";
 import {z} from "zod";
 
 import Logger from "../common/logger-util.js";

app/main/sentry.ts

@@ -1,6 +1,6 @@
 import {app} from "electron/main";
 
-import * as Sentry from "@sentry/electron/main"; // eslint-disable-line n/file-extension-in-import
+import * as Sentry from "@sentry/electron/main";
 
 import {getConfigItem} from "../common/config-util.js";
 

app/main/typed-ipc-main.ts

@@ -33,6 +33,15 @@ export const ipcMain: {
       ...args: Parameters<RendererMessage[Channel]>
     ) => void,
   ): void;
+  on(
+    channel: "forward-to",
+    listener: <Channel extends keyof RendererMessage>(
+      event: IpcMainEvent,
+      webContentsId: number,
+      channel: Channel,
+      ...args: Parameters<RendererMessage[Channel]>
+    ) => void,
+  ): void;
   on<Channel extends keyof MainMessage>(
     channel: Channel,
     listener: MainListener<Channel>,

app/renderer/js/components/webview.ts

@@ -10,7 +10,7 @@ import type {Html} from "../../../common/html.js";
 import {html} from "../../../common/html.js";
 import type {RendererMessage} from "../../../common/typed-ipc.js";
 import type {TabRole} from "../../../common/types.js";
-import preloadCss from "../../css/preload.css?raw"; // eslint-disable-line n/file-extension-in-import
+import preloadCss from "../../css/preload.css?raw";
 import {ipcRenderer} from "../typed-ipc-renderer.js";
 import * as SystemUtil from "../utils/system-util.js";
 
@@ -226,7 +226,7 @@ export default class WebView {
     channel: Channel,
     ...args: Parameters<RendererMessage[Channel]>
   ): void {
-    ipcRenderer.sendTo(this.webContentsId, channel, ...args);
+    ipcRenderer.send("forward-to", this.webContentsId, channel, ...args);
   }
 
   private registerListeners(): void {

app/renderer/js/electron-bridge.ts

@@ -1,4 +1,4 @@
-import {EventEmitter} from "events"; // eslint-disable-line unicorn/prefer-node-protocol
+import {EventEmitter} from "node:events";
 
 import type {ClipboardDecrypter} from "./clipboard-decrypter.js";
 import {ClipboardDecrypterImpl} from "./clipboard-decrypter.js";

app/renderer/js/main.ts

@@ -5,7 +5,7 @@ import url from "node:url";
 
 import {Menu, app, dialog, session} from "@electron/remote";
 import * as remote from "@electron/remote";
-import * as Sentry from "@sentry/electron";
+import * as Sentry from "@sentry/electron/renderer";
 
 import type {Config} from "../../common/config-util.js";
 import * as ConfigUtil from "../../common/config-util.js";
@@ -156,12 +156,12 @@ export class ServerManagerView {
       ConfigUtil.getConfigItem("useSystemProxy", false)
         ? {mode: "system"}
         : ConfigUtil.getConfigItem("useManualProxy", false)
-        ? {
-            pacScript: ConfigUtil.getConfigItem("proxyPAC", ""),
-            proxyRules: ConfigUtil.getConfigItem("proxyRules", ""),
-            proxyBypassRules: ConfigUtil.getConfigItem("proxyBypass", ""),
-          }
-        : {mode: "direct"},
+          ? {
+              pacScript: ConfigUtil.getConfigItem("proxyPAC", ""),
+              proxyRules: ConfigUtil.getConfigItem("proxyRules", ""),
+              proxyBypassRules: ConfigUtil.getConfigItem("proxyBypass", ""),
+            }
+          : {mode: "direct"},
     );
   }
 

app/renderer/js/pages/preference/general-section.ts

@@ -356,7 +356,8 @@ export function initGeneralSection({$root}: GeneralSectionProps): void {
         const newValue = !ConfigUtil.getConfigItem("silent", true);
         ConfigUtil.setConfigItem("silent", newValue);
         updateSilentOption();
-        ipcRenderer.sendTo(
+        ipcRenderer.send(
+          "forward-to",
           currentBrowserWindow.webContents.id,
           "toggle-silent",
           newValue,

app/renderer/js/tray.ts

@@ -138,7 +138,7 @@ function sendAction<Channel extends keyof RendererMessage>(
     win.restore();
   }
 
-  ipcRenderer.sendTo(win.webContents.id, channel, ...args);
+  ipcRenderer.send("forward-to", win.webContents.id, channel, ...args);
 }
 
 const createTray = function (): void {

app/renderer/js/typed-ipc-renderer.ts

@@ -37,6 +37,12 @@ export const ipcRenderer: {
     rendererChannel: Channel,
     ...args: Parameters<RendererMessage[Channel]>
   ): void;
+  send<Channel extends keyof RendererMessage>(
+    channel: "forward-to",
+    webContentsId: number,
+    rendererChannel: Channel,
+    ...args: Parameters<RendererMessage[Channel]>
+  ): void;
   send<Channel extends keyof MainMessage>(
     channel: Channel,
     ...args: Parameters<MainMessage[Channel]>
@@ -56,11 +62,6 @@ export const ipcRenderer: {
       : never,
     transfer?: MessagePort[],
   ): void;
-  sendTo<Channel extends keyof RendererMessage>(
-    webContentsId: number,
-    channel: Channel,
-    ...args: Parameters<RendererMessage[Channel]>
-  ): void;
   sendToHost<Channel extends keyof RendererMessage>(
     channel: Channel,
     ...args: Parameters<RendererMessage[Channel]>

app/renderer/js/utils/domain-util.ts

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 
 import {app, dialog} from "@electron/remote";
-import * as Sentry from "@sentry/electron";
+import * as Sentry from "@sentry/electron/renderer";
 import {JsonDB} from "node-json-db";
 import {DataError} from "node-json-db/dist/lib/Errors";
 import {z} from "zod";

app/renderer/main.html

@@ -2,6 +2,10 @@
 <html lang="en" class="responsive desktop">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta
+      http-equiv="Content-Security-Policy"
+      content="default-src 'none'; connect-src 'self'; font-src 'self'; img-src 'self' data:; script-src 'self'; style-src 'self' 'unsafe-inline'"
+    />
     <meta name="viewport" content="width=device-width" />
     <title>Zulip</title>
     <link rel="stylesheet" href="css/fonts.css" />

app/renderer/network.html

@@ -2,6 +2,10 @@
 <html lang="en" class="responsive desktop">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta
+      http-equiv="Content-Security-Policy"
+      content="default-src 'none'; connect-src 'self'; img-src 'self'; script-src 'self'; style-src 'self'"
+    />
     <meta name="viewport" content="width=device-width" />
     <title>Zulip - Network Troubleshooting</title>
     <link

changelog.md

@@ -2,6 +2,22 @@
 
 All notable changes to the Zulip desktop app are documented in this file.
 
+### v5.10.5 --2024-01-25
+
+**Dependencies**:
+
+- Upgraded all dependencies, including Electron 28.2.0.
+
+**Enhancements**:
+
+- Improved security hardening by setting a Content-Security-Policy for the app UI.
+
+### v5.10.4 --2024-01-09
+
+**Dependencies**:
+
+- Upgraded all dependencies, including Electron 28.1.1.
+
 ### v5.10.3 --2023-09-30
 
 **Fixes**:

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "5.10.3",
+  "version": "5.10.5",
   "main": "./dist-electron",
   "description": "Zulip Desktop App",
   "license": "Apache-2.0",
@@ -147,6 +147,7 @@
   },
   "devDependencies": {
     "@electron/remote": "^2.0.8",
+    "@sentry/core": "^7.94.1",
     "@sentry/electron": "^4.1.2",
     "@types/adm-zip": "^0.5.0",
     "@types/auto-launch": "^5.0.2",
@@ -159,9 +160,9 @@
     "adm-zip": "^0.5.5",
     "auto-launch": "^5.0.5",
     "backoff": "^2.5.0",
-    "electron": "^25.8.1",
+    "electron": "^28.1.1",
     "electron-builder": "^24.6.4",
-    "electron-log": "^4.3.5",
+    "electron-log": "^5.0.3",
     "electron-updater": "^6.1.4",
     "electron-window-state": "^5.0.3",
     "escape-goat": "^4.0.0",
@@ -170,17 +171,17 @@
     "iso-639-1": "^3.1.0",
     "medium": "^1.2.0",
     "node-json-db": "^1.3.0",
-    "playwright-core": "^1.30.0-alpha-jan-3-2023",
+    "playwright-core": "^1.41.0-alpha-jan-9-2024",
     "pre-commit": "^1.2.2",
     "prettier": "^3.0.3",
     "rimraf": "^5.0.0",
     "semver": "^7.3.5",
-    "stylelint": "^15.6.1",
-    "stylelint-config-standard": "^34.0.0",
+    "stylelint": "^16.1.0",
+    "stylelint-config-standard": "^36.0.0",
     "tape": "^5.2.2",
     "typescript": "^5.0.4",
-    "vite": "^4.1.1",
-    "vite-plugin-electron": "^0.14.1",
+    "vite": "^5.0.11",
+    "vite-plugin-electron": "^0.28.0",
     "xo": "^0.56.0",
     "zod": "^3.5.1"
   },
@@ -239,6 +240,10 @@
         "error",
         {
           "paths": [
+            {
+              "name": "@sentry/electron",
+              "message": "Use @sentry/electron/main, @sentry/electron/renderer, or @sentry/core."
+            },
             {
               "name": "electron",
               "message": "Use electron/main, electron/renderer, or electron/common."
@@ -256,6 +261,10 @@
                 "ipcRenderer"
               ],
               "message": "Use typed-ipc-renderer."
+            },
+            {
+              "name": "electron-log",
+              "message": "Use electron-log/main or electron-log/renderer."
             }
           ]
         }

tsconfig.json

@@ -8,6 +8,6 @@
     "resolveJsonModule": true,
     "strict": true,
     "noImplicitOverride": true,
-    "types": ["vite/client"]
-  }
+    "types": ["vite/client"],
+  },
 }

vite.config.ts

@@ -5,15 +5,6 @@ import * as path from "node:path";
 import {defineConfig} from "vite";
 import electron from "vite-plugin-electron";
 
-let resolvePreload: () => void;
-let resolveRenderer: () => void;
-const whenPreload = new Promise<void>((resolve) => {
-  resolvePreload = resolve;
-});
-const whenRenderer = new Promise<void>((resolve) => {
-  resolveRenderer = resolve;
-});
-
 export default defineConfig({
   plugins: [
     electron([
@@ -21,11 +12,6 @@ export default defineConfig({
         entry: {
           index: "app/main",
         },
-        async onstart({startup}) {
-          await whenPreload;
-          await whenRenderer;
-          await startup();
-        },
         vite: {
           build: {
             sourcemap: true,
@@ -48,9 +34,6 @@ export default defineConfig({
         entry: {
           preload: "app/renderer/js/preload.ts",
         },
-        onstart() {
-          resolvePreload();
-        },
         vite: {
           build: {
             sourcemap: "inline",
@@ -64,9 +47,6 @@ export default defineConfig({
         entry: {
           renderer: "app/renderer/js/main.ts",
         },
-        onstart() {
-          resolveRenderer();
-        },
         vite: {
           build: {
             sourcemap: true,