@cloudflare/pages-shared 0.3.3 → 0.3.5

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/asset-server/responses.ts

@@ -11,7 +11,7 @@ function mergeHeaders(base: HeadersInit, extra: HeadersInit) {
 }
 
 export function stripLeadingDoubleSlashes(location: string) {
-	return location.replace(/^(\/|%2F|%2f)+(.*)/, "/$2");
+	return location.replace(/^(\/|%2F|%2f|%5C|%5c|\\)+(.*)/, "/$2");
 }
 
 export class OkResponse extends Response {

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

@@ -104,7 +104,7 @@ 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;
 		}
@@ -119,6 +119,22 @@ export function parseRedirects(input: string): ParsedRedirects {
 		}
 		seen_paths.add(from);
 
+		if (status === 200) {
+			// Error can only be that it's not relative - given validateUrl is called above without onlyRelative:true,
+			// so if it's present, we can error to the user that proxying only expects relative urls
+			const [proxyTo, error] = validateUrl(to, true, true, true);
+			if (error) {
+				invalid.push({
+					line,
+					lineNumber: i + 1,
+					message: `Proxy (200) redirects can only point to relative paths. Got ${to}`,
+				});
+				continue;
+			}
+			rules.push({ from, to: proxyTo as string, status, lineNumber: i + 1 });
+			continue;
+		}
+
 		rules.push({ from, to, status, lineNumber: i + 1 });
 	}
 

package/package.json

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