Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · Jan 11, 2024 · ea5db96 · ea5db96
1 parent d735933
commit ea5db96
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/...-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/CrossOriginHandler.java b/...-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/CrossOriginHandler.java
@@ -385,13 +385,10 @@ public boolean handle(Request request, Response response, Callback callback) thr
                 }
                 else
                 {
-                    if (isWebSocketUpgrade(request))
+                    if (isWebSocketUpgrade(request) && !isDeliverNonAllowedOriginWebSocketUpgradeRequests())
                     {
-                        if (!isDeliverNonAllowedOriginWebSocketUpgradeRequests())
-                        {
-                            Response.writeError(request, response, callback, HttpStatus.BAD_REQUEST_400, "origin not allowed");
-                            return true;
-                        }
+                        Response.writeError(request, response, callback, HttpStatus.BAD_REQUEST_400, "origin not allowed");
+                        return true;
                     }
                 }
 
@@ -449,7 +446,7 @@ private boolean isPreflight(Request request)
 
     private boolean isWebSocketUpgrade(Request request)
     {
-        return request.getHeaders().contains(HttpHeader.UPGRADE, "websocket");
+        return request.getHeaders().contains(HttpHeader.SEC_WEBSOCKET_VERSION, "13");
     }
 
     private void handlePreflightResponse(String origins, Response response)