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

Fix case sensitivity on Startup classes and methods (#1166)

This commit is contained in:
Justin Kotalik 2017-08-18 09:45:12 -07:00 committed by GitHub
parent c74d0e7458
commit 312e0da556
3 changed files with 66 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNetCore.Hosting/Internal/StartupLoader.cs
View File

@ -94,8 +94,8 @@ namespace Microsoft.AspNetCore.Hosting.Internal
// Full scan
var definedTypes = assembly.DefinedTypes.ToList();
var startupType1 = definedTypes.Where(info => info.Name.Equals(startupNameWithEnv, StringComparison.Ordinal));
var startupType2 = definedTypes.Where(info => info.Name.Equals(startupNameWithoutEnv, StringComparison.Ordinal));
var startupType1 = definedTypes.Where(info => info.Name.Equals(startupNameWithEnv, StringComparison.OrdinalIgnoreCase));
var startupType2 = definedTypes.Where(info => info.Name.Equals(startupNameWithoutEnv, StringComparison.OrdinalIgnoreCase));
var typeInfo = startupType1.Concat(startupType2).FirstOrDefault();
if (typeInfo != null)
@ -140,14 +140,14 @@ namespace Microsoft.AspNetCore.Hosting.Internal
var methodNameWithNoEnv = string.Format(CultureInfo.InvariantCulture, methodName, "");
var methods = startupType.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static);
var selectedMethods = methods.Where(method => method.Name.Equals(methodNameWithEnv)).ToList();
var selectedMethods = methods.Where(method => method.Name.Equals(methodNameWithEnv, StringComparison.OrdinalIgnoreCase)).ToList();
if (selectedMethods.Count > 1)
{
throw new InvalidOperationException(string.Format("Having multiple overloads of method '{0}' is not supported.", methodNameWithEnv));
}
if (selectedMethods.Count == 0)
{
selectedMethods = methods.Where(method => method.Name.Equals(methodNameWithNoEnv)).ToList();
selectedMethods = methods.Where(method => method.Name.Equals(methodNameWithNoEnv, StringComparison.OrdinalIgnoreCase)).ToList();
if (selectedMethods.Count > 1)
{
throw new InvalidOperationException(string.Format("Having multiple overloads of method '{0}' is not supported.", methodNameWithNoEnv));

27
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupCaseInsensitive.cs Normal file
View File

@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Text;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting.Fakes;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNetCore.Hosting.Tests.Fakes
{
class StartupCaseInsensitive
{
public static IServiceProvider ConfigureCaseInsensitiveServices(IServiceCollection services)
{
services.AddOptions();
services.Configure<FakeOptions>(o =>
{
o.Configured = true;
o.Environment = "ConfigureCaseInsensitiveServices";
});
return services.BuildServiceProvider();
}
public void ConfigureCaseInsensitive(IApplicationBuilder app)
{
}
}
}

35
test/Microsoft.AspNetCore.Hosting.Tests/StartupManagerTests.cs
View File

@ -100,6 +100,41 @@ namespace Microsoft.AspNetCore.Hosting.Tests
Assert.Equal("A public method named 'ConfigureBoom' or 'Configure' could not be found in the 'Microsoft.AspNetCore.Hosting.Fakes.StartupBoom' type.", ex.Message);
}
[Theory]
[InlineData("caseinsensitive")]
[InlineData("CaseInsensitive")]
[InlineData("CASEINSENSITIVE")]
[InlineData("CaSEiNSENsitiVE")]
public void FindsStartupClassCaseInsensitive(string environment)
{
var type = StartupLoader.FindStartupType("Microsoft.AspNetCore.Hosting.Tests", environment);
Assert.Equal("StartupCaseInsensitive", type.Name);
}
[Theory]
[InlineData("caseinsensitive")]
[InlineData("CaseInsensitive")]
[InlineData("CASEINSENSITIVE")]
[InlineData("CaSEiNSENsitiVE")]
public void StartupClassAddsConfigureServicesToApplicationServicesCaseInsensitive(string environment)
{
var services = new ServiceCollection()
.AddSingleton<IServiceProviderFactory<IServiceCollection>, DefaultServiceProviderFactory>()
.BuildServiceProvider();
var type = StartupLoader.FindStartupType("Microsoft.AspNetCore.Hosting.Tests", environment);
var startup = StartupLoader.LoadMethods(services, type, environment);
var app = new ApplicationBuilder(services);
app.ApplicationServices = startup.ConfigureServicesDelegate(new ServiceCollection());
startup.ConfigureDelegate(app); // By this not throwing, it found "ConfigureCaseInsensitive"
var options = app.ApplicationServices.GetRequiredService<IOptions<FakeOptions>>().Value;
Assert.NotNull(options);
Assert.True(options.Configured);
Assert.Equal("ConfigureCaseInsensitiveServices", options.Environment);
}
[Fact]
public void StartupWithTwoConfiguresThrows()
{