diff --git a/samples/RewriteSample/Startup.cs b/samples/RewriteSample/Startup.cs index b4bfa3c977..e1285d0666 100644 --- a/samples/RewriteSample/Startup.cs +++ b/samples/RewriteSample/Startup.cs @@ -16,7 +16,7 @@ namespace RewriteSample var options = new RewriteOptions() .AddRedirect("(.*)/$", "$1") .AddRewrite(@"app/(\d+)", "app?id=$1") - .AddRedirectToHttps(302) + .AddRedirectToHttps(302, 5001) .AddIISUrlRewrite(env.ContentRootFileProvider, "UrlRewrite.xml") .AddApacheModRewrite(env.ContentRootFileProvider, "Rewrite.txt"); @@ -28,7 +28,11 @@ namespace RewriteSample public static void Main(string[] args) { var host = new WebHostBuilder() - .UseKestrel() + .UseKestrel(options => + { + options.UseHttps("testCert.pfx", "testPassword"); + }) + .UseUrls("http://localhost:5000", "https://localhost:5001") .UseStartup() .UseContentRoot(Directory.GetCurrentDirectory()) .Build(); diff --git a/samples/RewriteSample/project.json b/samples/RewriteSample/project.json index 8522010e25..c34d3bd910 100644 --- a/samples/RewriteSample/project.json +++ b/samples/RewriteSample/project.json @@ -2,7 +2,8 @@ "version": "1.1.0-*", "dependencies": { "Microsoft.AspNetCore.Rewrite": "1.1.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*" + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", + "Microsoft.AspNetCore.Server.Kestrel.Https": "1.1.0-*" }, "buildOptions": { "emitEntryPoint": true, diff --git a/samples/RewriteSample/testCert.pfx b/samples/RewriteSample/testCert.pfx new file mode 100644 index 0000000000..7118908c2d Binary files /dev/null and b/samples/RewriteSample/testCert.pfx differ diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/ForbiddenActionTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/ForbiddenActionTests.cs index fa141844cc..0ab9a6f439 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/ForbiddenActionTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/ForbiddenActionTests.cs @@ -12,14 +12,12 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlActions [Fact] public void Forbidden_Verify403IsInStatusCode() { - // Arrange + var context = new RewriteContext {HttpContext = new DefaultHttpContext()}; var action = new ForbiddenAction(); - // Act action.ApplyAction(context, null, null); - - // Assert + Assert.Equal(context.Result, RuleResult.EndResponse); Assert.Equal(context.HttpContext.Response.StatusCode, StatusCodes.Status403Forbidden); } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/GoneActionTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/GoneActionTests.cs index e72c6c67ce..1a18fe7d19 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/GoneActionTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/GoneActionTests.cs @@ -12,14 +12,11 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlActions [Fact] public void Gone_Verify410IsInStatusCode() { - // Arrange var context = new RewriteContext { HttpContext = new DefaultHttpContext() }; var action = new GoneAction(); - // Act action.ApplyAction(context, null, null); - // Assert Assert.Equal(context.Result, RuleResult.EndResponse); Assert.Equal(context.HttpContext.Response.StatusCode, StatusCodes.Status410Gone); }