Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Http/HttpServer.Core.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] );
Comment on lines +372 to +373

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Apply overrides to empty responses

When a route returns null or an empty response, execution jumps to finishSending before reaching this override handling. The response may already contain CORS and server headers, so OverrideHeaders still cannot replace them on these 204 responses, despite being documented to replace headers in the final response. Apply overrides on that exit path as well.

Useful? React with 👍 / 👎.

else
baseResponse.Headers.AppendHeader ( incameHeader.Item1, incameHeader.Item2 [ j ] );
}
}

if (currentConfig.EnableAutomaticResponseCompression
Expand Down
31 changes: 31 additions & 0 deletions tests/Sisk.Core/Tests/BugFindingRegressionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
Loading