fix: proxy headers for protocols (#534)

supabase · Aug 13, 2024 · 0708e4b · 0708e4b
1 parent a298856
commit 0708e4b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/http/routes/tus/lifecycle.ts b/src/http/routes/tus/lifecycle.ts
@@ -92,14 +92,15 @@ export function generateUrl(
   }
   proto = process.env.NODE_ENV === 'production' ? 'https' : proto
 
-  const url = new URL(
-    `${proto}://${(req.headers.x_forwarded_host as string) || (req.headers.host as string) || ''}`
-  )
   const isSigned = req.url?.endsWith(SIGNED_URL_SUFFIX)
   const fullPath = isSigned ? `${path}${SIGNED_URL_SUFFIX}` : path
 
-  if (url.port && req.headers['x-forwarded-port']) {
-    host += `:${req.headers['x-forwarded-port']}`
+  if (req.headers['x-forwarded-host']) {
+    const port = req.headers['x-forwarded-port']
+
+    if (typeof port === 'string' && port && !['443', '80'].includes(port)) {
+      host += `:${req.headers['x-forwarded-port']}`
+    }
   }
 
   // remove the tenant-id from the url, since we'll be using the tenant-id from the request

diff --git a/src/storage/protocols/s3/signature-v4.ts b/src/storage/protocols/s3/signature-v4.ts
@@ -325,11 +325,10 @@ export class SignatureV4 {
 
     const xForwardedHost = this.getHeader(request, 'x-forwarded-host')
     if (xForwardedHost) {
-      const url = new URL(request.url)
       const port = this.getHeader(request, 'x-forwarded-port')
       const host = `host:${xForwardedHost.toLowerCase()}`
 
-      if (port && url.port) {
+      if (port && !['443', '80'].includes(port)) {
         return host + ':' + port
       }
       return host