mercuryworkshop-mirror/scramjet
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/scramjet.git synced 2025-05-15 23:30:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

send a proper Origin header

Browse source
This commit is contained in:
velzie 2024-08-25 15:32:24 -04:00
parent 2cfc939208
commit f3f1a2ed41
No known key found for this signature in database
GPG key ID: 048413F95F0DDE1F
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/worker/fetch.ts
View file

@ -33,6 +33,7 @@ export async function swfetch(
}); });
} }
const client = await self.clients.get(clientId);
const urlParam = new URLSearchParams(new URL(request.url).search); const urlParam = new URLSearchParams(new URL(request.url).search);
if (urlParam.has("url")) { if (urlParam.has("url")) {
@ -78,10 +79,14 @@ export async function swfetch(
} }
if ( if (
URL.canParse(request.referrer) && client &&
new URL(request.referrer).pathname != "/" new URL(client.url).pathname.startsWith(self.$scramjet.config.prefix)
) ) {
headers.set("Referer", decodeUrl(request.referrer)); // TODO: i was against cors emulation but we might actually break stuff if we send full origin/referrer always
let url = new URL(decodeUrl(client.url));
headers.set("Referer", url.toString());
headers.set("Origin", url.origin);
}
const cookies = this.cookieStore.getCookies(url, false); const cookies = this.cookieStore.getCookies(url, false);
@ -90,15 +95,9 @@ export async function swfetch(
} }
// TODO this is wrong somehow // TODO this is wrong somehow
headers.set("Sec-Fetch-Mode", "cors"); // headers.set("Sec-Fetch-Mode", "cors");
headers.set("Sec-Fetch-Site", "same-origin"); // headers.set("Sec-Fetch-Site", "same-origin");
headers.set("Sec-Fetch-Dest", "empty"); // headers.set("Sec-Fetch-Dest", "empty");
if (
URL.canParse(request.referrer) &&
new URL(request.referrer).pathname != "/"
)
headers.set("Origin", new URL(request.referrer).origin);
const response: BareResponseFetch = await this.client.fetch(url, { const response: BareResponseFetch = await this.client.fetch(url, {
method: request.method, method: request.method,
@ -118,7 +117,7 @@ export async function swfetch(
request.destination, request.destination,
response, response,
this.cookieStore, this.cookieStore,
await self.clients.get(clientId) client
); );
} catch (err) { } catch (err) {
console.error("ERROR FROM SERVICE WORKER FETCH", err); console.error("ERROR FROM SERVICE WORKER FETCH", err);