Merge pull request #154 from Textalk/v1.5-master

Sören Jensen · web-flow · commit 1712325e99b6 · 2022-03-29T11:46:59.000+02:00
Fix; allow header block larger than 1024 bytes
diff --git a/lib/Client.php b/lib/Client.php
@@ -177,7 +177,11 @@ function ($key, $value) {
             $this->write($header);
 
             // Get server response header (terminated with double CR+LF).
-            $response = stream_get_line($this->socket, 1024, "\r\n\r\n");
+            $response = '';
+            do {
+                $buffer = fgets($this->socket, 1024);
+                $response .= $buffer;
+            } while (substr_count($response, "\r\n\r\n") == 0);
 
             // Validate response.
             if (!preg_match('#Sec-WebSocket-Accept:\s(.*)$#mUi', $response, $matches)) {
diff --git a/tests/mock/mock-socket.php b/tests/mock/mock-socket.php
@@ -56,6 +56,11 @@ function fread()
     $args = func_get_args();
     return MockSocket::handle('fread', $args);
 }
+function fgets()
+{
+    $args = func_get_args();
+    return MockSocket::handle('fgets', $args);
+}
 function stream_context_create()
 {
     $args = func_get_args();
diff --git a/tests/scripts/client.connect-authed.json b/tests/scripts/client.connect-authed.json
@@ -40,14 +40,13 @@
         "return": 248
     },
     {
-        "function": "stream_get_line",
+        "function": "fgets",
         "params": [
             "@mock-stream",
-            1024,
-            "\r\n\r\n"
+            1024
         ],
         "return-op": "key-respond",
-        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}"
+        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}\r\n\r\n"
     },
     {
         "function": "fwrite",
diff --git a/tests/scripts/client.connect-context.json b/tests/scripts/client.connect-context.json
@@ -40,14 +40,13 @@
         "return": 199
     },
     {
-        "function": "stream_get_line",
+        "function": "fgets",
         "params": [
             "@mock-stream",
-            1024,
-            "\r\n\r\n"
+            1024
         ],
         "return-op": "key-respond",
-        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}"
+        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}\r\n\r\n"
     },
     {
         "function": "fwrite",
diff --git a/tests/scripts/client.connect-extended.json b/tests/scripts/client.connect-extended.json
@@ -40,14 +40,13 @@
         "return": 224
     },
     {
-        "function": "stream_get_line",
+        "function": "fgets",
         "params": [
             "@mock-stream",
-            1024,
-            "\r\n\r\n"
+            1024
         ],
         "return-op": "key-respond",
-        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}"
+        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}\r\n\r\n"
     },
     {
         "function": "fwrite",
diff --git a/tests/scripts/client.connect-headers.json b/tests/scripts/client.connect-headers.json
@@ -40,14 +40,22 @@
         "return": 255
     },
     {
-        "function": "stream_get_line",
+        "function": "fgets",
         "params": [
             "@mock-stream",
-            1024,
-            "\r\n\r\n"
+            1024
         ],
         "return-op": "key-respond",
-        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}"
+        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}\r\nX-Very-Long_Header: This is added to provoke split reads of headers in client 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456\r\n"
+    },
+    {
+        "function": "fgets",
+        "params": [
+            "@mock-stream",
+            1024
+        ],
+        "return-op": "key-respond",
+        "return": "Next234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\r\n\r\n"
     },
     {
         "function": "fwrite",
diff --git a/tests/scripts/client.connect-invalid-key.json b/tests/scripts/client.connect-invalid-key.json
@@ -39,12 +39,11 @@
         "return": 199
     },
     {
-        "function": "stream_get_line",
+        "function": "fgets",
         "params": [
             "@mock-stream",
-            1024,
-            "\r\n\r\n"
+            1024
         ],
-        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: BAD"
+        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: BAD\r\n\r\n"
     }
 ]
diff --git a/tests/scripts/client.connect-invalid-upgrade.json b/tests/scripts/client.connect-invalid-upgrade.json
@@ -39,12 +39,11 @@
         "return": 199
     },
     {
-        "function": "stream_get_line",
+        "function": "fgets",
         "params": [
             "@mock-stream",
-            1024,
-            "\r\n\r\n"
+            1024
         ],
-        "return": "Invalid upgrade response"
+        "return": "Invalid upgrade response\r\n\r\n"
     }
 ]
diff --git a/tests/scripts/client.connect-persistent.json b/tests/scripts/client.connect-persistent.json
@@ -54,14 +54,13 @@
         "return": 248
     },
     {
-        "function": "stream_get_line",
+        "function": "fgets",
         "params": [
             "@mock-stream",
-            1024,
-            "\r\n\r\n"
+            1024
         ],
         "return-op": "key-respond",
-        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}"
+        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}\r\n\r\n"
     },
     {
         "function": "fwrite",
diff --git a/tests/scripts/client.connect-timeout.json b/tests/scripts/client.connect-timeout.json
@@ -40,14 +40,13 @@
         "return": 199
     },
     {
-        "function": "stream_get_line",
+        "function": "fgets",
         "params": [
             "@mock-stream",
-            1024,
-            "\r\n\r\n"
+            1024
         ],
         "return-op": "key-respond",
-        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}"
+        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}\r\n\r\n"
     },
     {
         "function": "fwrite",
diff --git a/tests/scripts/client.connect.json b/tests/scripts/client.connect.json
@@ -40,14 +40,13 @@
         "return": 199
     },
     {
-        "function": "stream_get_line",
+        "function": "fgets",
         "params": [
             "@mock-stream",
-            1024,
-            "\r\n\r\n"
+            1024
         ],
         "return-op": "key-respond",
-        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}"
+        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}\r\n\r\n"
     },
     {
         "function": "fwrite",
diff --git a/tests/scripts/client.reconnect.json b/tests/scripts/client.reconnect.json
@@ -54,14 +54,13 @@
         "return": 199
     },
     {
-        "function": "stream_get_line",
+        "function": "fgets",
         "params": [
             "@mock-stream",
-            1024,
-            "\r\n\r\n"
+            1024
         ],
         "return-op": "key-respond",
-        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}"
+        "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {key}\r\n\r\n"
     },
     {
         "function": "fread",

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,11 @@ function fread()`
`56`	`56`	`$args = func_get_args();`
`57`	`57`	`return MockSocket::handle('fread', $args);`
`58`	`58`	`}`
	`59`	`+function fgets()`
	`60`	`+{`
	`61`	`+ $args = func_get_args();`
	`62`	`+ return MockSocket::handle('fgets', $args);`
	`63`	`+}`
`59`	`64`	`function stream_context_create()`
`60`	`65`	`{`
`61`	`66`	`$args = func_get_args();`
Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,11 @@`
`39`	`39`	`"return": 199`
`40`	`40`	`},`
`41`	`41`	`{`
`42`		`- "function": "stream_get_line",`
	`42`	`+ "function": "fgets",`
`43`	`43`	`"params": [`
`44`	`44`	`"@mock-stream",`
`45`		`- 1024,`
`46`		`- "\r\n\r\n"`
	`45`	`+ 1024`
`47`	`46`	`],`
`48`		`- "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: BAD"`
	`47`	`+ "return": "HTTP\/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: BAD\r\n\r\n"`
`49`	`48`	`}`
`50`	`49`	`]`