kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-09 07:48:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce log noise

Browse Source
This commit is contained in:
Manav Rathi 2024-06-16 14:29:54 +05:30
parent 6c5ea59506
commit 9362a4b9d3
No known key found for this signature in database
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
infra/workers/cast-albums/src/index.ts
View File

@ -42,21 +42,22 @@ const isAllowedOrigin = (origin: string | null) => {
const handleGET = async (request: Request) => { const handleGET = async (request: Request) => {
const url = new URL(request.url); const url = new URL(request.url);
const castToken =
request.headers.get("X-Cast-Access-Token") ?? const fileID = url.searchParams.get("fileID");
url.searchParams.get("castToken"); 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");
}
if (!castToken) { if (!castToken) {
console.error("No cast token provided"); console.error("No cast token provided");
return new Response(null, { status: 400 }); return new Response(null, { status: 400 });
} }
const pathname = url.pathname; const pathname = url.pathname;
const fileID = url.searchParams.get("fileID");
if (!fileID) {
console.error("No fileID provided");
return new Response(null, { status: 400 });
}
const params = new URLSearchParams({ castToken }); const params = new URLSearchParams({ castToken });
let response = await fetch( let response = await fetch(

8
infra/workers/public-albums/src/index.ts
View File

@ -63,6 +63,9 @@ const areAllowedHeaders = (headers: string | null) => {
const handleGET = async (request: Request) => { const handleGET = async (request: Request) => {
const url = new URL(request.url); const url = new URL(request.url);
const fileID = url.searchParams.get("fileID");
if (!fileID) return new Response(null, { status: 400 });
let accessToken = request.headers.get("X-Auth-Access-Token"); let accessToken = request.headers.get("X-Auth-Access-Token");
if (accessToken === undefined) { if (accessToken === undefined) {
console.warn("Using deprecated accessToken query param"); console.warn("Using deprecated accessToken query param");
@ -81,11 +84,6 @@ const handleGET = async (request: Request) => {
} }
const pathname = url.pathname; const pathname = url.pathname;
const fileID = url.searchParams.get("fileID");
if (!fileID) {
console.error("No fileID provided");
return new Response(null, { status: 400 });
}
const params = new URLSearchParams(); const params = new URLSearchParams();
if (accessToken) params.set("accessToken", accessToken); if (accessToken) params.set("accessToken", accessToken);

11
infra/workers/thumbnails/src/index.ts
View File

@ -63,6 +63,11 @@ const areAllowedHeaders = (headers: string | null) => {
const handleGET = async (request: Request) => { const handleGET = async (request: Request) => {
const url = new URL(request.url); const url = new URL(request.url);
// Random bots keep trying to pentest causing noise in the logs. If the
// request doesn't have a fileID, we can just safely ignore it thereafter.
const fileID = url.searchParams.get("fileID");
if (!fileID) return new Response(null, { status: 400 });
let token = request.headers.get("X-Auth-Token"); let token = request.headers.get("X-Auth-Token");
if (!token) { if (!token) {
console.warn("Using deprecated token query param"); console.warn("Using deprecated token query param");
@ -74,12 +79,6 @@ const handleGET = async (request: Request) => {
// return new Response(null, { status: 400 }); // return new Response(null, { status: 400 });
} }
const fileID = url.searchParams.get("fileID");
if (!fileID) {
console.error("No fileID provided");
return new Response(null, { status: 400 });
}
// We forward the auth token as a query parameter to museum. This is so that // 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 // it does not get preserved when museum does a redirect to the presigned S3
// URL that serves the actual thumbnail. // URL that serves the actual thumbnail.