Improve logging of DefaultCorsProcessor for rejected headers

Issue: SPR-15708
spring-projects · Jul 3, 2017 · 9901c38 · 9901c38
1 parent 1fa8410
commit 9901c38
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java b/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java
@@ -119,14 +119,24 @@ protected boolean handleInternal(ServerHttpRequest request, ServerHttpResponse r
 
 		String requestOrigin = request.getHeaders().getOrigin();
 		String allowOrigin = checkOrigin(config, requestOrigin);
+		if (allowOrigin == null) {
+			logger.debug("Rejecting CORS request because '" + requestOrigin + "' origin is not allowed");
+			rejectRequest(response);
+			return false;
+		}
 
 		HttpMethod requestMethod = getMethodToUse(request, preFlightRequest);
 		List<HttpMethod> allowMethods = checkMethods(config, requestMethod);
+		if (allowMethods == null) {
+			logger.debug("Rejecting CORS request because '" + requestMethod + "' request method is not allowed");
+			rejectRequest(response);
+			return false;
+		}
 
 		List<String> requestHeaders = getHeadersToUse(request, preFlightRequest);
 		List<String> allowHeaders = checkHeaders(config, requestHeaders);
-
-		if (allowOrigin == null || allowMethods == null || (preFlightRequest && allowHeaders == null)) {
+		if (preFlightRequest && allowHeaders == null) {
+			logger.debug("Rejecting CORS request because '" + requestHeaders + "' request headers are not allowed");
 			rejectRequest(response);
 			return false;
 		}

diff --git a/spring-web/src/main/java/org/springframework/web/cors/reactive/DefaultCorsProcessor.java b/spring-web/src/main/java/org/springframework/web/cors/reactive/DefaultCorsProcessor.java
@@ -108,14 +108,24 @@ protected boolean handleInternal(ServerWebExchange exchange,
 
 		String requestOrigin = request.getHeaders().getOrigin();
 		String allowOrigin = checkOrigin(config, requestOrigin);
+		if (allowOrigin == null) {
+			logger.debug("Rejecting CORS request because '" + requestOrigin + "' origin is not allowed");
+			rejectRequest(response);
+			return false;
+		}
 
 		HttpMethod requestMethod = getMethodToUse(request, preFlightRequest);
 		List<HttpMethod> allowMethods = checkMethods(config, requestMethod);
+		if (allowMethods == null) {
+			logger.debug("Rejecting CORS request because '" + requestMethod + "' request method is not allowed");
+			rejectRequest(response);
+			return false;
+		}
 
 		List<String> requestHeaders = getHeadersToUse(request, preFlightRequest);
 		List<String> allowHeaders = checkHeaders(config, requestHeaders);
-
-		if (allowOrigin == null || allowMethods == null || (preFlightRequest && allowHeaders == null)) {
+		if (preFlightRequest && allowHeaders == null) {
+			logger.debug("Rejecting CORS request because '" + requestHeaders + "' request headers are not allowed");
 			rejectRequest(response);
 			return false;
 		}