Generate accept header again on repeated use

kelunik · kelunik · commit 9657af69f90d · 2017-12-17T17:00:14.000+01:00
diff --git a/lib/Handshake.php b/lib/Handshake.php
@@ -67,9 +67,9 @@ public function generateRequest(): string {
             }
         }
 
-        if ($this->accept === null) {
-            $this->accept = \base64_encode(\random_bytes(self::ACCEPT_NONCE_LENGTH));
-        }
+        // This has to be generated for each connect attempt, once a new request has been generated,
+        // we use the new key for validation.
+        $this->accept = \base64_encode(\random_bytes(self::ACCEPT_NONCE_LENGTH));
 
         return 'GET ' . $this->path . " HTTP/1.1\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-Websocket-Version: 13\r\nSec-Websocket-Key: {$this->accept}\r\n$headers\r\n";
     }

Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,9 @@ public function generateRequest(): string {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`- if ($this->accept === null) {`
`71`		`- $this->accept = \base64_encode(\random_bytes(self::ACCEPT_NONCE_LENGTH));`
`72`		`- }`
	`70`	`+ // This has to be generated for each connect attempt, once a new request has been generated,`
	`71`	`+ // we use the new key for validation.`
	`72`	`+ $this->accept = \base64_encode(\random_bytes(self::ACCEPT_NONCE_LENGTH));`
`73`	`73`
`74`	`74`	`return 'GET ' . $this->path . " HTTP/1.1\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-Websocket-Version: 13\r\nSec-Websocket-Key: {$this->accept}\r\n$headers\r\n";`
`75`	`75`	`}`