From 58ef98b184df83efb69ce7177dafc60171afd655 Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Wed, 21 Sep 2016 22:02:45 -0700 Subject: [PATCH] Sample project can now redirect to HTTPS (#106) Sample project can now redirect to HTTPS --- samples/RewriteSample/Startup.cs | 8 ++++++-- samples/RewriteSample/project.json | 3 ++- samples/RewriteSample/testCert.pfx | Bin 0 -> 2483 bytes .../UrlActions/ForbiddenActionTests.cs | 6 ++---- .../UrlActions/GoneActionTests.cs | 3 --- 5 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 samples/RewriteSample/testCert.pfx 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 0000000000000000000000000000000000000000..7118908c2d730670c16e9f8b2c532a262c951989 GIT binary patch literal 2483 zcmaKuc|27A8pqF>IWr86E&Q@(n=B)p$ug!;QVB6xij*z;uPLG!yCz#DQB)+9G$9m9 zQU)=DWXU?*EZIwG!+0d++P@yZ4Xhoagg?p6B~|Ue7tN=Ny=UD?x#1n1MTq z#c9MHh+D#gd|(a(cN}8i91v^=GcdgW3SmA$49p~gM-dys3jVWdg8+!iVL)pz1LDE5 zSb=|GAn(@R=(Ux!MfS9@}sFu-xDd zIt2+mqSq$glwy_6UNs<2?(qERU!gJ;5j}Pp&6trxG=wi)=@k(w2+fJVnc+qvXVzy(>Om4;L|^)R`t*3nTpAmEmTl(#i!RV#a0t#u6>Q9mY`-Nmcs7$XjXT7 zUmCD`O~_j7!%R#I?cG-7C^hcH)@l?WC1vyw$FFu_(r)jhOq6p}W8sG7NO{YTy8tG4 zrb$tTkag*G?(7lfoGx$4YWui>{{@}-FB2ub=}RX{1zx?j)s-##J9|G7E1@-;7Nuln z9MQoX7FJ76+D#XXT@ZZmLZCufIdf3@OigG6m8I7!GT=7VD|>?6e!z9=eT}*E_tSn6 zl+clHCZ-kcIR#gen#LjMJW8>0QtViaQB#FhqsCb0YPYr3;jRITl@V9Aph24D?r2d` zetCyyCg<*O-u+M& zW^ptmT|}p$VAOZpmbQ1{5fK-6ytEvre#Po}6c2URn`viQAF2+e?Z~PK2&pd>7=7)I zTCYm)@3PFRu_6a6Kb)IpCzQ%e3l%O#SDA+$Pq{Dk{HCqi7z>qd{nVpebffL7h{c4( zmhXn~G+C27S3(IfC)q2KON=YwqHXEo%zc40DgWLzF{%RIdr@RcLu90qMSHf!Y}JaqP<={8_Rfe;ddR5= zKEo;^Yip&^m((#{czE{kUga3-@`*;&EwO}Jt>QdURP2P>ob^j-A!qld-0S_pm)kjs zkNo48oZnMt){W~o8g^f;4#?lRLr-T@f}wH1o~-Iq=NEVtTVEZ`vrW~!>2yh%;Bc~H zHl&OK>n@d`*e19*9#v>zZpU?I);f7}IPIfSSk#N|ujE492Itg)l!)TJ19@FE^x|p= zH16NC7OfK&|6_!AnWfTIf^YPOa&`|nbk3VR0vql6&s@y1V3QOU%(`Re+kJgrz?r9!{^wOQ4W-eng23gc}f(LxIs zH_Ls~5izbjcRQH#WH6s6hR;zn>j_R8aJ$A)6xNneu8UI-vWV8Z@HZu&WwvG5q{1ZS zdZeVf{Pv5-u281~y;aJe*x%Uv0@biMZ$vPbKj}O`(SOWQc~kJX` zXR&d4DtAe@2RH$^ z0os5*;0eIUeJi3Uh`A%44x(XzjClG8BO~-r_A}odiRuHo2-86#`mhrgN5p~<$RLY? zq(kynfFA5{v#p+EA1 z5aoe1763EQHorRm`C&ktKn(OQ1n)$Q{GZz&jRb`eDEMpl<0O#+)DMV(T7nsIzCG{QuM->B9g7Lrl2SE&gW`M!~(un|y0fIn=b^6_$ z9{zEzgYI~39xn0ZP*9qBL%fg7rg$ttt&TOmvfNNO<6FT0ZavM$Y4CYLQGIcIYv9Y& zBGPUh&QTfW;V2!)oIra@s&d968y-y}Y|ww(R$GzWS*V&)k@W0>Slem{|HdTCjm;_5 zwY*A8W3nUbemE^_f0ng$tbd<`sr?TO-_&VCw+F#7P@LkIl$1PzTBoPY1b88EIO>UO zP-NK7+g2yD3U6g3i|iA6+su>54sf_Sk0F=)1|9odnCM4u2Rs z=&Y?-V&VquSN%3FJ2~ZGweP~iLs|w=l@9yu$tj@}Dp?e-2JUsqOoswdXb=E%&0te_ zA2M+{5Hf-dqD7=yw*r@A*xkn(1IS~nfP}k}e?4Bt|9g(eph4hFX_|S6nj1&Sz9z^= zRw~<&-9d@FzTn6S*RVE{Wj5lgLJr9HLB8S9CgOm*>XA8*y4`JE;^s$=bqD#U4;e5C&x&ggKIAVL zrQ)Yd8|{>7Z(6*B&7&4&9(*vDOfHMuR-Dk1IZia*XM^EZUD^{?cWG>J>KrtElc*{K zaVl(7SN2cH4I6Q$bZOpJ8e5LKaG7p;?tJ~#+9QrTYU@f#5`Vo7cEX!szCT}iX-K^2 w#3o+=C+lQz2J+SOEzVX(eJ)e7=eicC{rr9U2VGDcdH?_b literal 0 HcmV?d00001 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); }