Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(assets): Forward headers from the original request to the internal request to the image #10775

Merged
merged 4 commits into from
Apr 15, 2024
Merged

fix(assets): Forward headers from the original request to the internal request to the image #10775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac8ce03
fix(assets): Forward headers from the original request to the interna…
Princesseuh Apr 12, 2024
f216630
chore: changeset
Princesseuh Apr 12, 2024
a0fb992
fix: only do it for local images
Princesseuh Apr 12, 2024
3033312
fix: pass headers directly
Princesseuh Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/rich-spoons-fold.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Fixes assets endpoint in serverless returning 404 in certain situations where the website might be under a protected route
14 changes: 9 additions & 5 deletions packages/astro/src/assets/endpoint/generic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ import { isRemoteAllowed } from '../utils/remotePattern.js';
// @ts-expect-error
import { imageConfig } from 'astro:assets';

async function loadRemoteImage(src: URL) {
async function loadRemoteImage(src: URL, headers: Headers) {
try {
const res = await fetch(src);
const res = await fetch(src, {
// Forward all headers from the original request
headers,
});

if (!res.ok) {
return undefined;
Expand Down Expand Up @@ -41,15 +44,16 @@ export const GET: APIRoute = async ({ request }) => {

let inputBuffer: ArrayBuffer | undefined = undefined;

const sourceUrl = isRemotePath(transform.src)
const isRemoteImage = isRemotePath(transform.src);
const sourceUrl = isRemoteImage
? new URL(transform.src)
: new URL(transform.src, url.origin);

if (isRemotePath(transform.src) && isRemoteAllowed(transform.src, imageConfig) === false) {
if (isRemoteImage && isRemoteAllowed(transform.src, imageConfig) === false) {
return new Response('Forbidden', { status: 403 });
}

inputBuffer = await loadRemoteImage(sourceUrl);
inputBuffer = await loadRemoteImage(sourceUrl, isRemoteImage ? new Headers() : request.headers);

if (!inputBuffer) {
return new Response('Not Found', { status: 404 });
Expand Down
Loading