huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clarify CORS policy result log messages (#177) 

Fixes https://github.com/aspnet/Home/issues/3419
This commit is contained in:
Christer van der Meeren 2018-08-20 17:25:45 +02:00 committed by Nate McMaster
parent 49a17c072a
commit e85c36fa8c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Cors/Internal/CORSLoggerExtensions.cs
View File

@ -38,12 +38,12 @@ namespace Microsoft.AspNetCore.Cors.Internal
_policySuccess = LoggerMessage.Define( _policySuccess = LoggerMessage.Define(
LogLevel.Information, LogLevel.Information,
4, 4,
"Policy execution successful."); "CORS policy execution successful.");
_policyFailure = LoggerMessage.Define( _policyFailure = LoggerMessage.Define(
LogLevel.Information, LogLevel.Information,
5, 5,
"Policy execution failed."); "CORS policy execution failed.");
_originNotAllowed = LoggerMessage.Define<string>( _originNotAllowed = LoggerMessage.Define<string>(
LogLevel.Information, LogLevel.Information,

12
test/Microsoft.AspNetCore.Cors.Test/CorsServiceTests.cs
View File

@ -261,7 +261,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
Method = "PUT", Method = "PUT",
Headers = null, Headers = null,
OriginLogMessage = "The request has an origin header: 'http://example.com'.", OriginLogMessage = "The request has an origin header: 'http://example.com'.",
PolicyLogMessage = "Policy execution failed.", PolicyLogMessage = "CORS policy execution failed.",
FailureReason = "Request origin http://example.com does not have permission to access the resource." FailureReason = "Request origin http://example.com does not have permission to access the resource."
} }
}, },
@ -271,7 +271,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
Method = "DELETE", Method = "DELETE",
Headers = null, Headers = null,
OriginLogMessage = "The request has an origin header: 'http://allowed.example.com'.", OriginLogMessage = "The request has an origin header: 'http://allowed.example.com'.",
PolicyLogMessage = "Policy execution failed.", PolicyLogMessage = "CORS policy execution failed.",
FailureReason = "Request method DELETE not allowed in CORS policy." FailureReason = "Request method DELETE not allowed in CORS policy."
} }
}, },
@ -281,7 +281,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
Method = "PUT", Method = "PUT",
Headers = new[] { "test" }, Headers = new[] { "test" },
OriginLogMessage = "The request has an origin header: 'http://allowed.example.com'.", OriginLogMessage = "The request has an origin header: 'http://allowed.example.com'.",
PolicyLogMessage = "Policy execution failed.", PolicyLogMessage = "CORS policy execution failed.",
FailureReason = "Request header 'test' not allowed in CORS policy." FailureReason = "Request header 'test' not allowed in CORS policy."
} }
}, },
@ -330,7 +330,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
var writeList = sink.Writes.ToList(); var writeList = sink.Writes.ToList();
Assert.Equal("The request is a preflight request.", writeList[0].State.ToString()); Assert.Equal("The request is a preflight request.", writeList[0].State.ToString());
Assert.Equal("The request has an origin header: 'http://allowed.example.com'.", writeList[1].State.ToString()); Assert.Equal("The request has an origin header: 'http://allowed.example.com'.", writeList[1].State.ToString());
Assert.Equal("Policy execution successful.", writeList[2].State.ToString()); Assert.Equal("CORS policy execution successful.", writeList[2].State.ToString());
} }
[Fact] [Fact]
@ -369,7 +369,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
var writeList = sink.Writes.ToList(); var writeList = sink.Writes.ToList();
Assert.Equal("The request has an origin header: 'http://example.com'.", writeList[0].State.ToString()); Assert.Equal("The request has an origin header: 'http://example.com'.", writeList[0].State.ToString());
Assert.Equal("Policy execution failed.", writeList[1].State.ToString()); Assert.Equal("CORS policy execution failed.", writeList[1].State.ToString());
Assert.Equal("Request origin http://example.com does not have permission to access the resource.", writeList[2].State.ToString()); Assert.Equal("Request origin http://example.com does not have permission to access the resource.", writeList[2].State.ToString());
} }
@ -389,7 +389,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
var writeList = sink.Writes.ToList(); var writeList = sink.Writes.ToList();
Assert.Equal("The request has an origin header: 'http://allowed.example.com'.", writeList[0].State.ToString()); Assert.Equal("The request has an origin header: 'http://allowed.example.com'.", writeList[0].State.ToString());
Assert.Equal("Policy execution successful.", writeList[1].State.ToString()); Assert.Equal("CORS policy execution successful.", writeList[1].State.ToString());
} }
[Fact] [Fact]