π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(stream):pass-token-in-header
Aswin Asok25d46e8e3555
diff --git a/desktop/src/main/stream.ts b/desktop/src/main/stream.tsindex e092c7b982..05448e6069 100644--- a/desktop/src/main/stream.ts+++ b/desktop/src/main/stream.ts@@ -17,12 +17,12 @@ import {// This protocol avoids contextBridge's buffer copies for large files.export const registerStreamProtocol = (mainWindow: BrowserWindow) => {- protocol.handle("stream", (request: Request) => {+ protocol.handle("stream", async (request: Request) => {try {- return handleStreamRequest(mainWindow, request);+ return await handleStreamRequest(mainWindow, request);} catch (e) {- log.error(`Failed to handle stream request for ${request.url}`, e);- return new Response(String(e), { status: 500 });+ log.error("Failed to handle stream request", e);+ return new Response("Internal stream error", { status: 500 });}});};@@ -197,8 +197,9 @@ const handleGenerateHLSWrite = async () => {const fileID = parseInt(params.get("fileID") ?? "", 10);const fetchURL = params.get("fetchURL");- const authToken = params.get("authToken");- if (!fileID || !fetchURL || !authToken) throw new Error("Missing params");+ const authToken = request.headers.get("X-Auth-Token");+ if (!fileID || !fetchURL || !authToken)+ return new Response("Invalid generate HLS request", { status: 400 });let inputItem: Parameters<typeof makeFileForStreamOrPathOrZipItem>[0];const path = params.get("path");diff --git a/web/packages/gallery/utils/native-stream.ts b/web/packages/gallery/utils/native-stream.tsindex 7ba4adfdce..7a24944241 100644--- a/web/packages/gallery/utils/native-stream.ts+++ b/web/packages/gallery/utils/native-stream.ts@@ -96,7 +96,6 @@ export const initiateGenerateHLS = async (op: "generate-hls",fileID: fileID.toString(),fetchURL,- authToken,});let body: ReadableStream | null;@@ -118,13 +117,13 @@ export const initiateGenerateHLS = async (const url = `stream://video?${params.toString()}`;const res = await fetch(url, {method: "POST",+ headers: { "X-Auth-Token": authToken },// Chromium requires duplex for streamed request bodies.// @ts-expect-error duplex is missing from lib.dom.d.ts.duplex: "half",body,});- if (!res.ok)- throw new Error(`Failed to write stream to ${url}: HTTP ${res.status}`);+ if (!res.ok) throw new Error(`Failed to generate HLS: HTTP ${res.status}`);// 204 means the original video can be streamed as-is.if (res.status == 204) return undefined;