From 266a8d46840401cb1ad605cf0e7797c9e62f33f0 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:19:41 +0000 Subject: [PATCH] Revert "lambda: collapse redundant slashes in requests" (#21457) Reverts docker/docs#21453 --- hack/releaser/cloudfront-lambda-redirects.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hack/releaser/cloudfront-lambda-redirects.js b/hack/releaser/cloudfront-lambda-redirects.js index 57c108b7c4..e599655920 100644 --- a/hack/releaser/cloudfront-lambda-redirects.js +++ b/hack/releaser/cloudfront-lambda-redirects.js @@ -3,16 +3,15 @@ exports.handler = (event, context, callback) => { //console.log("event", JSON.stringify(event)); const request = event.Records[0].cf.request; - // Trim trailing slash and collapse redundant slashes - const normalizedUri = request.uri.replace(/\/$/, "").replaceAll(/\/{2,}/g, "/") + const requestUrl = request.uri.replace(/\/$/, "") const redirects = JSON.parse(`{{.RedirectsJSON}}`); for (let key in redirects) { const redirectTarget = key.replace(/\/$/, "") - if (redirectTarget !== normalizedUri) { + if (redirectTarget !== requestUrl) { continue; } - //console.log(`redirect: ${normalizedUri} to ${redirects[key]}`); + //console.log(`redirect: ${requestUrl} to ${redirects[key]}`); const response = { status: '301', statusDescription: 'Moved Permanently', @@ -53,6 +52,5 @@ exports.handler = (event, context, callback) => { return } - request.uri = normalizedUri callback(null, request); };