updated cookie encoding

Author: GarrettBeatty

Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/HttpContextExtensions.cs

@@ -88,6 +88,23 @@ public static APIGatewayProxyRequest ToApiGatewayRequest(
         var (headers, multiValueHeaders) = _httpRequestUtility.ExtractHeaders(request.Headers);
         var (queryStringParameters, multiValueQueryStringParameters) = _httpRequestUtility.ExtractQueryStringParameters(request.Query);
 
+        var encodedCookies = request.Cookies.Select(c => $"{c.Key}={HttpUtility.UrlEncode(c.Value)}");
+        var cookieString = string.Join("; ", encodedCookies);
+
+        // Add or update the Cookie header with the URL-encoded cookies
+        if (!string.IsNullOrEmpty(cookieString))
+        {
+            headers["Cookie"] = cookieString;
+            if (multiValueHeaders.ContainsKey("Cookie"))
+            {
+                multiValueHeaders["Cookie"] = [cookieString];
+            }
+            else
+            {
+                multiValueHeaders.Add("Cookie", [cookieString]);
+            }
+        }
+
         var proxyRequest = new APIGatewayProxyRequest
         {
             Resource = matchedConfig.Path,

Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/HttpContextExtensionsTests.cs

@@ -5,6 +5,8 @@
 using Xunit;
 using Moq;
 using System.Text;
+using Microsoft.Extensions.Primitives;
+using System.Linq;
 
 public class HttpContextExtensionsTests
 {
@@ -52,7 +54,7 @@ public void ToApiGatewayHttpV2Request_ShouldReturnValidApiGatewayHttpApiV2ProxyR
         request.QueryString = new QueryString("?status=pending");
         request.Headers["User-Agent"] = "TestAgent";
         request.Headers["Accept"] = "application/json";
-        request.Headers["Cookie"] = "session=abc123; theme=dark; complex=this+has+spaces;";
+        request.Headers["Cookie"] = "session=abc123; theme=dark; complex=this+has+special;";
 
         var result = context.ToApiGatewayHttpV2Request();
 
@@ -64,7 +66,7 @@ public void ToApiGatewayHttpV2Request_ShouldReturnValidApiGatewayHttpApiV2ProxyR
         Assert.Equal(3, result.Cookies.Length);
         Assert.Contains("session=abc123", result.Cookies);
         Assert.Contains("theme=dark", result.Cookies);
-        Assert.Contains("complex=this%2bhas%2bspaces", result.Cookies);
+        Assert.Contains("complex=this%2bhas%2bspecial", result.Cookies);
         Assert.Equal("123", result.PathParameters["userId"]);
         Assert.Equal("GET", result.RequestContext.Http.Method);
         Assert.Equal("/api/users/123/orders", result.RequestContext.Http.Path);
@@ -159,39 +161,37 @@ public void ToApiGatewayRequest_ShouldReturnValidApiGatewayProxyRequest()
         request.Path = "/api/users/123/orders";
         request.QueryString = new QueryString("?status=pending&tag=important&tag=urgent");
         request.Headers["User-Agent"] = "TestAgent";
-        request.Headers["Accept"] = new Microsoft.Extensions.Primitives.StringValues(new[] { "text/html", "application/json" });
-        request.Headers["Cookie"] = "session=abc123; theme=dark";
+        request.Headers["Accept"] = new StringValues(new[] { "text/html", "application/json" });
+        request.Headers["Cookie"] = "session=abc123; theme=dark; complex=this+has+special;";
         request.Headers["X-Custom-Header"] = "value1";
 
         _mockHttpRequestUtility.Setup(x => x.ExtractHeaders(It.IsAny<IHeaderDictionary>()))
             .Returns((
                 new Dictionary<string, string>
                 {
-                    { "User-Agent", "TestAgent" },
-                    { "Accept", "application/json" },
-                    { "Cookie", "session=abc123; theme=dark" },
-                    { "X-Custom-Header", "value1" }
+                        { "User-Agent", "TestAgent" },
+                        { "Accept", "application/json" },
+                        { "X-Custom-Header", "value1" }
                 },
                 new Dictionary<string, IList<string>>
                 {
-                    { "User-Agent", new List<string> { "TestAgent" } },
-                    { "Accept", new List<string> { "text/html", "application/json" } },
-                    { "Cookie", new List<string> { "session=abc123; theme=dark" } },
-                    { "X-Custom-Header", new List<string> { "value1" } }
+                        { "User-Agent", new List<string> { "TestAgent" } },
+                        { "Accept", new List<string> { "text/html", "application/json" } },
+                        { "X-Custom-Header", new List<string> { "value1" } }
                 }
             ));
 
         _mockHttpRequestUtility.Setup(x => x.ExtractQueryStringParameters(It.IsAny<IQueryCollection>()))
             .Returns((
                 new Dictionary<string, string>
                 {
-                    { "status", "pending" },
-                    { "tag", "urgent" }
+                        { "status", "pending" },
+                        { "tag", "urgent" }
                 },
                 new Dictionary<string, IList<string>>
                 {
-                    { "status", new List<string> { "pending" } },
-                    { "tag", new List<string> { "important", "urgent" } }
+                        { "status", new List<string> { "pending" } },
+                        { "tag", new List<string> { "important", "urgent" } }
                 }
             ));
 
@@ -204,13 +204,11 @@ public void ToApiGatewayRequest_ShouldReturnValidApiGatewayProxyRequest()
 
         Assert.Equal("TestAgent", result.Headers["User-Agent"]);
         Assert.Equal("application/json", result.Headers["Accept"]);
-        Assert.Equal("session=abc123; theme=dark", result.Headers["Cookie"]);
         Assert.Equal("value1", result.Headers["X-Custom-Header"]);
 
-        Assert.Equal(new List<string> { "TestAgent" }, result.MultiValueHeaders["User-Agent"]);
-        Assert.Equal(new List<string> { "text/html", "application/json" }, result.MultiValueHeaders["Accept"]);
-        Assert.Equal(new List<string> { "session=abc123; theme=dark" }, result.MultiValueHeaders["Cookie"]);
-        Assert.Equal(new List<string> { "value1" }, result.MultiValueHeaders["X-Custom-Header"]);
+        var expectedCookieString = $"session={HttpUtility.UrlEncode("abc123")}; theme={HttpUtility.UrlEncode("dark")}; complex={HttpUtility.UrlEncode("this+has+special")}";
+        Assert.Equal(expectedCookieString, result.Headers["Cookie"]);
+        Assert.Equal([expectedCookieString], result.MultiValueHeaders["Cookie"]);
 
         Assert.Equal("pending", result.QueryStringParameters["status"]);
         Assert.Equal("urgent", result.QueryStringParameters["tag"]);