Browse Source

Merge pull request #1163 from abpframework/maliming/https

resolve #1157 Configure HTTPS for all applications.
pull/1170/head
Halil İbrahim Kalkan 7 years ago
committed by GitHub
parent
commit
d2c23bcfb2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
  2. 4
      templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json
  3. 2
      templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json
  4. 5
      templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
  5. 4
      templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/Properties/launchSettings.json
  6. 6
      templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
  7. 4
      templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs
  8. 2
      templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml
  9. 2
      templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/Properties/launchSettings.json
  10. 8
      templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json
  11. 4
      templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs
  12. 4
      templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/Properties/launchSettings.json
  13. 6
      templates/mvc-module/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json

5
templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs

@ -103,6 +103,11 @@ namespace MyCompanyName.MyProjectName
{ {
var app = context.GetApplicationBuilder(); var app = context.GetApplicationBuilder();
if (!context.GetEnvironment().IsDevelopment())
{
app.UseHsts();
}
app.UseHttpsRedirection();
app.UseCorrelationId(); app.UseCorrelationId();
app.UseVirtualFiles(); app.UseVirtualFiles();
app.UseAuthentication(); app.UseAuthentication();

4
templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json

@ -4,7 +4,7 @@
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://localhost:57992", "applicationUrl": "http://localhost:57992",
"sslPort": 0 "sslPort": 44300 //44300 to 44399 (inclusive)
} }
}, },
"profiles": { "profiles": {
@ -18,7 +18,7 @@
"MyCompanyName.MyProjectName.DemoApp": { "MyCompanyName.MyProjectName.DemoApp": {
"commandName": "Project", "commandName": "Project",
"launchBrowser": true, "launchBrowser": true,
"applicationUrl": "http://localhost:5000", "applicationUrl": "https://localhost:5001;http://localhost:5000",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} }

2
templates/mvc-module/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json

@ -7,6 +7,6 @@
"Configuration": "127.0.0.1" "Configuration": "127.0.0.1"
}, },
"AuthServer": { "AuthServer": {
"Authority": "http://localhost:61517" "Authority": "https://localhost:44301/"
} }
} }

5
templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs

@ -122,6 +122,11 @@ namespace MyCompanyName.MyProjectName
{ {
var app = context.GetApplicationBuilder(); var app = context.GetApplicationBuilder();
if (!context.GetEnvironment().IsDevelopment())
{
app.UseHsts();
}
app.UseHttpsRedirection();
app.UseCorrelationId(); app.UseCorrelationId();
app.UseVirtualFiles(); app.UseVirtualFiles();
app.UseAuthentication(); app.UseAuthentication();

4
templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/Properties/launchSettings.json

@ -4,7 +4,7 @@
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://localhost:61517", "applicationUrl": "http://localhost:61517",
"sslPort": 0 "sslPort": 44301 //44300 to 44399 (inclusive)
} }
}, },
"profiles": { "profiles": {
@ -18,7 +18,7 @@
"IdentityServerHost": { "IdentityServerHost": {
"commandName": "Project", "commandName": "Project",
"launchBrowser": true, "launchBrowser": true,
"applicationUrl": "http://localhost:5000", "applicationUrl": "https://localhost:5001;http://localhost:5000",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} }

6
templates/mvc-module/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json

@ -1,5 +1,5 @@
{ {
"AppSelfUrl": "http://localhost:61517/", "AppSelfUrl": "https://localhost:44301/",
"ConnectionStrings": { "ConnectionStrings": {
"Default": "Server=localhost;Database=MyProjectName_Main;Trusted_Connection=True;MultipleActiveResultSets=true" "Default": "Server=localhost;Database=MyProjectName_Main;Trusted_Connection=True;MultipleActiveResultSets=true"
}, },
@ -7,14 +7,14 @@
"Configuration": "127.0.0.1" "Configuration": "127.0.0.1"
}, },
"AuthServer": { "AuthServer": {
"Authority": "http://localhost:61517/", "Authority": "https://localhost:44301/",
"ApiName": "MyProjectName" "ApiName": "MyProjectName"
}, },
"IdentityServer": { "IdentityServer": {
"Clients": { "Clients": {
"MyProjectName_Web": { "MyProjectName_Web": {
"ClientId": "MyProjectName_Web", "ClientId": "MyProjectName_Web",
"RootUrl": "https://localhost:44314/" "RootUrl": "https://localhost:44302/"
}, },
"MyProjectName_ConsoleTestApp": { "MyProjectName_ConsoleTestApp": {
"ClientId": "MyProjectName_ConsoleTestApp" "ClientId": "MyProjectName_ConsoleTestApp"

4
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.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -207,8 +207,10 @@ namespace MyCompanyName.MyProjectName
else else
{ {
app.UseErrorPage(); app.UseErrorPage();
app.UseHsts();
} }
app.UseHttpsRedirection();
app.UseVirtualFiles(); app.UseVirtualFiles();
app.UseAuthentication(); app.UseAuthentication();

2
templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml

@ -8,7 +8,7 @@
@if (!CurrentUser.IsAuthenticated) @if (!CurrentUser.IsAuthenticated)
{ {
<form method="POST"> <form method="POST">
<input type="submit" asp-page-handler="Login" value="LOGIN" class="btn btn-login" /> <input type="submit" asp-page-handler="Login" value="LOGIN" class="btn btn-primary" />
</form> </form>
} }
else else

2
templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/Properties/launchSettings.json

@ -4,7 +4,7 @@
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://localhost:55953", "applicationUrl": "http://localhost:55953",
"sslPort": 44314 "sslPort": 44302 //44300 to 44399 (inclusive)
} }
}, },
"profiles": { "profiles": {

8
templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json

@ -1,18 +1,18 @@
{ {
"AppSelfUrl": "https://localhost:44314/", "AppSelfUrl": "https://localhost:44302/",
"RemoteServices": { "RemoteServices": {
"Default": { "Default": {
"BaseUrl": "http://localhost:61517/" "BaseUrl": "https://localhost:44301/"
}, },
"MyProjectName": { "MyProjectName": {
"BaseUrl": "http://localhost:57992/" "BaseUrl": "https://localhost:44300/"
} }
}, },
"Redis": { "Redis": {
"Configuration": "127.0.0.1" "Configuration": "127.0.0.1"
}, },
"AuthServer": { "AuthServer": {
"Authority": "http://localhost:61517/", "Authority": "https://localhost:44301/",
"ClientId": "MyProjectName_Web", "ClientId": "MyProjectName_Web",
"ClientSecret": "1q2w3e*" "ClientSecret": "1q2w3e*"
} }

4
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.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -109,8 +109,10 @@ namespace MyCompanyName.MyProjectName
else else
{ {
app.UseErrorPage(); app.UseErrorPage();
app.UseHsts();
} }
app.UseHttpsRedirection();
app.UseVirtualFiles(); app.UseVirtualFiles();
app.UseSwagger(); app.UseSwagger();

4
templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/Properties/launchSettings.json

@ -4,7 +4,7 @@
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://localhost:57891", "applicationUrl": "http://localhost:57891",
"sslPort": 0 "sslPort": 44303 //44300 to 44399 (inclusive)
} }
}, },
"profiles": { "profiles": {
@ -18,7 +18,7 @@
"MyCompanyName.MyProjectName.DemoApp": { "MyCompanyName.MyProjectName.DemoApp": {
"commandName": "Project", "commandName": "Project",
"launchBrowser": true, "launchBrowser": true,
"applicationUrl": "http://localhost:5000", "applicationUrl": "https://localhost:5001;http://localhost:5000",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} }

6
templates/mvc-module/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json

@ -1,10 +1,10 @@
{ {
"RemoteServices": { "RemoteServices": {
"Default": { "Default": {
"BaseUrl": "http://localhost:61517/" "BaseUrl": "https://localhost:44301/"
}, },
"MyProjectName": { "MyProjectName": {
"BaseUrl": "http://localhost:57992/" "BaseUrl": "https://localhost:44300/"
} }
}, },
"IdentityClients": { "IdentityClients": {
@ -14,7 +14,7 @@
"ClientSecret": "1q2w3e*", "ClientSecret": "1q2w3e*",
"UserName": "admin", "UserName": "admin",
"UserPassword": "1q2w3E*", "UserPassword": "1q2w3E*",
"Authority": "http://localhost:61517", "Authority": "https://localhost:44301/",
"Scope": "MyProjectName" "Scope": "MyProjectName"
} }
} }

Loading…
Cancel
Save