@cloudflare/pages-shared 0.3.4 → 0.4.0

package/asset-server/handler.ts

@@ -192,38 +192,47 @@ export async function generateHandler<
 			staticRedirectsMatcher() || generateRedirectsMatcher()({ request })[0];
 
 		if (match) {
-			const { status, to } = match;
-			const destination = new URL(to, request.url);
-			const location =
-				destination.origin === new URL(request.url).origin
-					? `${destination.pathname}${destination.search || search}${
-							destination.hash
-					  }`
-					: `${destination.href}${destination.search ? "" : search}${
-							destination.hash
-					  }`;
-			switch (status) {
-				case 301:
-					return new MovedPermanentlyResponse(location, undefined, {
-						preventLeadingDoubleSlash: false,
-					});
-				case 303:
-					return new SeeOtherResponse(location, undefined, {
-						preventLeadingDoubleSlash: false,
-					});
-				case 307:
-					return new TemporaryRedirectResponse(location, undefined, {
-						preventLeadingDoubleSlash: false,
-					});
-				case 308:
-					return new PermanentRedirectResponse(location, undefined, {
-						preventLeadingDoubleSlash: false,
-					});
-				case 302:
-				default:
-					return new FoundResponse(location, undefined, {
-						preventLeadingDoubleSlash: false,
-					});
+			if (match.status === 200) {
+				// A 200 redirect means that we are proxying to a different asset, for example,
+				// a request with url /users/12345 could be pointed to /users/id.html. In order to
+				// do this, we overwrite the pathname, and instead match for assets with that url,
+				// and importantly, do not use the regular redirect handler - as the url visible to
+				// the user does not change
+				pathname = new URL(match.to, request.url).pathname;
+			} else {
+				const { status, to } = match;
+				const destination = new URL(to, request.url);
+				const location =
+					destination.origin === new URL(request.url).origin
+						? `${destination.pathname}${destination.search || search}${
+								destination.hash
+						  }`
+						: `${destination.href}${destination.search ? "" : search}${
+								destination.hash
+						  }`;
+				switch (status) {
+					case 301:
+						return new MovedPermanentlyResponse(location, undefined, {
+							preventLeadingDoubleSlash: false,
+						});
+					case 303:
+						return new SeeOtherResponse(location, undefined, {
+							preventLeadingDoubleSlash: false,
+						});
+					case 307:
+						return new TemporaryRedirectResponse(location, undefined, {
+							preventLeadingDoubleSlash: false,
+						});
+					case 308:
+						return new PermanentRedirectResponse(location, undefined, {
+							preventLeadingDoubleSlash: false,
+						});
+					case 302:
+					default:
+						return new FoundResponse(location, undefined, {
+							preventLeadingDoubleSlash: false,
+						});
+				}
 			}
 		}
 

package/metadata-generator/constants.ts

@@ -3,7 +3,7 @@ export const HEADERS_VERSION = 2;
 export const ANALYTICS_VERSION = 1;
 export const ROUTES_JSON_VERSION = 1;
 
-export const PERMITTED_STATUS_CODES = new Set([301, 302, 303, 307, 308]);
+export const PERMITTED_STATUS_CODES = new Set([200, 301, 302, 303, 307, 308]);
 export const HEADER_SEPARATOR = ":";
 export const MAX_LINE_LENGTH = 2000;
 export const MAX_HEADER_RULES = 100;

package/metadata-generator/parseRedirects.ts

@@ -6,7 +6,7 @@ import {
 	SPLAT_REGEX,
 	PLACEHOLDER_REGEX,
 } from "./constants";
-import { validateUrl } from "./validateURL";
+import { validateUrl, urlHasHost } from "./validateURL";
 import type {
 	InvalidRedirectRule,
 	ParsedRedirects,
@@ -104,7 +104,20 @@ export function parseRedirects(input: string): ParsedRedirects {
 			invalid.push({
 				line,
 				lineNumber: i + 1,
-				message: `Valid status codes are 301, 302 (default), 303, 307, or 308. Got ${str_status}.`,
+				message: `Valid status codes are 200, 301, 302 (default), 303, 307, or 308. Got ${str_status}.`,
+			});
+			continue;
+		}
+
+		// We want to always block the `/* /index.html` redirect - this will cause TOO_MANY_REDIRECTS errors as
+		// the asset server will redirect it back to `/`, removing the `/index.html`. This is the case for regular
+		// redirects, as well as proxied (200) rewrites. We only want to run this on relative urls
+		if (/\/\*?$/.test(from) && /\/index(.html)?$/.test(to) && !urlHasHost(to)) {
+			invalid.push({
+				line,
+				lineNumber: i + 1,
+				message:
+					"Infinite loop detected in this rule and has been ignored. This will cause a redirect to strip `.html` or `/index` and end up triggering this rule again. Please fix or remove this rule to silence this warning.",
 			});
 			continue;
 		}
@@ -119,6 +132,17 @@ export function parseRedirects(input: string): ParsedRedirects {
 		}
 		seen_paths.add(from);
 
+		if (status === 200) {
+			if (urlHasHost(to)) {
+				invalid.push({
+					line,
+					lineNumber: i + 1,
+					message: `Proxy (200) redirects can only point to relative paths. Got ${to}`,
+				});
+				continue;
+			}
+		}
+
 		rules.push({ from, to, status, lineNumber: i + 1 });
 	}
 

package/metadata-generator/validateURL.ts

@@ -55,3 +55,8 @@ export const validateUrl = (
 			: 'URLs should either be relative (e.g. begin with a forward-slash), or use HTTPS (e.g. begin with "https://").',
 	];
 };
+
+export function urlHasHost(token: string): boolean {
+	const host = URL_REGEX.exec(token);
+	return Boolean(host && host.groups && host.groups.host);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cloudflare/pages-shared",
-	"version": "0.3.4",
+	"version": "0.4.0",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/cloudflare/workers-sdk.git",