@cloudflare/pages-shared 0.3.2 → 0.3.4

package/asset-server/handler.ts

@@ -204,16 +204,26 @@ export async function generateHandler<
 					  }`;
 			switch (status) {
 				case 301:
-					return new MovedPermanentlyResponse(location);
+					return new MovedPermanentlyResponse(location, undefined, {
+						preventLeadingDoubleSlash: false,
+					});
 				case 303:
-					return new SeeOtherResponse(location);
+					return new SeeOtherResponse(location, undefined, {
+						preventLeadingDoubleSlash: false,
+					});
 				case 307:
-					return new TemporaryRedirectResponse(location);
+					return new TemporaryRedirectResponse(location, undefined, {
+						preventLeadingDoubleSlash: false,
+					});
 				case 308:
-					return new PermanentRedirectResponse(location);
+					return new PermanentRedirectResponse(location, undefined, {
+						preventLeadingDoubleSlash: false,
+					});
 				case 302:
 				default:
-					return new FoundResponse(location);
+					return new FoundResponse(location, undefined, {
+						preventLeadingDoubleSlash: false,
+					});
 			}
 		}
 

package/asset-server/responses.ts

@@ -10,6 +10,10 @@ function mergeHeaders(base: HeadersInit, extra: HeadersInit) {
 	});
 }
 
+export function stripLeadingDoubleSlashes(location: string) {
+	return location.replace(/^(\/|%2F|%2f|%5C|%5c|\\)+(.*)/, "/$2");
+}
+
 export class OkResponse extends Response {
 	constructor(...[body, init]: ConstructorParameters<typeof Response>) {
 		super(body, {
@@ -23,8 +27,16 @@ export class OkResponse extends Response {
 export class MovedPermanentlyResponse extends Response {
 	constructor(
 		location: string,
-		init?: ConstructorParameters<typeof Response>[1]
+		init?: ConstructorParameters<typeof Response>[1],
+		{
+			preventLeadingDoubleSlash = true,
+		}: { preventLeadingDoubleSlash: boolean } = {
+			preventLeadingDoubleSlash: true,
+		}
 	) {
+		location = preventLeadingDoubleSlash
+			? stripLeadingDoubleSlashes(location)
+			: location;
 		super(`Redirecting to ${location}`, {
 			...init,
 			status: 301,
@@ -39,8 +51,16 @@ export class MovedPermanentlyResponse extends Response {
 export class FoundResponse extends Response {
 	constructor(
 		location: string,
-		init?: ConstructorParameters<typeof Response>[1]
+		init?: ConstructorParameters<typeof Response>[1],
+		{
+			preventLeadingDoubleSlash = true,
+		}: { preventLeadingDoubleSlash: boolean } = {
+			preventLeadingDoubleSlash: true,
+		}
 	) {
+		location = preventLeadingDoubleSlash
+			? stripLeadingDoubleSlashes(location)
+			: location;
 		super(`Redirecting to ${location}`, {
 			...init,
 			status: 302,
@@ -64,8 +84,16 @@ export class NotModifiedResponse extends Response {
 export class PermanentRedirectResponse extends Response {
 	constructor(
 		location: string,
-		init?: ConstructorParameters<typeof Response>[1]
+		init?: ConstructorParameters<typeof Response>[1],
+		{
+			preventLeadingDoubleSlash = true,
+		}: { preventLeadingDoubleSlash: boolean } = {
+			preventLeadingDoubleSlash: true,
+		}
 	) {
+		location = preventLeadingDoubleSlash
+			? stripLeadingDoubleSlashes(location)
+			: location;
 		super(undefined, {
 			...init,
 			status: 308,
@@ -126,8 +154,16 @@ export class InternalServerErrorResponse extends Response {
 export class SeeOtherResponse extends Response {
 	constructor(
 		location: string,
-		init?: ConstructorParameters<typeof Response>[1]
+		init?: ConstructorParameters<typeof Response>[1],
+		{
+			preventLeadingDoubleSlash = true,
+		}: { preventLeadingDoubleSlash: boolean } = {
+			preventLeadingDoubleSlash: true,
+		}
 	) {
+		location = preventLeadingDoubleSlash
+			? stripLeadingDoubleSlashes(location)
+			: location;
 		super(`Redirecting to ${location}`, {
 			...init,
 			status: 303,
@@ -140,8 +176,16 @@ export class SeeOtherResponse extends Response {
 export class TemporaryRedirectResponse extends Response {
 	constructor(
 		location: string,
-		init?: ConstructorParameters<typeof Response>[1]
+		init?: ConstructorParameters<typeof Response>[1],
+		{
+			preventLeadingDoubleSlash = true,
+		}: { preventLeadingDoubleSlash: boolean } = {
+			preventLeadingDoubleSlash: true,
+		}
 	) {
+		location = preventLeadingDoubleSlash
+			? stripLeadingDoubleSlashes(location)
+			: location;
 		super(`Redirecting to ${location}`, {
 			...init,
 			status: 307,

package/metadata-generator/createMetadataObject.ts

@@ -5,6 +5,7 @@ import {
 	SPLAT_REGEX,
 	PLACEHOLDER_REGEX,
 } from "./constants";
+import type { MetadataStaticRedirects } from "../asset-server/metadata";
 import type {
 	Metadata,
 	MetadataRedirects,
@@ -67,13 +68,17 @@ function constructRedirects({
 		return {};
 	}
 
-	const staticRedirects: MetadataRedirects = {};
+	const staticRedirects: MetadataStaticRedirects = {};
 	const dynamicRedirects: MetadataRedirects = {};
 	let canCreateStaticRule = true;
 	for (const rule of redirects.rules) {
 		if (!rule.from.match(SPLAT_REGEX) && !rule.from.match(PLACEHOLDER_REGEX)) {
 			if (canCreateStaticRule) {
-				staticRedirects[rule.from] = { status: rule.status, to: rule.to };
+				staticRedirects[rule.from] = {
+					status: rule.status,
+					to: rule.to,
+					lineNumber: rule.lineNumber,
+				};
 				continue;
 			} else {
 				logger(

package/package.json

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