fix issue Firefox websocket upgrade request robaho#12

robaho · robaho · commit ab5d60a999e1 · 2024-12-11T14:22:49.000-06:00
diff --git a/src/main/java/robaho/net/httpserver/Utils.java b/src/main/java/robaho/net/httpserver/Utils.java
@@ -22,7 +22,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package robaho.net.httpserver;
 
 /**
@@ -36,9 +35,9 @@ public class Utils {
     private static final boolean[] QUOTED_PAIR = new boolean[256];
 
     static {
-        char[] allowedTokenChars = ("!#$%&'*+-.^_`|~0123456789" +
-                "abcdefghijklmnopqrstuvwxyz" +
-                "ABCDEFGHIJKLMNOPQRSTUVWXYZ").toCharArray();
+        char[] allowedTokenChars = ("!#$%&'*+-.^_`|~0123456789"
+                + "abcdefghijklmnopqrstuvwxyz"
+                + "ABCDEFGHIJKLMNOPQRSTUVWXYZ").toCharArray();
         for (char c : allowedTokenChars) {
             TCHAR[c] = true;
         }
@@ -87,4 +86,32 @@ public static boolean isQuotedStringContent(String token) {
         }
         return true;
     }
+
+    /**
+     * efficient contains() ignoring case
+     */
+    public static boolean containsIgnoreCase(String src, String what) {
+        final int length = what.length();
+        if (length == 0) {
+            return true; // Empty string is contained
+        }
+        final char firstLo = Character.toLowerCase(what.charAt(0));
+        final char firstUp = Character.toUpperCase(what.charAt(0));
+
+        final int srcLength = src.length();
+
+        for (int i = srcLength - length; i >= 0; i--) {
+            // Quick check before calling the more expensive regionMatches() method:
+            final char ch = src.charAt(i);
+            if (ch != firstLo && ch != firstUp) {
+                continue;
+            }
+
+            if (src.regionMatches(true, i, what, 0, length)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/src/main/java/robaho/net/httpserver/websockets/WebSocketHandler.java b/src/main/java/robaho/net/httpserver/websockets/WebSocketHandler.java
@@ -8,6 +8,7 @@
 import com.sun.net.httpserver.HttpHandler;
 
 import robaho.net.httpserver.Code;
+import robaho.net.httpserver.Utils;
 
 public abstract class WebSocketHandler implements HttpHandler {
 
@@ -58,11 +59,9 @@ public void handle(HttpExchange exchange) throws IOException {
 
     public static boolean isWebsocketRequested(Headers headers) {
         // check if Upgrade connection
-        String connection = headers.getFirst(Util.HEADER_CONNECTION);
-        if (connection == null || !connection.equalsIgnoreCase(Util.HEADER_CONNECTION_VALUE)) {
-            return false;
-        }
-        // check for proper upgrade tyoe
+        var values = headers.get(Util.HEADER_CONNECTION);
+        if(values==null || values.stream().filter(s -> Utils.containsIgnoreCase(s, Util.HEADER_CONNECTION_VALUE)).findAny().isEmpty()) return false;
+        // check for proper upgrade type
         String upgrade = headers.getFirst(Util.HEADER_UPGRADE);
         return Util.HEADER_UPGRADE_VALUE.equalsIgnoreCase(upgrade);
     }
diff --git a/src/test/java/robaho/net/httpserver/StringUtilsTest.java b/src/test/java/robaho/net/httpserver/StringUtilsTest.java
@@ -0,0 +1,22 @@
+package robaho.net.httpserver;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
+
+public class StringUtilsTest {
+    @Test
+    public void TestContainsIgnoreCase() throws IOException {
+        assertTrue(Utils.containsIgnoreCase("Keep-alive","keep-alive"));
+        assertTrue(Utils.containsIgnoreCase("Keep-alive, upgrade","Upgrade"));
+        assertTrue(Utils.containsIgnoreCase("upgrade, keep-alive","Upgrade"));
+        assertTrue(Utils.containsIgnoreCase("upgrade, keep-alive","upgrade"));
+        assertFalse(Utils.containsIgnoreCase("Keep-alive, upgrde","Upgrade"));
+    }
+
+}
diff --git a/src/test/java/robaho/net/httpserver/websockets/WebSocketResponseHandlerTest.java b/src/test/java/robaho/net/httpserver/websockets/WebSocketResponseHandlerTest.java
@@ -155,6 +155,8 @@ private void testResponseHeader(String key, String expected) {
     public void testConnectionHeaderHandlesKeepAlive_FixingFirefoxConnectIssue() throws IOException {
         this.headers.set("connection", "keep-alive, Upgrade");
         handler.handle(exchange);
+        testResponseHeader(Util.HEADER_WEBSOCKET_ACCEPT, "HSmrc0sMlYUkAGmm5OPpG2HaGWk=");
+        testResponseHeader(Util.HEADER_WEBSOCKET_PROTOCOL, "chat");
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,8 @@ private void testResponseHeader(String key, String expected) {`
`155`	`155`	`public void testConnectionHeaderHandlesKeepAlive_FixingFirefoxConnectIssue() throws IOException {`
`156`	`156`	`this.headers.set("connection", "keep-alive, Upgrade");`
`157`	`157`	`handler.handle(exchange);`
	`158`	`+ testResponseHeader(Util.HEADER_WEBSOCKET_ACCEPT, "HSmrc0sMlYUkAGmm5OPpG2HaGWk=");`
	`159`	`+ testResponseHeader(Util.HEADER_WEBSOCKET_PROTOCOL, "chat");`
`158`	`160`	`}`
`159`	`161`
`160`	`162`	`@Test`