allow modifying response directly in function when calling from proxy (#5444)

* allow modifying response directly in function when calling from proxy

* some tests changes

Author: vfedonkin

src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj

@@ -66,7 +66,7 @@
     <PackageReference Include="DotNetTI.BreakingChangeAnalysis" Version="1.0.5-preview" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.0.10120001-f33e57bd" />
+    <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.0.11020001-fabe022e" />
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.0.3" />
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.15" />
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.3" />

src/WebJobs.Script/WebJobs.Script.csproj

@@ -39,7 +39,7 @@
     <PackageReference Include="Google.Protobuf" Version="3.7.0" />
     <PackageReference Include="Grpc.Core" Version="1.20.1" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.0.10120001-f33e57bd" />
+    <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.0.11020001-fabe022e" />
     <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.5.2-SNAPSHOT" />
     <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="2.0.1" />
     <PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker" Version="1.0.201" />

test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingMakeResponse/function.json

@@ -0,0 +1,17 @@
+{
+    "bindings": [
+      {
+        "authLevel": "anonymous",
+        "name": "req",
+        "type": "httpTrigger",
+        "direction": "in",
+        "route": "pingMakeResponse"
+      },
+        {
+            "name": "$return",
+            "type": "http",
+            "direction": "out"
+        }
+    ],
+    "disabled": false
+}

test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingMakeResponse/run.csx

@@ -0,0 +1,16 @@
+public static string Run(HttpRequest req)
+{
+    if (req.Headers.ContainsKey("return_test_header"))
+    {
+        req.HttpContext.Response.Headers.Add("test_header_from_function", "test_header_from_function_value");
+    }
+    if (req.Headers.ContainsKey("return_201"))
+    {
+        req.HttpContext.Response.StatusCode = 201;
+    }
+    if (req.Headers.ContainsKey("redirect"))
+    {
+        req.HttpContext.Response.Redirect("http://www.redirects-regardless.com/"); ;
+    }
+    return "Pong";
+}

test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/proxies.json

@@ -199,11 +199,23 @@
         "response.headers.Content-Length": "888",
         "response.headers.Test": "test"
       }
-
+    },
+    "pingMakeResponseProxy": {
+      "matchCondition": {
+        "route": "pingMakeResponseProxy"
+      },
+      "backendUri": "http://localhost/api/pingMakeResponse",
+      "requestOverrides": {
+        "backend.request.headers.accept": "text/plain"
+      },
+      "responseOverrides": {
+        "response.headers.test_header_from_override": "test_header_from_override_value"
+      }
     }
 
 
 
+
   }
 }
 

test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/ProxyEndToEndTests.cs

@@ -45,7 +45,7 @@ public async Task ListFunctions_Proxies_Succeeds()
             var response = await _fixture.HttpClient.SendAsync(request);
             var metadata = (await response.Content.ReadAsAsync<IEnumerable<FunctionMetadataResponse>>()).ToArray();
 
-            Assert.Equal(22, metadata.Length);
+            Assert.Equal(24, metadata.Length);
             var function = metadata.Single(p => p.Name == "PingRoute");
             Assert.Equal("https://localhost/api/myroute/mysubroute", function.InvokeUrlTemplate.AbsoluteUri);
 
@@ -55,14 +55,17 @@ public async Task ListFunctions_Proxies_Succeeds()
             function = metadata.Single(p => p.Name == "LocalFunctionCall");
             Assert.Equal("https://localhost/api/myhttptrigger", function.InvokeUrlTemplate.AbsoluteUri);
 
+            function = metadata.Single(p => p.Name == "PingMakeResponse");
+            Assert.Equal("https://localhost/api/pingmakeresponse", function.InvokeUrlTemplate.AbsoluteUri);
+
             // get functions omitting proxies
             uri = "admin/functions";
             request = new HttpRequestMessage(HttpMethod.Get, uri);
             request.Headers.Add(AuthenticationLevelHandler.FunctionsKeyHeaderName, "1234");
             response = await _fixture.HttpClient.SendAsync(request);
             metadata = (await response.Content.ReadAsAsync<IEnumerable<FunctionMetadataResponse>>()).ToArray();
             Assert.False(metadata.Any(p => p.IsProxy));
-            Assert.Equal(3, metadata.Length);
+            Assert.Equal(4, metadata.Length);
         }
 
         [Fact]
@@ -111,6 +114,32 @@ public async Task LocalFunctionCall()
             Assert.Equal("Pong", content);
         }
 
+        [Fact]
+        public async Task LocalFunctionCall_ModifyResponse()
+        {
+            HttpRequestMessage req = new HttpRequestMessage(HttpMethod.Get, $"pingMakeResponseProxy");
+            req.Headers.Add("return_test_header", "1");
+            req.Headers.Add("return_201", "1");
+            HttpResponseMessage response = await _fixture.HttpClient.SendAsync(req);
+            string content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("201", response.StatusCode.ToString("D"));
+            Assert.Equal("test_header_from_function_value", response.Headers.GetValues("test_header_from_function").First());
+            Assert.Equal("test_header_from_override_value", response.Headers.GetValues("test_header_from_override").First());
+            Assert.Equal(@"Pong", content);
+        }
+
+        [Fact]
+        public async Task LocalFunctionCall_Redirect()
+        {
+            HttpRequestMessage req = new HttpRequestMessage(HttpMethod.Get, $"pingMakeResponseProxy");
+            req.Headers.Add("redirect", "1");
+            HttpResponseMessage response = await _fixture.HttpClient.SendAsync(req);
+            string content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("302", response.StatusCode.ToString("D"));
+            Assert.Equal("http://www.redirects-regardless.com/", response.Headers.Location.ToString());
+            Assert.Equal(@"Pong", content);
+        }
+
         [Fact]
         public async Task LocalFunctionCallWithAuth()
         {