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

Use HasFlag in ForwardedheadersMiddleware (#24660)

This commit is contained in:
Kahbazi 2020-08-08 07:06:19 +04:30 committed by GitHub
parent 407b623cdf
commit d0a8117ac4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs
View File

@ -152,14 +152,14 @@ namespace Microsoft.AspNetCore.HttpOverrides
var request = context.Request; var request = context.Request;
var requestHeaders = context.Request.Headers; var requestHeaders = context.Request.Headers;
if ((_options.ForwardedHeaders & ForwardedHeaders.XForwardedFor) == ForwardedHeaders.XForwardedFor) if (_options.ForwardedHeaders.HasFlag(ForwardedHeaders.XForwardedFor))
{ {
checkFor = true; checkFor = true;
forwardedFor = requestHeaders.GetCommaSeparatedValues(_options.ForwardedForHeaderName); forwardedFor = requestHeaders.GetCommaSeparatedValues(_options.ForwardedForHeaderName);
entryCount = Math.Max(forwardedFor.Length, entryCount); entryCount = Math.Max(forwardedFor.Length, entryCount);
} }
if ((_options.ForwardedHeaders & ForwardedHeaders.XForwardedProto) == ForwardedHeaders.XForwardedProto) if (_options.ForwardedHeaders.HasFlag(ForwardedHeaders.XForwardedProto))
{ {
checkProto = true; checkProto = true;
forwardedProto = requestHeaders.GetCommaSeparatedValues(_options.ForwardedProtoHeaderName); forwardedProto = requestHeaders.GetCommaSeparatedValues(_options.ForwardedProtoHeaderName);
@ -171,7 +171,7 @@ namespace Microsoft.AspNetCore.HttpOverrides
entryCount = Math.Max(forwardedProto.Length, entryCount); entryCount = Math.Max(forwardedProto.Length, entryCount);
} }
if ((_options.ForwardedHeaders & ForwardedHeaders.XForwardedHost) == ForwardedHeaders.XForwardedHost) if (_options.ForwardedHeaders.HasFlag(ForwardedHeaders.XForwardedHost))
{ {
checkHost = true; checkHost = true;
forwardedHost = requestHeaders.GetCommaSeparatedValues(_options.ForwardedHostHeaderName); forwardedHost = requestHeaders.GetCommaSeparatedValues(_options.ForwardedHostHeaderName);