From d846ee50d8b4b7188967b2beef39ad39d3650e4c Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 28 May 2019 11:16:45 +0800 Subject: [PATCH 1/2] resolve #1157 Configure HTTPS for all applications. --- .../MyProjectNameHttpApiHostModule.cs | 7 ++++++- .../Properties/launchSettings.json | 4 ++-- .../MyProjectNameIdentityServerModule.cs | 7 ++++++- .../Properties/launchSettings.json | 6 +++--- .../MyProjectNameWebHostModule.cs | 4 +++- .../Properties/launchSettings.json | 2 +- .../MyProjectNameWebUnifiedModule.cs | 4 +++- .../Properties/launchSettings.json | 4 ++-- 8 files changed, 26 insertions(+), 12 deletions(-) diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 817a4a7c7e..97d3f7b847 100644 --- a/templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -102,7 +102,12 @@ namespace MyCompanyName.MyProjectName public override void OnApplicationInitialization(ApplicationInitializationContext context) { var app = context.GetApplicationBuilder(); - + + if (!context.GetEnvironment().IsDevelopment()) + { + app.UseHsts(); + } + app.UseHttpsRedirection(); app.UseCorrelationId(); app.UseVirtualFiles(); app.UseAuthentication(); diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json b/templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json index d4af8cf954..469b617f37 100644 --- a/templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json +++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json @@ -4,7 +4,7 @@ "anonymousAuthentication": true, "iisExpress": { "applicationUrl": "http://localhost:57992", - "sslPort": 0 + "sslPort": 44300 //44300 to 44399 (inclusive) } }, "profiles": { @@ -18,7 +18,7 @@ "MyCompanyName.MyProjectName.DemoApp": { "commandName": "Project", "launchBrowser": true, - "applicationUrl": "http://localhost:5000", + "applicationUrl": "https://localhost:5001;http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index 31c4ef1cd0..9730db7df2 100644 --- a/templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -121,7 +121,12 @@ namespace MyCompanyName.MyProjectName public override void OnApplicationInitialization(ApplicationInitializationContext context) { var app = context.GetApplicationBuilder(); - + + if (!context.GetEnvironment().IsDevelopment()) + { + app.UseHsts(); + } + app.UseHttpsRedirection(); app.UseCorrelationId(); app.UseVirtualFiles(); app.UseAuthentication(); diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/Properties/launchSettings.json b/templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/Properties/launchSettings.json index 727e186c5a..d1d5c8a40c 100644 --- a/templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/Properties/launchSettings.json +++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/Properties/launchSettings.json @@ -1,10 +1,10 @@ { "iisSettings": { "windowsAuthentication": false, - "anonymousAuthentication": true, + "anonymousAuthentication": true, "iisExpress": { "applicationUrl": "http://localhost:61517", - "sslPort": 0 + "sslPort": 44301 //44300 to 44399 (inclusive) } }, "profiles": { @@ -18,7 +18,7 @@ "IdentityServerHost": { "commandName": "Project", "launchBrowser": true, - "applicationUrl": "http://localhost:5000", + "applicationUrl": "https://localhost:5001;http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs index ff72ca1e20..57ea05c73e 100644 --- a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs +++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs @@ -1,4 +1,4 @@ -using System; +using System; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; @@ -207,8 +207,10 @@ namespace MyCompanyName.MyProjectName else { app.UseErrorPage(); + app.UseHsts(); } + app.UseHttpsRedirection(); app.UseVirtualFiles(); app.UseAuthentication(); diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/Properties/launchSettings.json b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/Properties/launchSettings.json index 510c9321f1..8f09dd974b 100644 --- a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/Properties/launchSettings.json +++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/Properties/launchSettings.json @@ -4,7 +4,7 @@ "anonymousAuthentication": true, "iisExpress": { "applicationUrl": "http://localhost:55953", - "sslPort": 44314 + "sslPort": 44302 //44300 to 44399 (inclusive) } }, "profiles": { diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs index b178b79b7e..afe103d632 100644 --- a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs +++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs @@ -1,4 +1,4 @@ -using System.IO; +using System.IO; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; @@ -109,8 +109,10 @@ namespace MyCompanyName.MyProjectName else { app.UseErrorPage(); + app.UseHsts(); } + app.UseHttpsRedirection(); app.UseVirtualFiles(); app.UseSwagger(); diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/Properties/launchSettings.json b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/Properties/launchSettings.json index 9dcbdbe130..e19ee82834 100644 --- a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/Properties/launchSettings.json +++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/Properties/launchSettings.json @@ -4,7 +4,7 @@ "anonymousAuthentication": true, "iisExpress": { "applicationUrl": "http://localhost:57891", - "sslPort": 0 + "sslPort": 44303 //44300 to 44399 (inclusive) } }, "profiles": { @@ -18,7 +18,7 @@ "MyCompanyName.MyProjectName.DemoApp": { "commandName": "Project", "launchBrowser": true, - "applicationUrl": "http://localhost:5000", + "applicationUrl": "https://localhost:5001;http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } From d040b5476634dd018ed4da8cd5d7f847d5be9f42 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Tue, 28 May 2019 09:41:22 +0300 Subject: [PATCH 2/2] Fix URLs for https change. --- .../appsettings.json | 2 +- .../appsettings.json | 6 +++--- .../Pages/Index.cshtml | 2 +- .../MyCompanyName.MyProjectName.Web.Host/appsettings.json | 8 ++++---- .../appsettings.json | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json b/templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json index bd32219bef..9ee790cc41 100644 --- a/templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json +++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json @@ -7,6 +7,6 @@ "Configuration": "127.0.0.1" }, "AuthServer": { - "Authority": "http://localhost:61517" + "Authority": "https://localhost:44301/" } } \ No newline at end of file diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json b/templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json index ac556b7902..84503601a5 100644 --- a/templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json +++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json @@ -1,5 +1,5 @@ { - "AppSelfUrl": "http://localhost:61517/", + "AppSelfUrl": "https://localhost:44301/", "ConnectionStrings": { "Default": "Server=localhost;Database=MyProjectName_Main;Trusted_Connection=True;MultipleActiveResultSets=true" }, @@ -7,14 +7,14 @@ "Configuration": "127.0.0.1" }, "AuthServer": { - "Authority": "http://localhost:61517/", + "Authority": "https://localhost:44301/", "ApiName": "MyProjectName" }, "IdentityServer": { "Clients": { "MyProjectName_Web": { "ClientId": "MyProjectName_Web", - "RootUrl": "https://localhost:44314/" + "RootUrl": "https://localhost:44302/" }, "MyProjectName_ConsoleTestApp": { "ClientId": "MyProjectName_ConsoleTestApp" diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml index 30248e8f44..18ef699e57 100644 --- a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml +++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml @@ -8,7 +8,7 @@ @if (!CurrentUser.IsAuthenticated) {
- +
} else diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json index fef0224647..96a98545b1 100644 --- a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json +++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json @@ -1,18 +1,18 @@ { - "AppSelfUrl": "https://localhost:44314/", + "AppSelfUrl": "https://localhost:44302/", "RemoteServices": { "Default": { - "BaseUrl": "http://localhost:61517/" + "BaseUrl": "https://localhost:44301/" }, "MyProjectName": { - "BaseUrl": "http://localhost:57992/" + "BaseUrl": "https://localhost:44300/" } }, "Redis": { "Configuration": "127.0.0.1" }, "AuthServer": { - "Authority": "http://localhost:61517/", + "Authority": "https://localhost:44301/", "ClientId": "MyProjectName_Web", "ClientSecret": "1q2w3e*" } diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json b/templates/mvc-module/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json index a49783d869..db70a74230 100644 --- a/templates/mvc-module/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json @@ -1,10 +1,10 @@ { "RemoteServices": { "Default": { - "BaseUrl": "http://localhost:61517/" + "BaseUrl": "https://localhost:44301/" }, "MyProjectName": { - "BaseUrl": "http://localhost:57992/" + "BaseUrl": "https://localhost:44300/" } }, "IdentityClients": { @@ -14,7 +14,7 @@ "ClientSecret": "1q2w3e*", "UserName": "admin", "UserPassword": "1q2w3E*", - "Authority": "http://localhost:61517", + "Authority": "https://localhost:44301/", "Scope": "MyProjectName" } }