Fix Unrecoverable state in login screen

Electron does not dispatch did-fail-load when we return a valid response
 e.g. 404 or 500
Fixed by throwing Error instead to setting status 404 which will
dispatch did-fail-load should redirect to startPage whenever failed
to load resource.

Close: #9160

Co-authored-by: ivk <[email protected]>
Co-authored-by: paw <[email protected]>

Author: 3 people

src/common/desktop/ApplicationWindow.ts

@@ -413,17 +413,14 @@ export class ApplicationWindow {
 			})
 			.on("did-fail-load", (evt, errorCode, errorDesc, validatedURL) => {
 				log.debug(TAG, "failed to load resource: ", validatedURL, errorDesc)
-
-				if (errorDesc === "ERR_FILE_NOT_FOUND") {
-					this.getInitialUrl({
-						noAutoLogin: true,
+				this.getInitialUrl({
+					noAutoLogin: true,
+				})
+					.then((initialUrl) => {
+						log.debug(TAG, "redirecting to start page...", initialUrl)
+						return this._browserWindow.loadURL(initialUrl)
 					})
-						.then((initialUrl) => {
-							log.debug(TAG, "redirecting to start page...", initialUrl)
-							return this._browserWindow.loadURL(initialUrl)
-						})
-						.then(() => log.debug(TAG, "...redirected"))
-				}
+					.then(() => log.debug(TAG, "...redirected"))
 			})
 			// @ts-ignore
 			.on("remote-require", (e) => e.preventDefault())

src/common/desktop/net/ProtocolProxy.ts

@@ -83,7 +83,9 @@ function handleAssetProtocol(session: Session, assetDir: string, pathModule: typ
 	session.protocol.handle(ASSET_PROTOCOL, async (request: Request): Promise<Response> => {
 		const fail = (msg: string) => {
 			log.debug(TAG, msg)
-			return new Response(null, { status: 404 })
+			// electron does not dispatch did-fail-load when we return a valid response e.g. 404 or 500.
+			// unexpected error at least get dispatched
+			throw new Error(`assert protocol failure: ${msg}`)
 		}
 		// in node, new URL will normalize the path and remove /.. and /. elements.
 		// this doesn't work in browsers, so the startsWith check below should stay just to be sure
@@ -98,7 +100,7 @@ function handleAssetProtocol(session: Session, assetDir: string, pathModule: typ
 				return fail(`Invalid asset URL ${request.url} w/ pathname ${url.pathname} got resolved to ${filePath})`)
 			} else {
 				try {
-					return fileFetch(filePath, fsModule)
+					return await fileFetch(filePath, fsModule)
 				} catch (e) {
 					return fail(`failed to read asset at ${request.url}: ${e.message}`)
 				}

test/tests/desktop/ApplicationWindowTest.ts

@@ -378,22 +378,22 @@ o.spec("ApplicationWindow Test", function () {
 		o(url.searchParams.get("theme")).equals(themeJson)
 	})
 
-	o.test("redirect to start page after failing to load a page due to 404", async function () {
+	o.test("redirect to start page after failing to load a page", async function () {
 		const { wmMock, electronMock, electronLocalshortcutMock, themeFacade, remoteBridge } = standardMocks()
 		const w = new ApplicationWindow(wmMock, desktopHtml, icon, electronMock, electronLocalshortcutMock, themeFacade, remoteBridge)
 		const bwInstance = electronMock.BrowserWindow.mockedInstances[0]
 		await bwInstance.__loadedUrl.promise
 		bwInstance.__loadedUrl = defer()
-		bwInstance.webContents.callbacks["did-fail-load"]({}, -6, "ERR_FILE_NOT_FOUND")
+		bwInstance.webContents.callbacks["did-fail-load"]({}, -6)
 		await bwInstance.__loadedUrl.promise
 		o(bwInstance.loadURL.callCount).equals(2)
 		const themeJson = JSON.stringify(await themeFacade.getCurrentThemeWithFallback())
 		const url = new URL(bwInstance.loadURL.args[0])
 		o(url.searchParams.get("noAutoLogin")).equals("true")
 		o(url.searchParams.get("theme")).equals(themeJson)
-		downcast(w._browserWindow.webContents).callbacks["did-fail-load"]({}, -6, "ERR_SOME_OTHER_ONE")
+		downcast(w._browserWindow.webContents).callbacks["did-fail-load"]({}, -6)
 		await delay(10)
-		o(bwInstance.loadURL.callCount).equals(2)
+		o(bwInstance.loadURL.callCount).equals(3)
 	})
 
 	o.test("shortcut creation, linux", function () {

test/tests/desktop/net/ProtocolProxyTest.ts

@@ -4,6 +4,7 @@ import { OutgoingHttpHeader } from "node:http"
 import { func, matchers, object, verify, when } from "testdouble"
 import { doHandleProtocols, handleProtocols } from "../../../../src/common/desktop/net/ProtocolProxy.js"
 import { utf8Uint8ArrayToString } from "@tutao/tutanota-utils"
+import { assertThrows } from "@tutao/tutanota-test-utils"
 
 o.spec("ProtocolProxy", function () {
 	let fetchMock
@@ -137,17 +138,17 @@ o.spec("ProtocolProxy", function () {
 			when(protocol.handle("asset", captor.capture())).thenReturn(undefined)
 			doHandleProtocols(ses, "/tutanota/assets", fetchMock, path, fs)
 			const request = { url: "basset://app/noodles.txt" }
-			const responseFromSubject = await captor.value(request)
-			o(await responseFromSubject.status).deepEquals(404)
+			const error = await assertThrows(Error, () => captor.value(request))
+			o.check(error.message).equals("assert protocol failure: passed non-asset url to asset handler: basset://app/noodles.txt")
 		})
 
 		o("rejects non-app hostname", async function () {
 			const captor = matchers.captor()
 			when(protocol.handle("asset", captor.capture())).thenReturn(undefined)
 			doHandleProtocols(ses, "/tutanota/assets", fetchMock, path, fs)
 			const request = { url: "asset://bop/noodles.txt" }
-			const responseFromSubject = await captor.value(request)
-			o(await responseFromSubject.status).deepEquals(404)
+			const error = await assertThrows(Error, () => captor.value(request))
+			o.check(error.message).equals("assert protocol failure: Invalid asset:// URL: asset://bop/noodles.txt")
 		})
 	})
 })