diff --git a/src/Http/HttpServer.Core.cs b/src/Http/HttpServer.Core.cs index bd184c2..521fc17 100644 --- a/src/Http/HttpServer.Core.cs +++ b/src/Http/HttpServer.Core.cs @@ -368,8 +368,12 @@ public void HandleContext ( HttpServerEngineContext context ) { if (string.IsNullOrEmpty ( incameHeader.Item1 )) continue; - for (int j = 0; j < incameHeader.Item2.Count; j++) - baseResponse.Headers.AppendHeader ( incameHeader.Item1, incameHeader.Item2 [ j ] ); + for (int j = 0; j < incameHeader.Item2.Count; j++) { + if (j == 0 && srContext.OverrideHeaders.ContainsKey ( incameHeader.Item1 )) + baseResponse.Headers.SetHeader ( incameHeader.Item1, incameHeader.Item2 [ j ] ); + else + baseResponse.Headers.AppendHeader ( incameHeader.Item1, incameHeader.Item2 [ j ] ); + } } if (currentConfig.EnableAutomaticResponseCompression diff --git a/tests/Sisk.Core/Tests/BugFindingRegressionTests.cs b/tests/Sisk.Core/Tests/BugFindingRegressionTests.cs index 3136da4..30fc2db 100644 --- a/tests/Sisk.Core/Tests/BugFindingRegressionTests.cs +++ b/tests/Sisk.Core/Tests/BugFindingRegressionTests.cs @@ -225,6 +225,37 @@ public async Task StatusDescriptionCannotInjectResponseHeaders ( bool cadente ) Assert.IsFalse ( response.Headers.Contains ( "X-Injected" ) ); } + [TestMethod] + [DataRow ( false )] + [DataRow ( true )] + public async Task OverrideHeadersReplaceCorsAndServerHeaders ( bool cadente ) { + using var host = TestHost.Start ( + r => r.MapGet ( "/", ( HttpRequest req ) => { + req.Context.OverrideHeaders.AccessControlAllowOrigin = "https://override.example"; + req.Context.OverrideHeaders.Add ( "X-Powered-By", "override" ); + req.Context.OverrideHeaders.Add ( "X-Test", "from-override" ); + req.Context.ExtraHeaders.Add ( "X-Extra", "from-extra" ); + return new HttpResponse ( "ok" ) + .WithHeader ( "X-Test", "from-response" ) + .WithHeader ( "X-Extra", "from-response" ); + } ), + config => { + if (cadente) + config.Engine = new CadenteHttpServerEngine (); + }, + cors: new CrossOriginResourceSharingHeaders ( allowOrigins: [ "https://good.example" ], allowMethods: [ "GET" ] ) ); + using var client = TestHost.CreateClient ( host ); + + var request = new HttpRequestMessage ( HttpMethod.Get, "" ); + request.Headers.Add ( "Origin", "https://good.example" ); + var response = await client.SendAsync ( request ); + + Assert.AreEqual ( "https://override.example", response.Headers.GetValues ( "Access-Control-Allow-Origin" ).Single () ); + Assert.AreEqual ( "override", response.Headers.GetValues ( "X-Powered-By" ).Single () ); + Assert.AreEqual ( "from-override", response.Headers.GetValues ( "X-Test" ).Single () ); + Assert.AreEqual ( "from-response,from-extra", string.Join ( ",", response.Headers.GetValues ( "X-Extra" ) ).Replace ( " ", "" ) ); + } + private sealed class ThrowingRequestHandler : RequestHandler { public override HttpResponse? Execute ( HttpRequest request, HttpContext context ) => throw new InvalidOperationException ( "handler-boom" );