Skip to content

fix(asset-proxy): be sure all headers are passed to the final endpoint #931

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

Merged
hugotiburtino merged 1 commit into from
Nov 20, 2024
Merged

fix(asset-proxy): be sure all headers are passed to the final endpoint #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions __tests__/asset-proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,18 @@ test('request to https://asset-proxy.serlo.org/image?url=* gets asset from url q

test('request to asset-proxy works also in case of other encodings', async () => {
const env = currentTestEnvironment()
const response = await env.fetch({
subdomain: 'asset-proxy',
pathname:
'/image?url=https://upload.wikimedia.org/wikipedia/commons/8/8b/Sinus_mit_y.svg',
})
const response = await env.fetch(
{
subdomain: 'asset-proxy',
pathname:
'/image?url=https://upload.wikimedia.org/wikipedia/commons/8/8b/Sinus_mit_y.svg',
},
{
headers: {
'Accept-Encoding': '*',
},
},
)
expect(response.status).toBe(200)
expect(response.headers.get('content-type')).toBe('image/svg+xml')
expect(response.headers.get('Set-Cookie')).toBeNull()
Expand Down
10 changes: 6 additions & 4 deletions src/asset-proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ export async function assetProxy(request: Request): Promise<Response | null> {
return getPlaceholder()
}

const originalResponse = await fetch(assetUrl, {
cf: { cacheTtl: 24 * 60 * 60 * 30 },
headers: { 'Accept-Encoding': '*' },
})
const originalResponse = await fetch(
new Request(assetUrl.toString(), request),
{
cf: { cacheTtl: 24 * 60 * 60 * 30 },
},
)

if (originalResponse.ok && isImageResponse(originalResponse)) {
const response = new Response(originalResponse.body, originalResponse)
Expand Down