Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Use Museum v3 file URLs in workers

Manav Rathid9292f9c30ec
diff --git a/infra/workers/cast-albums/src/index.ts b/infra/workers/cast-albums/src/index.ts
index c0dc02d3cf..55c3ab7ed8 100644
--- a/infra/workers/cast-albums/src/index.ts
+++ b/infra/workers/cast-albums/src/index.ts
@@ -52,33 +52,19 @@ const handleGET = async (request: Request) => {
const fileID = url.searchParams.get("fileID");
if (!fileID) return new Response(null, { status: 400 });
- let castToken = request.headers.get("X-Cast-Access-Token");
- if (!castToken) {
- console.warn("Using deprecated castToken query param");
- castToken = url.searchParams.get("castToken");
+ const filePath = url.pathname.startsWith("/download")
+ ? "download"
+ : "thumbnail";
+ const museumURL = `https://api.ente.com/cast/files/${filePath}/v3/${fileID}`;
+ const museumRequest = new Request(museumURL, request);
+ const clientIP = request.headers.get("CF-Connecting-IP") ?? "";
+ museumRequest.headers.set("X-Forwarded-For", clientIP);
+ let response = await fetch(museumRequest);
+ if (response.ok) {
+ const { url } = await response.json<{ url: string }>();
+ response = await fetch(url);
}
- if (!castToken) {
- console.error("No cast token provided");
- return new Response(null, { status: 400 });
- }
-
- const pathname = url.pathname;
- const params = new URLSearchParams({ castToken });
-
- const headers = {
- "X-Client-Package": request.headers.get("X-Client-Package") ?? "",
- "X-Client-Version": request.headers.get("X-Client-Version") ?? "",
- "User-Agent": request.headers.get("User-Agent") ?? "",
- "X-Forwarded-For": request.headers.get("CF-Connecting-IP") ?? "",
- "CF-IPCountry": request.headers.get("CF-IPCountry") ?? "",
- };
-
- let response = await fetch(
- `https://api.ente.com/cast/files${pathname}${fileID}?${params.toString()}`,
- { headers },
- );
-
if (!response.ok) console.log("Upstream error", response.status);
response = new Response(response.body, response);
diff --git a/infra/workers/files/src/index.ts b/infra/workers/files/src/index.ts
index 6e41465cc1..0946cb9d6d 100644
--- a/infra/workers/files/src/index.ts
+++ b/infra/workers/files/src/index.ts
@@ -57,39 +57,20 @@ const handleGET = async (request: Request) => {
const fileID = url.searchParams.get("fileID");
if (!fileID) return new Response(null, { status: 400 });
- let token = request.headers.get("X-Auth-Token");
- if (!token) {
- console.warn("Using deprecated token query param");
- token = url.searchParams.get("token");
- }
-
- if (!token) {
- console.error("No token provided");
- // return new Response(null, { status: 400 });
+ const museumURL = `https://api.ente.com/files/download/v3/${fileID}`;
+ const museumRequest = new Request(museumURL, request);
+ const clientIP = request.headers.get("CF-Connecting-IP") ?? "";
+ museumRequest.headers.set("X-Forwarded-For", clientIP);
+ let response = await fetch(museumRequest);
+ if (response.ok) {
+ const { url } = await response.json<{ url: string }>();
+ const range = request.headers.get("Range");
+ response = await fetch(
+ url,
+ range ? { headers: { Range: range } } : undefined,
+ );
}
- // We forward the auth token as a query parameter to museum. This is so that
- // it does not get preserved when museum does a redirect to the presigned S3
- // URL that serves the actual thumbnail.
- //
- // See: [Note: Passing credentials for self-hosted file fetches]
- const params = new URLSearchParams();
- if (token) params.set("token", token);
-
- const headers = {
- "X-Client-Package": request.headers.get("X-Client-Package") ?? "",
- "X-Client-Version": request.headers.get("X-Client-Version") ?? "",
- "User-Agent": request.headers.get("User-Agent") ?? "",
- Range: request.headers.get("Range") ?? "",
- "X-Forwarded-For": request.headers.get("CF-Connecting-IP") ?? "",
- "CF-IPCountry": request.headers.get("CF-IPCountry") ?? "",
- };
-
- let response = await fetch(
- `https://api.ente.com/files/download/${fileID}?${params.toString()}`,
- { headers },
- );
-
if (!response.ok) console.log("Upstream error", response.status);
response = new Response(response.body, response);
diff --git a/infra/workers/public-albums/src/index.ts b/infra/workers/public-albums/src/index.ts
index 593ccb759c..eb267fb3d2 100644
--- a/infra/workers/public-albums/src/index.ts
+++ b/infra/workers/public-albums/src/index.ts
@@ -31,42 +31,19 @@ const handleGET = async (request: Request) => {
const fileID = url.searchParams.get("fileID");
if (!fileID) return new Response(null, { status: 400 });
- let accessToken = request.headers.get("X-Auth-Access-Token");
- if (accessToken === undefined) {
- console.warn("Using deprecated accessToken query param");
- accessToken = url.searchParams.get("accessToken");
+ const filePath = url.pathname.startsWith("/download")
+ ? "download"
+ : "thumbnail";
+ const museumURL = `https://api.ente.com/public-collection/files/${filePath}/v3/${fileID}`;
+ const museumRequest = new Request(museumURL, request);
+ const clientIP = request.headers.get("CF-Connecting-IP") ?? "";
+ museumRequest.headers.set("X-Forwarded-For", clientIP);
+ let response = await fetch(museumRequest);
+ if (response.ok) {
+ const { url } = await response.json<{ url: string }>();
+ response = await fetch(url);
}
- if (!accessToken) {
- console.error("No accessToken provided");
- // return new Response(null, { status: 400 });
- }
-
- let accessTokenJWT = request.headers.get("X-Auth-Access-Token-JWT");
- if (accessTokenJWT === undefined) {
- console.warn("Using deprecated accessTokenJWT query param");
- accessTokenJWT = url.searchParams.get("accessTokenJWT");
- }
-
- const pathname = url.pathname;
-
- const params = new URLSearchParams();
- if (accessToken) params.set("accessToken", accessToken);
- if (accessTokenJWT) params.set("accessTokenJWT", accessTokenJWT);
-
- const headers = {
- "X-Client-Package": request.headers.get("X-Client-Package") ?? "",
- "X-Client-Version": request.headers.get("X-Client-Version") ?? "",
- "User-Agent": request.headers.get("User-Agent") ?? "",
- "X-Forwarded-For": request.headers.get("CF-Connecting-IP") ?? "",
- "CF-IPCountry": request.headers.get("CF-IPCountry") ?? "",
- };
-
- let response = await fetch(
- `https://api.ente.com/public-collection/files${pathname}${fileID}?${params.toString()}`,
- { headers },
- );
-
if (!response.ok) console.log("Upstream error", response.status);
response = new Response(response.body, response);
diff --git a/infra/workers/thumbnails/src/index.ts b/infra/workers/thumbnails/src/index.ts
index a55da12f64..09b3915d4d 100644
--- a/infra/workers/thumbnails/src/index.ts
+++ b/infra/workers/thumbnails/src/index.ts
@@ -55,33 +55,16 @@ const handleGET = async (request: Request) => {
const fileID = url.searchParams.get("fileID");
if (!fileID) return new Response(null, { status: 400 });
- let token = request.headers.get("X-Auth-Token");
- if (!token) {
- console.warn("Using deprecated token query param");
- token = url.searchParams.get("token");
+ const museumURL = `https://api.ente.com/files/thumbnail/v3/${fileID}`;
+ const museumRequest = new Request(museumURL, request);
+ const clientIP = request.headers.get("CF-Connecting-IP") ?? "";
+ museumRequest.headers.set("X-Forwarded-For", clientIP);
+ let response = await fetch(museumRequest);
+ if (response.ok) {
+ const { url } = await response.json<{ url: string }>();
+ response = await fetch(url);
}
- if (!token) {
- console.error("No token provided");
- // return new Response(null, { status: 400 });
- }
-
- const params = new URLSearchParams();
- if (token) params.set("token", token);
-
- const headers = {
- "X-Client-Package": request.headers.get("X-Client-Package") ?? "",
- "X-Client-Version": request.headers.get("X-Client-Version") ?? "",
- "User-Agent": request.headers.get("User-Agent") ?? "",
- "X-Forwarded-For": request.headers.get("CF-Connecting-IP") ?? "",
- "CF-IPCountry": request.headers.get("CF-IPCountry") ?? "",
- };
-
- let response = await fetch(
- `https://api.ente.com/files/preview/${fileID}?${params.toString()}`,
- { headers },
- );
-
if (!response.ok) console.log("Upstream error", response.status);
response = new Response(response.body, response);