refactor: simplify conditions in the CORS preflight validation

micronaut-projects · Nov 24, 2024 · 4d8101b · 4d8101b
1 parent 7bb04d7
commit 4d8101b
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/http-server/src/main/java/io/micronaut/http/server/cors/CorsFilter.java b/http-server/src/main/java/io/micronaut/http/server/cors/CorsFilter.java
@@ -495,16 +495,9 @@ private MutableHttpResponse<?> handlePreflightRequest(@NonNull HttpRequest<?> re
     @Nullable
     private boolean validatePreflightRequest(@NonNull HttpRequest<?> request,
                                              @NonNull CorsOriginConfiguration config) {
-        Optional<HttpMethod> methodToMatchOptional = validateMethodToMatch(request, config);
-        if (methodToMatchOptional.isEmpty()) {
-            return false;
-        }
-
-        if (!CorsUtil.isPreflightRequest(request)) {
-            return false;
-        }
-
-        if (!hasAllowedHeaders(request, config)) {
+        if (validateMethodToMatch(request, config).isEmpty() ||
+            !CorsUtil.isPreflightRequest(request) ||
+            !hasAllowedHeaders(request, config)) {
             return false;
         }