huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Perf: Remove unnecessary path checks

This commit is contained in:
Chris R 2016-06-01 11:16:43 -07:00
parent bcdd3147a1
commit 6224f5b6e8
6 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs
View File

@ -919,7 +919,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
// URI was encoded, unescape and then parse as utf8
pathEnd = UrlPathDecoder.Unescape(pathBegin, pathEnd);
requestUrlPath = pathBegin.GetUtf8String(pathEnd);
requestUrlPath = PathNormalizer.NormalizeToNFC(requestUrlPath);
}
else
{

10
src/Microsoft.AspNetCore.Server.Kestrel/Http/PathNormalizer.cs
View File

@ -9,16 +9,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
{
public static class PathNormalizer
{
public static string NormalizeToNFC(string path)
{
if (!path.IsNormalized(NormalizationForm.FormC))
{
path = path.Normalize(NormalizationForm.FormC);
}
return path;
}
public static string RemoveDotSegments(string path)
{
if (ContainsDotSegments(path))

2
src/Microsoft.AspNetCore.Server.Kestrel/ServerAddress.cs
View File

@ -156,8 +156,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel
serverAddress.PathBase = url.Substring(pathDelimiterEnd);
}
serverAddress.PathBase = PathNormalizer.NormalizeToNFC(serverAddress.PathBase);
return serverAddress;
}

8
test/Microsoft.AspNetCore.Server.KestrelTests/PathNormalizerTests.cs
View File

@ -51,13 +51,5 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
var result = PathNormalizer.RemoveDotSegments(input);
Assert.Equal(expected, result);
}
[Fact]
public void NormalizesToNFC()
{
var result = PathNormalizer.NormalizeToNFC("/\u0041\u030A");
Assert.True(result.IsNormalized(NormalizationForm.FormC));
Assert.Equal("/\u00C5", result);
}
}
}

8
test/Microsoft.AspNetCore.Server.KestrelTests/RequestTargetProcessingTests.cs
View File

@ -17,17 +17,17 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
using (var server = new TestServer(async context =>
{
Assert.Equal("/\u00C5", context.Request.PathBase.Value);
Assert.Equal("/B/\u00C5", context.Request.Path.Value);
Assert.Equal("/A", context.Request.PathBase.Value);
Assert.Equal("/B/C", context.Request.Path.Value);
context.Response.Headers["Content-Length"] = new[] { "11" };
await context.Response.WriteAsync("Hello World");
}, testContext, "http://127.0.0.1:0/\u0041\u030A"))
}, testContext, "http://127.0.0.1:0/A"))
{
using (var connection = server.CreateConnection())
{
await connection.SendEnd(
"GET /%41%CC%8A/A/../B/%41%CC%8A HTTP/1.0",
"GET /A/0/../B/C HTTP/1.0",
"",
"");
await connection.ReceiveEnd(

10
test/Microsoft.AspNetCore.Server.KestrelTests/ServerAddressTests.cs
View File

@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Text;
using Microsoft.AspNetCore.Server.Kestrel;
using Xunit;
@ -68,15 +67,6 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
Assert.Equal(toString ?? url, serverAddress.ToString());
}
[Fact]
public void PathBaseIsNormalized()
{
var serverAddres = ServerAddress.FromUrl("http://localhost:8080/p\u0041\u030Athbase");
Assert.True(serverAddres.PathBase.IsNormalized(NormalizationForm.FormC));
Assert.Equal("/p\u00C5thbase", serverAddres.PathBase);
}
[Fact]
public void WithHostReturnsNewInstanceWithDifferentHost()
{