Merge pull request #911 from serlo/staging

Deployment

__tests__/__utils__/expect-helper.ts

@@ -80,3 +80,9 @@ export function expectSentryEvent({
 export function expectNoSentryError() {
   expect(globalThis.sentryEvents).toHaveLength(0)
 }
+
+export function expectIsPlaceholderResponse(response: Response) {
+  expect(response.status).toBe(200)
+  expect(response.headers.get('content-type')).toBe('image/png')
+  expect(response.headers.get('content-length')).toBe('135')
+}

__tests__/asset-proxy.ts

@@ -0,0 +1,78 @@
+import { http } from 'msw'
+
+import {
+  currentTestEnvironment,
+  expectIsPlaceholderResponse,
+} from './__utils__'
+
+beforeEach(() => {
+  globalThis.server.use(
+    http.get('https://whatever.org/image', () => {
+      return new Response('', {
+        headers: {
+          'content-type': 'image/png',
+          'Set-Cookie':
+            'sessionId=abc123; Expires=Wed, 09 Nov 2024 07:28:00 GMT; Path=/; Domain=whatever.org; Secure; HttpOnly; SameSite=None',
+        },
+      })
+    }),
+    http.get('https://whatever.org/notimage', () => {
+      return new Response('', {
+        headers: { 'content-type': 'application/json' },
+      })
+    }),
+  )
+})
+
+test('request to https://asset-proxy.serlo.org/image?url=* gets asset from url query parameter', async () => {
+  const env = currentTestEnvironment()
+  const response = await env.fetch({
+    subdomain: 'asset-proxy',
+    pathname: '/image?url=https://whatever.org/image',
+  })
+  expect(response.status).toBe(200)
+  expect(response.headers.get('content-type')).toBe('image/png')
+  expect(response.headers.get('Set-Cookie')).toBeNull()
+  expect(response.headers.get('cache-control')).toBe(
+    'public, max-age=31536000, immutable',
+  )
+})
+
+describe('returns placeholder', () => {
+  test('when url parameter is empty', async () => {
+    const response = await requestAsset('')
+
+    expectIsPlaceholderResponse(response)
+  })
+
+  test('when url is invalid', async () => {
+    const response = await requestAsset('42')
+
+    expectIsPlaceholderResponse(response)
+  })
+
+  test('when url query parameter is missing', async () => {
+    const response = await currentTestEnvironment().fetch({
+      subdomain: 'asset-proxy',
+      pathname: '/image',
+    })
+
+    expectIsPlaceholderResponse(response)
+  })
+
+  test('when response is not image', async () => {
+    const response = await requestAsset('https://whatever.org/notimage')
+
+    expectIsPlaceholderResponse(response)
+  })
+})
+
+async function requestAsset(
+  url: string,
+  env = currentTestEnvironment(),
+): Promise<Response> {
+  return await env.fetch({
+    subdomain: 'asset-proxy',
+    pathname: '/image?url=' + encodeURIComponent(url),
+  })
+}

__tests__/embed.ts

@@ -10,6 +10,7 @@ import {
   localTestEnvironment,
   expectSentryEvent,
   expectNoSentryError,
+  expectIsPlaceholderResponse,
 } from './__utils__'
 
 describe('embed.serlo.org/thumbnail?url=...', () => {
@@ -651,12 +652,6 @@ describe('embed.serlo.org/thumbnail?url=...', () => {
   })
 })
 
-function expectIsPlaceholderResponse(response: Response) {
-  expect(response.status).toBe(200)
-  expect(response.headers.get('content-type')).toBe('image/png')
-  expect(response.headers.get('content-length')).toBe('135')
-}
-
 async function requestThumbnail(
   url: string,
   env = currentTestEnvironment(),

package.json

@@ -32,7 +32,7 @@
   "dependencies": {
     "fp-ts": "^2.16.9",
     "io-ts": "^2.2.21",
-    "jose": "^5.9.4",
+    "jose": "^5.9.6",
     "toucan-js": "^4.0.0"
   },
   "devDependencies": {
@@ -42,21 +42,21 @@
     "@sentry/types": "^8.35.0",
     "@testing-library/jest-dom": "^6.5.0",
     "@types/iarna__toml": "^2.0.5",
-    "@types/jest": "^29.5.13",
-    "@typescript-eslint/eslint-plugin": "^8.9.0",
+    "@types/jest": "^29.5.14",
+    "@typescript-eslint/eslint-plugin": "^8.12.0",
     "@typescript-eslint/parser": "^8.11.0",
     "cross-env": "^7.0.3",
     "depcheck": "^1.4.7",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-deprecation": "^3.0.0",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-react": "^7.37.1",
+    "eslint-plugin-react": "^7.37.2",
     "jest": "^29.7.0",
     "msw": "^2.4.3",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.3.3",
-    "prettier-plugin-packagejson": "^2.5.2",
+    "prettier-plugin-packagejson": "^2.5.3",
     "prettier-plugin-sh": "^0.14.0",
     "ts-jest": "^29.2.5",
     "ts-unused-exports": "^10.1.0",

src/asset-proxy.ts

@@ -0,0 +1,33 @@
+import { Url, getPlaceholder, isImageResponse } from './utils'
+
+export async function assetProxy(request: Request): Promise<Response | null> {
+  const url = Url.fromRequest(request)
+
+  if (url.subdomain !== 'asset-proxy') return null
+  if (url.pathname !== '/image') return null
+
+  const urlParam = url.searchParams.get('url')
+
+  if (!urlParam) return getPlaceholder()
+
+  let assetUrl: Url
+
+  try {
+    assetUrl = new Url(urlParam)
+  } catch {
+    return getPlaceholder()
+  }
+
+  const originalResponse = await fetch(assetUrl, {
+    cf: { cacheTtl: 24 * 60 * 60 * 30 },
+  })
+
+  if (originalResponse.ok && isImageResponse(originalResponse)) {
+    const response = new Response(originalResponse.body, originalResponse)
+    response.headers.delete('set-cookie')
+    response.headers.set('cache-control', 'public, max-age=31536000, immutable')
+    return response
+  }
+
+  return getPlaceholder()
+}

src/embed.ts

@@ -1,6 +1,13 @@
 import * as t from 'io-ts'
 
-import { SentryFactory, SentryReporter, responseToContext, Url } from './utils'
+import {
+  SentryFactory,
+  SentryReporter,
+  responseToContext,
+  Url,
+  getPlaceholder,
+  isImageResponse,
+} from './utils'
 
 export async function embed(
   request: Request,
@@ -271,24 +278,3 @@ async function getWikimediaThumbnail(url: URL) {
 
   return getPlaceholder()
 }
-
-function getPlaceholder() {
-  const placeholderBase64 =
-    'iVBORw0KGgoAAAANSUhEUgAAAwAAAAGwAQMAAAAkGpCRAAAAA1BMVEXv9/t0VvapAAAAP0lEQVR42u3BMQEAAADCIPuntsUuYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQOqOwAAHrgHqAAAAAAElFTkSuQmCC'
-  const placeholder = Uint8Array.from(atob(placeholderBase64), (c) =>
-    c.charCodeAt(0),
-  )
-  return new Response(placeholder, {
-    status: 200,
-    statusText: 'OK',
-    headers: {
-      'Content-Type': 'image/png',
-      'Content-Length': placeholder.length.toString(),
-    },
-  })
-}
-
-function isImageResponse(res: Response): boolean {
-  const contentType = res.headers.get('content-type') ?? ''
-  return res.status === 200 && contentType.startsWith('image/')
-}

src/index.ts

@@ -1,4 +1,5 @@
 import { api } from './api'
+import { assetProxy } from './asset-proxy'
 import { semanticFileNames } from './assets'
 import { auth } from './auth'
 import { cloudflareWorkerDev } from './cloudflare-worker-dev'
@@ -38,6 +39,7 @@ export default {
         (await semanticFileNames(request)) ||
         (await api(request, env)) ||
         (await frontendProxy(request, sentryFactory, env)) ||
+        (await assetProxy(request)) ||
         (await fetch(request))
       )
     } catch (e) {

src/utils/image.ts

@@ -0,0 +1,20 @@
+export function getPlaceholder() {
+  const placeholderBase64 =
+    'iVBORw0KGgoAAAANSUhEUgAAAwAAAAGwAQMAAAAkGpCRAAAAA1BMVEXv9/t0VvapAAAAP0lEQVR42u3BMQEAAADCIPuntsUuYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQOqOwAAHrgHqAAAAAAElFTkSuQmCC'
+  const placeholder = Uint8Array.from(atob(placeholderBase64), (c) =>
+    c.charCodeAt(0),
+  )
+  return new Response(placeholder, {
+    status: 200,
+    statusText: 'OK',
+    headers: {
+      'Content-Type': 'image/png',
+      'Content-Length': placeholder.length.toString(),
+    },
+  })
+}
+
+export function isImageResponse(res: Response): boolean {
+  const contentType = res.headers.get('content-type') ?? ''
+  return res.status === 200 && contentType.startsWith('image/')
+}

src/utils/index.tsx

@@ -4,3 +4,4 @@ export * from './cf-environment'
 export * from './url'
 export * from './ui'
 export * from './cache'
+export * from './image'