Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce numbers of allocations in CORS filter #27199

Merged
merged 1 commit into from
Aug 17, 2022
Merged

Reduce numbers of allocations in CORS filter #27199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 44 additions & 17 deletions ...sions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import java.util.Objects;
import java.util.Optional;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import io.vertx.core.Handler;
import io.vertx.core.http.HttpHeaders;
Expand All @@ -24,10 +23,24 @@ public class CORSFilter implements Handler<RoutingContext> {
final CORSConfig corsConfig;

final List<Pattern> allowedOriginsRegex;
private final List<HttpMethod> configuredHttpMethods;

public CORSFilter(CORSConfig corsConfig) {
this.corsConfig = corsConfig;
this.allowedOriginsRegex = parseAllowedOriginsRegex(this.corsConfig.origins);
configuredHttpMethods = createConfiguredHttpMethods(this.corsConfig.methods);
}

private List<HttpMethod> createConfiguredHttpMethods(Optional<List<String>> methods) {
if (methods.isEmpty()) {
return Collections.emptyList();
}
List<String> corsConfigMethods = methods.get();
List<HttpMethod> result = new ArrayList<>(corsConfigMethods.size());
for (String value : corsConfigMethods) {
result.add(HttpMethod.valueOf(value));
}
return result;
}

public static boolean isConfiguredWithWildcard(Optional<List<String>> optionalList) {
Expand Down Expand Up @@ -85,20 +98,29 @@ private void processRequestedHeaders(HttpServerResponse response, String allowHe
if (isConfiguredWithWildcard(corsConfig.headers)) {
response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, allowHeadersValue);
} else {
List<String> requestedHeaders = new ArrayList<>();
for (String requestedHeader : COMMA_SEPARATED_SPLIT_REGEX.split(allowHeadersValue)) {
List<String> requestedHeaders;
String[] allowedParts = COMMA_SEPARATED_SPLIT_REGEX.split(allowHeadersValue);
requestedHeaders = new ArrayList<>(allowedParts.length);
for (String requestedHeader : allowedParts) {
requestedHeaders.add(requestedHeader.toLowerCase());
}

List<String> validRequestedHeaders = new ArrayList<>();
for (String configHeader : corsConfig.headers.get()) {
List<String> corsConfigHeaders = corsConfig.headers.get();
StringBuilder allowedHeaders = new StringBuilder();
boolean isFirst = true;
for (String configHeader : corsConfigHeaders) {
if (requestedHeaders.contains(configHeader.toLowerCase())) {
validRequestedHeaders.add(configHeader);
if (isFirst) {
isFirst = false;
} else {
allowedHeaders.append(',');
}
allowedHeaders.append(configHeader);
}
}

if (!validRequestedHeaders.isEmpty()) {
response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, String.join(",", validRequestedHeaders));
if (allowedHeaders.length() != 0) {
response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, allowedHeaders.toString());
}
}
}
Expand All @@ -107,22 +129,27 @@ private void processMethods(HttpServerResponse response, String allowMethodsValu
if (isConfiguredWithWildcard(corsConfig.methods)) {
response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, allowMethodsValue);
} else {
List<String> requestedMethods = new ArrayList<>();
for (String requestedMethod : COMMA_SEPARATED_SPLIT_REGEX.split(allowMethodsValue)) {
String[] allowedMethodsParts = COMMA_SEPARATED_SPLIT_REGEX.split(allowMethodsValue);
List<String> requestedMethods = new ArrayList<>(allowedMethodsParts.length);
for (String requestedMethod : allowedMethodsParts) {
requestedMethods.add(requestedMethod.toLowerCase());
}

List<String> validRequestedMethods = new ArrayList<>();
List<HttpMethod> methods = corsConfig.methods.get().stream().map(HttpMethod::valueOf)
.collect(Collectors.toList());
for (HttpMethod configMethod : methods) {
StringBuilder allowMethods = new StringBuilder();
boolean isFirst = true;
for (HttpMethod configMethod : configuredHttpMethods) {
if (requestedMethods.contains(configMethod.name().toLowerCase())) {
validRequestedMethods.add(configMethod.name());
if (isFirst) {
isFirst = false;
} else {
allowMethods.append(',');
}
allowMethods.append(configMethod.name());
}
}

if (!validRequestedMethods.isEmpty()) {
response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, String.join(",", validRequestedMethods));
if (allowMethods.length() != 0) {
response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, allowMethods.toString());
}
}
}
Expand Down