faeez/mxmbsocket
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Repo. Project Releases Wiki Activity

[Refactor] Fixing stuff for Chris

Browse Source 
Fixing sub protocol agreement between server and client
This commit is contained in:
Mike Almond 2012-02-07 17:14:52 -05:00
parent 8a2b9153ab
commit c6a801f1ef
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Ratchet/Component/WebSocket/Version/Hixie76.php
View File

@ -23,23 +23,18 @@ class Hixie76 implements VersionInterface {
/** /**
* @param string * @param string
* @return string * @return string
* @todo Unhack this mess...or wait for Hixie to die (HURRY UP APPLE)
*/ */
public function handshake(RequestInterface $request) { public function handshake(RequestInterface $request) {
$body = $this->sign($request->getHeader('Sec-WebSocket-Key1'), $request->getHeader('Sec-WebSocket-Key2'), $request->getBody()); $body = $this->sign($request->getHeader('Sec-WebSocket-Key1'), $request->getHeader('Sec-WebSocket-Key2'), $request->getBody());
$headers = array( $headers = array(
'Upgrade' => 'WebSocket' 'Upgrade' => 'WebSocket'
, 'Connection' => 'Upgrade' , 'Connection' => 'Upgrade'
, 'Sec-WebSocket-Origin' => $request->getHeader('Origin') , 'Sec-WebSocket-Origin' => $request->getHeader('Origin')
, 'Sec-WebSocket-Location' => 'ws://' . $request->getHeader('Host') . $request->getPath() , 'Sec-WebSocket-Location' => 'ws://' . $request->getHeader('Host') . $request->getPath()
); );
if ($request->getHeader('Sec-WebSocket-Protocol')) {
$headers['Sec-WebSocket-Protocol'] = $request->getHeader('Sec-WebSocket-Protocol'); return new \Guzzle\Http\Message\Response('101', $headers, $body);
}
$response = new \Guzzle\Http\Message\Response('101', $headers, $body);
return $response;
} }
public function newMessage() { public function newMessage() {
@ -55,18 +50,18 @@ class Hixie76 implements VersionInterface {
} }
public function generateKeyNumber($key) { public function generateKeyNumber($key) {
if (substr_count($key, ' ') == 0) { if (substr_count($key, ' ') == 0) {
return ''; return '';
} }
$int = preg_replace('[\D]', '', $key) / substr_count($key, ' '); $int = preg_replace('[\D]', '', $key) / substr_count($key, ' ');
return (is_int($int)) ? $int : ''; return (is_int($int)) ? $int : '';
} }
protected function sign($key1, $key2, $code) { protected function sign($key1, $key2, $code) {
return md5( return md5(
pack('N', $this->generateKeyNumber($key1)) pack('N', $this->generateKeyNumber($key1))
. pack('N', $this->generateKeyNumber($key2)) . pack('N', $this->generateKeyNumber($key2))

19
src/Ratchet/Component/WebSocket/WebSocketComponent.php
View File

@ -79,6 +79,25 @@ class WebSocketComponent implements MessageComponentInterface {
$response = $from->WebSocket->version->handshake($from->WebSocket->headers); $response = $from->WebSocket->version->handshake($from->WebSocket->headers);
$from->WebSocket->handshake = true; $from->WebSocket->handshake = true;
// This block is to be moved/changed later
$agreed_protocols = array();
$requested_protocols = $from->WebSocket->headers->getTokenizedHeader('Sec-WebSocket-Protocol', ',');
foreach ($this->accepted_subprotocols as $sub_protocol) {
if (false !== $requested_protocols->hasValue($sub_protocol)) {
$agreed_protocols[] = $sub_protocol;
}
}
if (count($agreed_protocols) > 0) {
// $response['Sec-WebSocket-Protocol'] = implode(',', $agreed_protocols);
$response->setHeader('Sec-WebSocket-Protocol', implode(',', $agreed_protocols));
}
$header = (string)$response; $header = (string)$response;
$comp = $this->_factory->newComposite(); $comp = $this->_factory->newComposite();