Added HTTPS redirect flag and test

ironmansoftware · Aug 26, 2019 · 8229a25 · 8229a25
1 parent 7e344ef
commit 8229a25
Show file tree

Hide file tree

Showing 5 changed files with 260 additions and 240 deletions.
diff --git a/src/UniversalDashboard.UITest/Integration/Https.Tests.ps1 b/src/UniversalDashboard.UITest/Integration/Https.Tests.ps1
@@ -35,6 +35,15 @@ Describe "Https" {
 
             Stop-UDDashboard -Server $Dashboard
         }
+
+        It "should redirect HTTP" {
+            $Dashboard = Start-UDDashboard -Port 10001 -Certificate $Cert
+
+            $Request = Invoke-WebRequest http://localhost:10001/dashboard
+            $Request.StatusCode | Should be 200
+
+            Stop-UDDashboard -Server $Dashboard
+        }
     }
 
     Get-UDDashboard | Stop-UDDashboard
@@ -57,4 +66,4 @@ Describe "Https" {
             Remove-Item $CertPath -Force
         }
     }
-}
+}
diff --git a/src/UniversalDashboard/Server/ServerStartup.cs b/src/UniversalDashboard/Server/ServerStartup.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.HttpsPolicy;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
@@ -111,7 +112,7 @@ public void Configure(IApplicationBuilder app, Microsoft.AspNetCore.Hosting.IHos
                     await context.Next(context.HttpContext);
                 }
             });
-			
+
 			app.UseStaticFiles(new StaticFileOptions()
 			{
 				FileProvider = new PhysicalFileProvider(env.ContentRootPath),
@@ -120,6 +121,8 @@ public void Configure(IApplicationBuilder app, Microsoft.AspNetCore.Hosting.IHos
 				ContentTypeProvider = provider
 			});
 
+      app.UseHttpsRedirection();
+
 			var dashboardService = app.ApplicationServices.GetService(typeof(IDashboardService)) as IDashboardService;
 
 			if (dashboardService?.DashboardOptions?.PublishedFolders != null) {
@@ -147,4 +150,4 @@ public void Configure(IApplicationBuilder app, Microsoft.AspNetCore.Hosting.IHos
             app.UseMvc();
 		}
 	}
-}
+}