Check websocket upgrade headers case independently (#105)

toitlang · Jul 21, 2023 · aabac63 · aabac63
1 parent ab3ce15
commit aabac63
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/web_socket.toit b/src/web_socket.toit
@@ -245,7 +245,7 @@ class WebSocket:
     // The WebSocket nonce is not very important and does not need to be
     // cryptographically random.
     nonce := base64.encode (ByteArray 16: random 0x100)
-    headers.add "Connection" "upgrade"
+    headers.add "Connection" "Upgrade"
     headers.add "Upgrade" "websocket"
     headers.add "Sec-WebSocket-Key" nonce
     headers.add "Sec-WebSocket-Version" "13"
@@ -278,14 +278,15 @@ class WebSocket:
     version_header := request.headers.single "Sec-WebSocket-Version"
     nonce := request.headers.single "Sec-WebSocket-Key"
     message := null
-    if nonce == null:                       message = "No nonce"
-    else if nonce.size != 24:               message = "Bad nonce size"
-    else if connection_header != "upgrade": message = "No Connection: upgrade"
-    else if upgrade_header != "websocket":  message = "No Upgrade: websocket"
-    else if version_header != "13":         message = "Unrecognized Websocket version"
+    if nonce == null:                                                  message = "No nonce"
+    else if nonce.size != 24:                                          message = "Bad nonce size"
+    else if not connection_header or not upgrade_header:               message = "No upgrade headers"
+    else if (Headers.ascii_normalize_ connection_header) != "Upgrade": message = "No Connection: Upgrade"
+    else if (Headers.ascii_normalize_ upgrade_header) != "Websocket":  message = "No Upgrade: websocket"
+    else if version_header != "13":                                    message = "Unrecognized Websocket version"
     else:
       response_writer.headers.add "Sec-WebSocket-Accept" (response_ nonce)
-      response_writer.headers.add "Connection" "upgrade"
+      response_writer.headers.add "Connection" "Upgrade"
       response_writer.headers.add "Upgrade" "websocket"
       return nonce
     response_writer.write_headers STATUS_BAD_REQUEST --message=message

diff --git a/tests/google_test.toit b/tests/google_test.toit
@@ -12,8 +12,7 @@ main:
   security_store := http.SecurityStoreInMemory
   client := http.Client.tls network
     --security_store=security_store
-    --root_certificates=[certificate_roots.GLOBALSIGN_ROOT_CA,
-                         certificate_roots.GTS_ROOT_R1]
+    --root_certificates=[certificate_roots.GTS_ROOT_R1]
   response := client.get "script.google.com" "/"
   while data := response.body.read:
   response = client.get "www.google.com" "/"