diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Program.cs b/IdentityServer/v7/Basics/IdentityServer/src/Program.cs index acc3f415..1ce8e80f 100755 --- a/IdentityServer/v7/Basics/IdentityServer/src/Program.cs +++ b/IdentityServer/v7/Basics/IdentityServer/src/Program.cs @@ -15,6 +15,8 @@ public class Program { public static int Main(string[] args) { + Console.Title = "IdentityServer"; + Log.Logger = new LoggerConfiguration() .MinimumLevel.Debug() .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) diff --git a/IdentityServer/v7/MTLS/.vscode/launch.json b/IdentityServer/v7/MTLS/.vscode/launch.json new file mode 100644 index 00000000..ced7ee04 --- /dev/null +++ b/IdentityServer/v7/MTLS/.vscode/launch.json @@ -0,0 +1,53 @@ +{ + "version": "0.2.0", + "compounds": [ + { + "name": "Run All", + "configurations": ["IdentityServerHost", "Api", "ClientCredentials"], + "presentation": { + "group": "10-compunds", + } + } + ], + "configurations": [ + { + "name": "IdentityServerHost", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build-identityserverhost", + "program": "${workspaceFolder}/IdentityServerHost/bin/Debug/net8.0/IdentityServerHost.dll", + "args": [], + "cwd": "${workspaceFolder}/IdentityServerHost", + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "console": "externalTerminal", + }, + { + "name": "Api", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build-api", + "program": "${workspaceFolder}/Api/bin/Debug/net8.0/Api.dll", + "args": [], + "cwd": "${workspaceFolder}/Api/", + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "console": "externalTerminal", + }, + { + "name": "ClientCredentials", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build-clientcredentials", + "program": "${workspaceFolder}/ClientCredentials/bin/Debug/net8.0/ClientCredentials.dll", + "args": [], + "cwd": "${workspaceFolder}/ClientCredentials", + "console": "externalTerminal", + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + } + ] +} \ No newline at end of file diff --git a/IdentityServer/v7/MTLS/.vscode/tasks.json b/IdentityServer/v7/MTLS/.vscode/tasks.json new file mode 100644 index 00000000..7ae7f7b9 --- /dev/null +++ b/IdentityServer/v7/MTLS/.vscode/tasks.json @@ -0,0 +1,53 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "type": "process", + "command": "dotnet", + "args": [ + "build", + "${workspaceFolder}/MTLS.sln", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "build-identityserverhost", + "type": "process", + "command": "dotnet", + "args": [ + "build", + "${workspaceFolder}/IdentityServerHost", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "build-api", + "type": "process", + "command": "dotnet", + "args": [ + "build", + "${workspaceFolder}/Api", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "build-clientcredentials", + "type": "process", + "command": "dotnet", + "args": [ + "build", + "${workspaceFolder}/ClientCredentials", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/IdentityServer/v7/MTLS/Api/Api.csproj b/IdentityServer/v7/MTLS/Api/Api.csproj index 0cb2150b..f5df8837 100644 --- a/IdentityServer/v7/MTLS/Api/Api.csproj +++ b/IdentityServer/v7/MTLS/Api/Api.csproj @@ -1,13 +1,12 @@  - net6.0 + net8.0 - - - + + \ No newline at end of file diff --git a/IdentityServer/v7/MTLS/Api/ConfirmationValidationMiddleware.cs b/IdentityServer/v7/MTLS/Api/ConfirmationValidationMiddleware.cs index 77dc8060..b56623f5 100644 --- a/IdentityServer/v7/MTLS/Api/ConfirmationValidationMiddleware.cs +++ b/IdentityServer/v7/MTLS/Api/ConfirmationValidationMiddleware.cs @@ -1,68 +1,66 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; -using Newtonsoft.Json.Linq; using System; using System.Security.Cryptography; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Logging; +using System.Text.Json; -namespace SampleApi +namespace Api; + +public static class ConfirmationValidationExtensions { - public static class ConfirmationValidationExtensions + public static IApplicationBuilder UseConfirmationValidation(this IApplicationBuilder app, ConfirmationValidationMiddlewareOptions options = default) { - public static IApplicationBuilder UseConfirmationValidation(this IApplicationBuilder app, ConfirmationValidationMiddlewareOptions options = default) - { - return app.UseMiddleware(options ?? new ConfirmationValidationMiddlewareOptions()); - } + return app.UseMiddleware(options ?? new ConfirmationValidationMiddlewareOptions()); } +} + +public class ConfirmationValidationMiddlewareOptions +{ + public string JwtBearerSchemeName { get; set; } = JwtBearerDefaults.AuthenticationScheme; +} - public class ConfirmationValidationMiddlewareOptions +// this middleware validate the cnf claim (if present) against the thumbprint of the X.509 client certificate for the current client +public class ConfirmationValidationMiddleware +{ + private readonly RequestDelegate _next; + private readonly ILogger _logger; + private readonly ConfirmationValidationMiddlewareOptions _options; + + public ConfirmationValidationMiddleware(RequestDelegate next, ILogger logger, ConfirmationValidationMiddlewareOptions options = null) { - public string JwtBearerSchemeName { get; set; } = JwtBearerDefaults.AuthenticationScheme; + _next = next; + _logger = logger; + _options ??= new ConfirmationValidationMiddlewareOptions(); } - - // this middleware validate the cnf claim (if present) against the thumbprint of the X.509 client certificate for the current client - public class ConfirmationValidationMiddleware - { - private readonly RequestDelegate _next; - private readonly ILogger _logger; - private readonly ConfirmationValidationMiddlewareOptions _options; - public ConfirmationValidationMiddleware(RequestDelegate next, ILogger logger, ConfirmationValidationMiddlewareOptions options = null) - { - _next = next; - _logger = logger; - _options ??= new ConfirmationValidationMiddlewareOptions(); - } - - public async Task Invoke(HttpContext ctx) + public async Task Invoke(HttpContext ctx) + { + if (ctx.User.Identity.IsAuthenticated) { - if (ctx.User.Identity.IsAuthenticated) + var cnfJson = ctx.User.FindFirst("cnf")?.Value; + if (!String.IsNullOrWhiteSpace(cnfJson)) { - var cnfJson = ctx.User.FindFirst("cnf")?.Value; - if (!String.IsNullOrWhiteSpace(cnfJson)) - { - var certificate = await ctx.Connection.GetClientCertificateAsync(); - var thumbprint = Base64UrlTextEncoder.Encode(certificate.GetCertHash(HashAlgorithmName.SHA256)); - - var cnf = JObject.Parse(cnfJson); - var sha256 = cnf.Value("x5t#S256"); + var certificate = await ctx.Connection.GetClientCertificateAsync(); + var thumbprint = Base64UrlTextEncoder.Encode(certificate.GetCertHash(HashAlgorithmName.SHA256)); - if (String.IsNullOrWhiteSpace(sha256) || - !thumbprint.Equals(sha256, StringComparison.OrdinalIgnoreCase)) - { - _logger.LogError("certificate thumbprint does not match cnf claim."); - await ctx.ChallengeAsync(_options.JwtBearerSchemeName); - return; - } - - _logger.LogDebug("certificate thumbprint matches cnf claim."); + var sha256 = JsonDocument.Parse(cnfJson).RootElement.GetString("x5t#S256"); + + if (String.IsNullOrWhiteSpace(sha256) || + !thumbprint.Equals(sha256, StringComparison.OrdinalIgnoreCase)) + { + _logger.LogError("certificate thumbprint does not match cnf claim."); + await ctx.ChallengeAsync(_options.JwtBearerSchemeName); + return; } + + _logger.LogDebug("certificate thumbprint matches cnf claim."); } - - await _next(ctx); } + + await _next(ctx); } } \ No newline at end of file diff --git a/IdentityServer/v7/MTLS/Api/IdentityController.cs b/IdentityServer/v7/MTLS/Api/IdentityController.cs index 38812ac3..dfca179b 100644 --- a/IdentityServer/v7/MTLS/Api/IdentityController.cs +++ b/IdentityServer/v7/MTLS/Api/IdentityController.cs @@ -3,26 +3,25 @@ using Microsoft.Extensions.Logging; using System.Linq; -namespace SampleApi.Controllers +namespace Api.Controllers; + +[Route("identity")] +public class IdentityController : ControllerBase { - [Route("identity")] - public class IdentityController : ControllerBase - { - private readonly ILogger _logger; + private readonly ILogger _logger; - public IdentityController(ILogger logger) - { - _logger = logger; - } + public IdentityController(ILogger logger) + { + _logger = logger; + } - // this action simply echoes the claims back to the client - [HttpGet] - public ActionResult Get() - { - var claims = User.Claims.Select(c => new { c.Type, c.Value }); - _logger.LogInformation("claims: {claims}", claims); + // this action simply echoes the claims back to the client + [HttpGet] + public ActionResult Get() + { + var claims = User.Claims.Select(c => new { c.Type, c.Value }); + _logger.LogInformation("claims: {claims}", claims); - return new JsonResult(claims); - } + return new JsonResult(claims); } } \ No newline at end of file diff --git a/IdentityServer/v7/MTLS/Api/Program.cs b/IdentityServer/v7/MTLS/Api/Program.cs index 44fe9c6a..3a34681c 100644 --- a/IdentityServer/v7/MTLS/Api/Program.cs +++ b/IdentityServer/v7/MTLS/Api/Program.cs @@ -1,36 +1,36 @@ using System; using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.SystemConsole.Themes; -namespace SampleApi +namespace Api; + +public class Program { - public class Program + public static void Main(string[] args) { - public static void Main(string[] args) - { - Console.Title = "Sample API"; + Console.Title = "API"; - BuildWebHost(args).Run(); - } + BuildWebHost(args).Run(); + } - public static IWebHost BuildWebHost(string[] args) - { - Log.Logger = new LoggerConfiguration() - .MinimumLevel.Verbose() - .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) - .MinimumLevel.Override("System", LogEventLevel.Warning) - .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information) - .Enrich.FromLogContext() - .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code) - .CreateLogger(); + public static IHost BuildWebHost(string[] args) + { + Log.Logger = new LoggerConfiguration() + .MinimumLevel.Information() + .Enrich.FromLogContext() + .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code) + .CreateLogger(); - return WebHost.CreateDefaultBuilder(args) - .UseStartup() - .UseSerilog() - .Build(); - } + return Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseSerilog() + .Build(); } } \ No newline at end of file diff --git a/IdentityServer/v7/MTLS/Api/Startup.cs b/IdentityServer/v7/MTLS/Api/Startup.cs index d8aeaa98..1adad375 100644 --- a/IdentityServer/v7/MTLS/Api/Startup.cs +++ b/IdentityServer/v7/MTLS/Api/Startup.cs @@ -5,62 +5,61 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Hosting; -namespace SampleApi +namespace Api; + +public class Startup { - public class Startup + public Startup() { - public Startup() - { - JwtSecurityTokenHandler.DefaultMapInboundClaims = false; - } - - public void ConfigureServices(IServiceCollection services) - { - services.AddControllers(); + JwtSecurityTokenHandler.DefaultMapInboundClaims = false; + } + + public void ConfigureServices(IServiceCollection services) + { + services.AddControllers(); - // this API will accept any access token from the authority - services.AddAuthentication("token") - .AddJwtBearer("token", options => - { - options.Authority = "https://localhost:5001"; - options.TokenValidationParameters.ValidateAudience = false; - - options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" }; - }); + // this API will accept any access token from the authority + services.AddAuthentication("token") + .AddJwtBearer("token", options => + { + options.Authority = "https://localhost:5001"; + options.TokenValidationParameters.ValidateAudience = false; + + options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" }; + }); - // for local testing, we will use kestrel's MTLS - // this requires DNS to be setup -- hosts file would contain: - // 127.0.0.1 ::1 api.localhost - var mtls_localhost = new X509Certificate2("api.localhost.pfx", "password"); - services.Configure(options => + // for local testing, we will use kestrel's MTLS + // this requires DNS to be setup -- hosts file would contain: + // 127.0.0.1 ::1 api.localhost + var mtls_localhost = new X509Certificate2("api.localhost.pfx", "password"); + services.Configure(options => + { + options.ListenLocalhost(6001, config => config.UseHttps()); + options.ListenLocalhost(6002, config => { - options.ListenLocalhost(6001, config => config.UseHttps()); - options.ListenLocalhost(6002, config => + config.UseHttps(https => { - config.UseHttps(https => - { - https.ClientCertificateMode = Microsoft.AspNetCore.Server.Kestrel.Https.ClientCertificateMode.RequireCertificate; - https.AllowAnyClientCertificate(); - https.ServerCertificate = mtls_localhost; - }); + https.ClientCertificateMode = Microsoft.AspNetCore.Server.Kestrel.Https.ClientCertificateMode.RequireCertificate; + https.AllowAnyClientCertificate(); + https.ServerCertificate = mtls_localhost; }); }); + }); - } + } - public void Configure(IApplicationBuilder app) - { - app.UseRouting(); - - app.UseAuthentication(); - app.UseConfirmationValidation(); + public void Configure(IApplicationBuilder app) + { + app.UseRouting(); + + app.UseAuthentication(); + app.UseConfirmationValidation(); - app.UseAuthorization(); + app.UseAuthorization(); - app.UseEndpoints(endpoints => - { - endpoints.MapControllers().RequireAuthorization(); - }); - } + app.UseEndpoints(endpoints => + { + endpoints.MapControllers().RequireAuthorization(); + }); } } \ No newline at end of file diff --git a/IdentityServer/v7/MTLS/ClientCredentials/ConsoleMtlsClient.csproj b/IdentityServer/v7/MTLS/ClientCredentials/ClientCredentials.csproj similarity index 72% rename from IdentityServer/v7/MTLS/ClientCredentials/ConsoleMtlsClient.csproj rename to IdentityServer/v7/MTLS/ClientCredentials/ClientCredentials.csproj index abb5ad81..8adbe749 100644 --- a/IdentityServer/v7/MTLS/ClientCredentials/ConsoleMtlsClient.csproj +++ b/IdentityServer/v7/MTLS/ClientCredentials/ClientCredentials.csproj @@ -2,11 +2,11 @@ Exe - net6.0 + net8.0 - + diff --git a/IdentityServer/v7/MTLS/ClientCredentials/Program.cs b/IdentityServer/v7/MTLS/ClientCredentials/Program.cs index 76813455..c9a27346 100644 --- a/IdentityServer/v7/MTLS/ClientCredentials/Program.cs +++ b/IdentityServer/v7/MTLS/ClientCredentials/Program.cs @@ -6,67 +6,66 @@ using IdentityModel.Client; using Shared; -namespace Client +namespace ClientCredentials; + +public static class Urls { - public static class Urls - { - public const string IdentityServer = "https://localhost:5001"; + public const string IdentityServer = "https://localhost:5001"; - public const string ApiBaseMtls = "https://api.localhost:6002"; - public const string ApiMtls = ApiBaseMtls + "/identity"; - } + public const string ApiBaseMtls = "https://api.localhost:6002"; + public const string ApiMtls = ApiBaseMtls + "/identity"; +} - public class Program +public class Program +{ + public static async Task Main() { - public static async Task Main() - { - Console.Title = "Console MTLS Client"; + Console.Title = "Console MTLS Client"; - var response = await RequestTokenAsync(); - response.Show(); + var response = await RequestTokenAsync(); + response.Show(); - await CallServiceAsync(response.AccessToken); - } + await CallServiceAsync(response.AccessToken); + } - static async Task RequestTokenAsync() - { - var client = new HttpClient(GetHandler()); + static async Task RequestTokenAsync() + { + var client = new HttpClient(GetHandler()); - var disco = await client.GetDiscoveryDocumentAsync(Urls.IdentityServer); - if (disco.IsError) throw new Exception(disco.Error); + var disco = await client.GetDiscoveryDocumentAsync(Urls.IdentityServer); + if (disco.IsError) throw new Exception(disco.Error); - var response = await client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest - { - Address = disco.MtlsEndpointAliases.TokenEndpoint, + var response = await client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest + { + Address = disco.MtlsEndpointAliases.TokenEndpoint, - ClientId = "mtls", - ClientCredentialStyle = ClientCredentialStyle.PostBody, - Scope = "scope1" - }); + ClientId = "mtls", + ClientCredentialStyle = ClientCredentialStyle.PostBody, + Scope = "scope1" + }); - if (response.IsError) throw new Exception(response.Error); - return response; - } + if (response.IsError) throw new Exception(response.Error); + return response; + } - static async Task CallServiceAsync(string token) - { - var client = new HttpClient(GetHandler()); - client.SetBearerToken(token); + static async Task CallServiceAsync(string token) + { + var client = new HttpClient(GetHandler()); + client.SetBearerToken(token); - var response = await client.GetStringAsync(Urls.ApiMtls); + var response = await client.GetStringAsync(Urls.ApiMtls); - "\n\nService claims:".ConsoleGreen(); - Console.WriteLine(JsonSerializer.Serialize(JsonDocument.Parse(response), new JsonSerializerOptions { WriteIndented = true })); - } + "\n\nService claims:".ConsoleGreen(); + Console.WriteLine(JsonSerializer.Serialize(JsonDocument.Parse(response), new JsonSerializerOptions { WriteIndented = true })); + } - static SocketsHttpHandler GetHandler() - { - var handler = new SocketsHttpHandler(); + static SocketsHttpHandler GetHandler() + { + var handler = new SocketsHttpHandler(); - var cert = new X509Certificate2("client.p12", "changeit"); - handler.SslOptions.ClientCertificates = new X509CertificateCollection { cert }; + var cert = new X509Certificate2("client.p12", "changeit"); + handler.SslOptions.ClientCertificates = new X509CertificateCollection { cert }; - return handler; - } + return handler; } } diff --git a/IdentityServer/v7/MTLS/ClientCredentials/README.md b/IdentityServer/v7/MTLS/ClientCredentials/README.md new file mode 100644 index 00000000..9967e5c9 --- /dev/null +++ b/IdentityServer/v7/MTLS/ClientCredentials/README.md @@ -0,0 +1,24 @@ +# mTLS Sample + +This sample shows how to use mTLS to bind tokens to a client. To run, follow these steps: + +1. Configure DNS. Add the configuration below to your hosts file. On windows, this is the file + C:\Windows\System32\drivers\etc\hosts. +``` +# Used by Duende mTLS sample +127.0.0.1 mtls.localhost +127.0.0.1 api.localhost +``` +2. Install certificates. The mTLS connection requires both client and server to + authenticate using an SSL certificate. This solution contains demo certificates that + will be used. In order to trust those certificates, you must trust the signing + certificates. To do that, import Api\api.localhost.cer and mtls.localhost.cert as + Trusted Root Certification Authorities. On windows, double click those files -> Install + Certificate -> Choose Current User -> Next -> Choose to Place certificates in a chosen + store -> Browse to Trusted Root Certification Authorities -> Next -> Finish. Each .cer + file needs to be trusted separately. +3. Start up the IdentityServer and API projects. +4. Run the ClientCredentials project. + +After you are finished with the sample, you may wish to remove the certificates from your +trusted root authority. \ No newline at end of file diff --git a/IdentityServer/v7/MTLS/IdentityServer/IdentityServerHost.csproj b/IdentityServer/v7/MTLS/IdentityServer/IdentityServerHost.csproj deleted file mode 100644 index df7d8807..00000000 --- a/IdentityServer/v7/MTLS/IdentityServer/IdentityServerHost.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - net6.0 - - - - - - - - \ No newline at end of file diff --git a/IdentityServer/v7/MTLS/IdentityServer/Clients.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Clients.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Clients.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Clients.cs diff --git a/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj new file mode 100644 index 00000000..0a429b12 --- /dev/null +++ b/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj @@ -0,0 +1,12 @@ + + + + net8.0 + + + + + + + + \ No newline at end of file diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Account/AccessDenied.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/AccessDenied.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Account/AccessDenied.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/AccessDenied.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Account/AccessDenied.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/AccessDenied.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Account/AccessDenied.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/AccessDenied.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Login/Index.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Login/Index.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Login/Index.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Login/Index.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Login/Index.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Login/Index.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Login/Index.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Login/Index.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Login/InputModel.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Login/InputModel.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Login/InputModel.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Login/InputModel.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Login/LoginOptions.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Login/LoginOptions.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Login/LoginOptions.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Login/LoginOptions.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Login/ViewModel.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Login/ViewModel.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Login/ViewModel.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Login/ViewModel.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Logout/Index.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Logout/Index.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Logout/Index.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Logout/Index.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Logout/Index.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Logout/Index.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Logout/Index.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Logout/Index.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Logout/LoggedOut.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Logout/LoggedOut.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Logout/LoggedOut.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Logout/LoggedOut.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Logout/LoggedOut.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Logout/LoggedOut.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Logout/LoggedOut.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Logout/LoggedOut.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Logout/LoggedOutViewModel.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Logout/LoggedOutViewModel.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Logout/LoggedOutViewModel.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Logout/LoggedOutViewModel.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Logout/LogoutOptions.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Logout/LogoutOptions.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Account/Logout/LogoutOptions.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Account/Logout/LogoutOptions.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/All.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/All.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/All.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/All.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/All.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/All.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/All.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/All.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/Consent.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/Consent.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/Consent.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/Consent.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/Consent.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/Consent.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/Consent.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/Consent.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/ConsentOptions.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/ConsentOptions.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/ConsentOptions.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/ConsentOptions.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/Index.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/Index.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/Index.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/Index.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/Index.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/Index.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/Index.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/Index.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/InputModel.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/InputModel.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/InputModel.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/InputModel.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/ViewModel.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/ViewModel.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/ViewModel.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/ViewModel.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/_ScopeListItem.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/_ScopeListItem.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Ciba/_ScopeListItem.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Ciba/_ScopeListItem.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Consent/ConsentOptions.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Consent/ConsentOptions.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Consent/ConsentOptions.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Consent/ConsentOptions.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Consent/Index.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Consent/Index.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Consent/Index.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Consent/Index.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Consent/Index.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Consent/Index.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Consent/Index.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Consent/Index.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Consent/InputModel.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Consent/InputModel.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Consent/InputModel.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Consent/InputModel.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Consent/ViewModel.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Consent/ViewModel.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Consent/ViewModel.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Consent/ViewModel.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Consent/_ScopeListItem.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Consent/_ScopeListItem.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Consent/_ScopeListItem.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Consent/_ScopeListItem.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Device/DeviceOptions.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/DeviceOptions.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Device/DeviceOptions.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/DeviceOptions.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Device/Index.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/Index.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Device/Index.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/Index.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Device/Index.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/Index.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Device/Index.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/Index.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Device/InputModel.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/InputModel.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Device/InputModel.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/InputModel.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Device/Success.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/Success.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Device/Success.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/Success.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Device/Success.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/Success.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Device/Success.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/Success.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Device/ViewModel.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/ViewModel.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Device/ViewModel.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/ViewModel.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Device/_ScopeListItem.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/_ScopeListItem.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Device/_ScopeListItem.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Device/_ScopeListItem.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Diagnostics/Index.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Diagnostics/Index.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Diagnostics/Index.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Diagnostics/Index.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Diagnostics/Index.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Diagnostics/Index.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Diagnostics/Index.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Diagnostics/Index.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Diagnostics/ViewModel.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Diagnostics/ViewModel.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Diagnostics/ViewModel.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Extensions.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Extensions.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Extensions.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Extensions.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/ExternalLogin/Callback.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/ExternalLogin/Callback.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/ExternalLogin/Callback.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/ExternalLogin/Callback.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/ExternalLogin/Callback.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/ExternalLogin/Callback.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/ExternalLogin/Callback.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/ExternalLogin/Callback.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/ExternalLogin/Challenge.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/ExternalLogin/Challenge.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/ExternalLogin/Challenge.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/ExternalLogin/Challenge.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/ExternalLogin/Challenge.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/ExternalLogin/Challenge.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/ExternalLogin/Challenge.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/ExternalLogin/Challenge.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Grants/Index.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Grants/Index.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Grants/Index.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Grants/Index.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Grants/Index.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Grants/Index.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Grants/Index.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Grants/Index.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Grants/ViewModel.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Grants/ViewModel.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Grants/ViewModel.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Grants/ViewModel.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Home/Error/Index.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Home/Error/Index.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Home/Error/Index.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Home/Error/Index.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Home/Error/Index.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Home/Error/Index.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Home/Error/Index.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Home/Error/Index.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Home/Error/ViewModel.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Home/Error/ViewModel.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Home/Error/ViewModel.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Home/Error/ViewModel.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Index.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Index.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Index.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Index.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Index.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Index.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Index.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Index.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Redirect/Index.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Redirect/Index.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Redirect/Index.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Redirect/Index.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Redirect/Index.cshtml.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Redirect/Index.cshtml.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Redirect/Index.cshtml.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Redirect/Index.cshtml.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/SecurityHeadersAttribute.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/SecurityHeadersAttribute.cs similarity index 80% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/SecurityHeadersAttribute.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/SecurityHeadersAttribute.cs index 09081724..36f9dbd7 100644 --- a/IdentityServer/v7/MTLS/IdentityServer/Pages/SecurityHeadersAttribute.cs +++ b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/SecurityHeadersAttribute.cs @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; @@ -17,13 +18,13 @@ public override void OnResultExecuting(ResultExecutingContext context) // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options if (!context.HttpContext.Response.Headers.ContainsKey("X-Content-Type-Options")) { - context.HttpContext.Response.Headers.Add("X-Content-Type-Options", "nosniff"); + context.HttpContext.Response.Headers.Append("X-Content-Type-Options", "nosniff"); } // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options if (!context.HttpContext.Response.Headers.ContainsKey("X-Frame-Options")) { - context.HttpContext.Response.Headers.Add("X-Frame-Options", "SAMEORIGIN"); + context.HttpContext.Response.Headers.Append("X-Frame-Options", "SAMEORIGIN"); } // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy @@ -36,19 +37,19 @@ public override void OnResultExecuting(ResultExecutingContext context) // once for standards compliant browsers if (!context.HttpContext.Response.Headers.ContainsKey("Content-Security-Policy")) { - context.HttpContext.Response.Headers.Add("Content-Security-Policy", csp); + context.HttpContext.Response.Headers.Append("Content-Security-Policy", csp); } // and once again for IE if (!context.HttpContext.Response.Headers.ContainsKey("X-Content-Security-Policy")) { - context.HttpContext.Response.Headers.Add("X-Content-Security-Policy", csp); + context.HttpContext.Response.Headers.Append("X-Content-Security-Policy", csp); } // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy var referrer_policy = "no-referrer"; if (!context.HttpContext.Response.Headers.ContainsKey("Referrer-Policy")) { - context.HttpContext.Response.Headers.Add("Referrer-Policy", referrer_policy); + context.HttpContext.Response.Headers.Append("Referrer-Policy", referrer_policy); } } } diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Shared/_Layout.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Shared/_Layout.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Shared/_Layout.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Shared/_Layout.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Shared/_Nav.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Shared/_Nav.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Shared/_Nav.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Shared/_Nav.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/Shared/_ValidationSummary.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/Shared/_ValidationSummary.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/Shared/_ValidationSummary.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/Shared/_ValidationSummary.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/TestUsers.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/TestUsers.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/TestUsers.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/TestUsers.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/_ViewImports.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/_ViewImports.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/_ViewImports.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/_ViewImports.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Pages/_ViewStart.cshtml b/IdentityServer/v7/MTLS/IdentityServerHost/Pages/_ViewStart.cshtml similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Pages/_ViewStart.cshtml rename to IdentityServer/v7/MTLS/IdentityServerHost/Pages/_ViewStart.cshtml diff --git a/IdentityServer/v7/MTLS/IdentityServer/Program.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Program.cs similarity index 97% rename from IdentityServer/v7/MTLS/IdentityServer/Program.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Program.cs index acc3f415..e4c7abc3 100644 --- a/IdentityServer/v7/MTLS/IdentityServer/Program.cs +++ b/IdentityServer/v7/MTLS/IdentityServerHost/Program.cs @@ -15,6 +15,8 @@ public class Program { public static int Main(string[] args) { + Console.Title = "IdentityServer"; + Log.Logger = new LoggerConfiguration() .MinimumLevel.Debug() .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) diff --git a/IdentityServer/v7/MTLS/IdentityServer/Properties/launchSettings.json b/IdentityServer/v7/MTLS/IdentityServerHost/Properties/launchSettings.json similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Properties/launchSettings.json rename to IdentityServer/v7/MTLS/IdentityServerHost/Properties/launchSettings.json diff --git a/IdentityServer/v7/MTLS/IdentityServer/Resources.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Resources.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Resources.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Resources.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/Startup.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Startup.cs similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/Startup.cs rename to IdentityServer/v7/MTLS/IdentityServerHost/Startup.cs diff --git a/IdentityServer/v7/MTLS/IdentityServer/mtls.localhost.cer b/IdentityServer/v7/MTLS/IdentityServerHost/mtls.localhost.cer similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/mtls.localhost.cer rename to IdentityServer/v7/MTLS/IdentityServerHost/mtls.localhost.cer diff --git a/IdentityServer/v7/MTLS/IdentityServer/mtls.localhost.pfx b/IdentityServer/v7/MTLS/IdentityServerHost/mtls.localhost.pfx similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/mtls.localhost.pfx rename to IdentityServer/v7/MTLS/IdentityServerHost/mtls.localhost.pfx diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/css/site.css b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/css/site.css similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/css/site.css rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/css/site.css diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/css/site.min.css b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/css/site.min.css similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/css/site.min.css rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/css/site.min.css diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/css/site.scss b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/css/site.scss similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/css/site.scss rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/css/site.scss diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/duende-logo.svg b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/duende-logo.svg similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/duende-logo.svg rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/duende-logo.svg diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/favicon.ico b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/favicon.ico similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/favicon.ico rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/favicon.ico diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/js/signin-redirect.js b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/js/signin-redirect.js similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/js/signin-redirect.js rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/js/signin-redirect.js diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/js/signout-redirect.js b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/js/signout-redirect.js similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/js/signout-redirect.js rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/js/signout-redirect.js diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/LICENSE b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/LICENSE similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/LICENSE rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/LICENSE diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/README.md b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/README.md similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/README.md rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/README.md diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/LICENSE b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/LICENSE similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/LICENSE rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/LICENSE diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.css b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.css similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.css rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.css diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.eot b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.eot similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.eot rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.eot diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.svg b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.svg similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.svg rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.svg diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.ttf b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.ttf similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.ttf rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.ttf diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff2 b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff2 similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff2 rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff2 diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.css b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.css similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.css rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.css diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.less b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.less similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.less rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.less diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.min.css b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.min.css similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.min.css rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.min.css diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/LICENSE.txt b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/LICENSE.txt similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/LICENSE.txt rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/LICENSE.txt diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/README.md b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/README.md similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/README.md rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/README.md diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/dist/jquery.js b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/dist/jquery.js rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/dist/jquery.js diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/dist/jquery.min.js b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/dist/jquery.min.js similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/dist/jquery.min.js rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/dist/jquery.min.js diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/dist/jquery.min.map b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/dist/jquery.min.map rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/dist/jquery.min.map diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/dist/jquery.slim.js b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/dist/jquery.slim.js similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/dist/jquery.slim.js rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/dist/jquery.slim.js diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/dist/jquery.slim.min.js b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/dist/jquery.slim.min.js similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/dist/jquery.slim.min.js rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/dist/jquery.slim.min.js diff --git a/IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/dist/jquery.slim.min.map b/IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/dist/jquery.slim.min.map similarity index 100% rename from IdentityServer/v7/MTLS/IdentityServer/wwwroot/lib/jquery/dist/jquery.slim.min.map rename to IdentityServer/v7/MTLS/IdentityServerHost/wwwroot/lib/jquery/dist/jquery.slim.min.map diff --git a/IdentityServer/v7/MTLS/MTLS.sln b/IdentityServer/v7/MTLS/MTLS.sln index 01f1f1c9..e549feba 100644 --- a/IdentityServer/v7/MTLS/MTLS.sln +++ b/IdentityServer/v7/MTLS/MTLS.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31912.275 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServerHost", "IdentityServer\IdentityServerHost.csproj", "{7F49863A-08F1-4A9B-9740-C05CF679384F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServerHost", "IdentityServerHost\IdentityServerHost.csproj", "{7F49863A-08F1-4A9B-9740-C05CF679384F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleMtlsClient", "ClientCredentials\ConsoleMtlsClient.csproj", "{78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientCredentials", "ClientCredentials\ClientCredentials.csproj", "{78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "Api\Api.csproj", "{36079801-4BD2-4B7B-B44C-0B8169A7CB12}" EndProject