[Diagnostics] Fix Diagnostics middleware errors (#4271)

Removes setting two forbidden headers.
This commit is contained in:
Javier Calvarro Nelson 2018-12-04 01:18:31 +01:00 committed by GitHub
parent 8ebca1933c
commit f6b4d65218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 20 deletions

View File

@ -9,6 +9,7 @@
Microsoft.AspNetCore.Server.IISIntegration; Microsoft.AspNetCore.Server.IISIntegration;
Microsoft.AspNetCore.Server.IntegrationTesting.IIS; Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets; Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore;
</PackagesInPatch> </PackagesInPatch>
</PropertyGroup> </PropertyGroup>

View File

@ -0,0 +1,4 @@
# How to regenerate the error page
* Go to the Razor Generator project
* dotnet build
* run `dotnet .\bin\Debug\netcoreapp2.1\dotnet-razorpagegenerator.dll "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views" "<<PathToAspNetCore>>\src\Middleware\Diagnostics.EntityFrameworkCore\src\"`

View File

@ -3,12 +3,12 @@
namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views
{ {
#line hidden #line hidden
using System.Threading.Tasks;
#line 1 "DatabaseErrorPage.cshtml" #line 1 "DatabaseErrorPage.cshtml"
using System; using System;
#line default #line default
#line hidden #line hidden
using System.Threading.Tasks;
#line 2 "DatabaseErrorPage.cshtml" #line 2 "DatabaseErrorPage.cshtml"
using System.Linq; using System.Linq;
@ -302,50 +302,48 @@ body .titleerror {
#line hidden #line hidden
WriteLiteral(@""", true); WriteLiteral(@""", true);
req.setRequestHeader(""Content-type"", ""application/x-www-form-urlencoded""); req.setRequestHeader(""Content-type"", ""application/x-www-form-urlencoded"");
req.setRequestHeader(""Content-length"", formBody.length);
req.setRequestHeader(""Connection"", ""close"");
req.send(formBody); req.send(formBody);
} }
function ErrorApplyingMigrations() { function ErrorApplyingMigrations() {
applyMigrations.innerHTML = """); applyMigrations.innerHTML = """);
#line 184 "DatabaseErrorPage.cshtml" #line 182 "DatabaseErrorPage.cshtml"
Write(JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsButton)); Write(JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsButton));
#line default #line default
#line hidden #line hidden
WriteLiteral("\";\r\n applyMigrationsError.innerHTML = \""); WriteLiteral("\";\r\n applyMigrationsError.innerHTML = \"");
#line 185 "DatabaseErrorPage.cshtml" #line 183 "DatabaseErrorPage.cshtml"
Write(JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsFailed)); Write(JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsFailed));
#line default #line default
#line hidden #line hidden
WriteLiteral("\";\r\n applyMigrations.disabled = false;\r\n }\r\n </script>\r\n\r\n <p>"); WriteLiteral("\";\r\n applyMigrations.disabled = false;\r\n }\r\n </script>\r\n\r\n <p>");
#line 190 "DatabaseErrorPage.cshtml" #line 188 "DatabaseErrorPage.cshtml"
Write(Strings.DatabaseErrorPage_HowToApplyFromPMC); Write(Strings.DatabaseErrorPage_HowToApplyFromPMC);
#line default #line default
#line hidden #line hidden
WriteLiteral("</p>\r\n <code>"); WriteLiteral("</p>\r\n <code>");
#line 191 "DatabaseErrorPage.cshtml" #line 189 "DatabaseErrorPage.cshtml"
Write(Strings.DatabaseErrorPage_ApplyMigrationsCommandPMC); Write(Strings.DatabaseErrorPage_ApplyMigrationsCommandPMC);
#line default #line default
#line hidden #line hidden
WriteLiteral("</code>\r\n <p>"); WriteLiteral("</code>\r\n <p>");
#line 192 "DatabaseErrorPage.cshtml" #line 190 "DatabaseErrorPage.cshtml"
Write(Strings.DatabaseErrorPage_HowToApplyFromCLI); Write(Strings.DatabaseErrorPage_HowToApplyFromCLI);
#line default #line default
#line hidden #line hidden
WriteLiteral("</p>\r\n <code>"); WriteLiteral("</p>\r\n <code>");
#line 193 "DatabaseErrorPage.cshtml" #line 191 "DatabaseErrorPage.cshtml"
Write(Strings.DatabaseErrorPage_ApplyMigrationsCommandCLI); Write(Strings.DatabaseErrorPage_ApplyMigrationsCommandCLI);
#line default #line default
#line hidden #line hidden
WriteLiteral("</code>\r\n <hr />\r\n </div>\r\n"); WriteLiteral("</code>\r\n <hr />\r\n </div>\r\n");
#line 196 "DatabaseErrorPage.cshtml" #line 194 "DatabaseErrorPage.cshtml"
} }
else if (Model.PendingModelChanges) else if (Model.PendingModelChanges)
{ {
@ -353,49 +351,49 @@ body .titleerror {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <div>\r\n <h2>"); WriteLiteral(" <div>\r\n <h2>");
#line 200 "DatabaseErrorPage.cshtml" #line 198 "DatabaseErrorPage.cshtml"
Write(Strings.FormatDatabaseErrorPage_PendingChangesTitle(Model.ContextType.Name)); Write(Strings.FormatDatabaseErrorPage_PendingChangesTitle(Model.ContextType.Name));
#line default #line default
#line hidden #line hidden
WriteLiteral("</h2>\r\n <p>"); WriteLiteral("</h2>\r\n <p>");
#line 201 "DatabaseErrorPage.cshtml" #line 199 "DatabaseErrorPage.cshtml"
Write(Strings.DatabaseErrorPage_PendingChangesInfoPMC); Write(Strings.DatabaseErrorPage_PendingChangesInfoPMC);
#line default #line default
#line hidden #line hidden
WriteLiteral("</p>\r\n <code>"); WriteLiteral("</p>\r\n <code>");
#line 202 "DatabaseErrorPage.cshtml" #line 200 "DatabaseErrorPage.cshtml"
Write(Strings.DatabaseErrorPage_AddMigrationCommandPMC); Write(Strings.DatabaseErrorPage_AddMigrationCommandPMC);
#line default #line default
#line hidden #line hidden
WriteLiteral("</code>\r\n <br />\r\n <code>"); WriteLiteral("</code>\r\n <br />\r\n <code>");
#line 204 "DatabaseErrorPage.cshtml" #line 202 "DatabaseErrorPage.cshtml"
Write(Strings.DatabaseErrorPage_ApplyMigrationsCommandPMC); Write(Strings.DatabaseErrorPage_ApplyMigrationsCommandPMC);
#line default #line default
#line hidden #line hidden
WriteLiteral("</code>\r\n <p>"); WriteLiteral("</code>\r\n <p>");
#line 205 "DatabaseErrorPage.cshtml" #line 203 "DatabaseErrorPage.cshtml"
Write(Strings.DatabaseErrorPage_PendingChangesInfoCLI); Write(Strings.DatabaseErrorPage_PendingChangesInfoCLI);
#line default #line default
#line hidden #line hidden
WriteLiteral("</p>\r\n <code>"); WriteLiteral("</p>\r\n <code>");
#line 206 "DatabaseErrorPage.cshtml" #line 204 "DatabaseErrorPage.cshtml"
Write(Strings.DatabaseErrorPage_AddMigrationCommandCLI); Write(Strings.DatabaseErrorPage_AddMigrationCommandCLI);
#line default #line default
#line hidden #line hidden
WriteLiteral("</code>\r\n <br />\r\n <code>"); WriteLiteral("</code>\r\n <br />\r\n <code>");
#line 208 "DatabaseErrorPage.cshtml" #line 206 "DatabaseErrorPage.cshtml"
Write(Strings.DatabaseErrorPage_ApplyMigrationsCommandCLI); Write(Strings.DatabaseErrorPage_ApplyMigrationsCommandCLI);
#line default #line default
#line hidden #line hidden
WriteLiteral("</code>\r\n <hr />\r\n </div>\r\n"); WriteLiteral("</code>\r\n <hr />\r\n </div>\r\n");
#line 211 "DatabaseErrorPage.cshtml" #line 209 "DatabaseErrorPage.cshtml"
} }
#line default #line default

View File

@ -97,8 +97,6 @@
var formBody = "context=@JavaScriptEncode(UrlEncode(Model.ContextType.AssemblyQualifiedName))"; var formBody = "context=@JavaScriptEncode(UrlEncode(Model.ContextType.AssemblyQualifiedName))";
req.open("POST", "@JavaScriptEncode(Model.Options.MigrationsEndPointPath.Value)", true); req.open("POST", "@JavaScriptEncode(Model.Options.MigrationsEndPointPath.Value)", true);
req.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
req.setRequestHeader("Content-length", formBody.length);
req.setRequestHeader("Connection", "close");
req.send(formBody); req.send(formBody);
} }