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

Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2018-08-20 08:39:26 -07:00
parent 0927e0cab3 e85c36fa8c
commit 4460961d34
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
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(
LogLevel.Information,
4,
"Policy execution successful.");
"CORS policy execution successful.");
_policyFailure = LoggerMessage.Define(
LogLevel.Information,
5,
"Policy execution failed.");
"CORS policy execution failed.");
_originNotAllowed = LoggerMessage.Define<string>(
LogLevel.Information,

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

@ -261,7 +261,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
Method = "PUT",
Headers = null,
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."
}
},
@ -271,7 +271,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
Method = "DELETE",
Headers = null,
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."
}
},
@ -281,7 +281,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
Method = "PUT",
Headers = new[] { "test" },
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."
}
},
@ -330,7 +330,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
var writeList = sink.Writes.ToList();
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("Policy execution successful.", writeList[2].State.ToString());
Assert.Equal("CORS policy execution successful.", writeList[2].State.ToString());
}
[Fact]
@ -369,7 +369,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
var writeList = sink.Writes.ToList();
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());
}
@ -389,7 +389,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
var writeList = sink.Writes.ToList();
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]