Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source 
Closes gh-27466
This commit is contained in:
Brian Clozel
2021-11-25 22:03:11 +01:00
parent 6605953eb5
commit e66095b1a2
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
View File

@@ -170,21 +170,18 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
public ForwardedHeaderRemovingRequest(HttpServletRequest request) {
super(request);
this.headerNames = headerNames(request);
}
private static Set<String> headerNames(HttpServletRequest request) {
final var headerNames = Collections.newSetFromMap(new LinkedCaseInsensitiveMap<>(Locale.ENGLISH));
final var names = request.getHeaderNames();
Set<String> headerNames = Collections.newSetFromMap(new LinkedCaseInsensitiveMap<>(Locale.ENGLISH));
Enumeration<String> names = request.getHeaderNames();
while (names.hasMoreElements()) {
final var name = names.nextElement();
headerNames.add(name);
String name = names.nextElement();
if (!FORWARDED_HEADER_NAMES.contains(name)) {
headerNames.add(name);
}
}
headerNames.removeAll(FORWARDED_HEADER_NAMES);
return Collections.unmodifiableSet(headerNames);
}
@@ -196,7 +193,6 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
if (FORWARDED_HEADER_NAMES.contains(name)) {
return null;
}
return super.getHeader(name);
}
@@ -205,7 +201,6 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
if (FORWARDED_HEADER_NAMES.contains(name)) {
return Collections.emptyEnumeration();
}
return super.getHeaders(name);
}