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

[WebSocket] Refactored Frame masking/payload

Browse Source
This commit is contained in:
Chris Boden 2012-06-03 12:14:53 -04:00
parent 3a530c8c24
commit b27c9700f4
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Ratchet/WebSocket/Version/RFC6455/Frame.php
View File

@ -187,7 +187,7 @@ class Frame implements FrameInterface {
$this->data = substr_replace($this->data, $maskingKey, $this->getNumPayloadBytes() + 1, 0); $this->data = substr_replace($this->data, $maskingKey, $this->getNumPayloadBytes() + 1, 0);
$this->_bytes_rec += static::MASK_LENGTH; $this->_bytes_rec += static::MASK_LENGTH;
$this->data = substr_replace($this->data, $this->applyMaskToPayload($maskingKey), $this->getPayloadStartingByte(), $this->getPayloadLength()); $this->data = substr_replace($this->data, $this->applyMask($maskingKey), $this->getPayloadStartingByte(), $this->getPayloadLength());
return $this; return $this;
} }
@ -210,22 +210,23 @@ class Frame implements FrameInterface {
$this->data = substr_replace($this->data, '', $this->getNumPayloadBytes() + 1, static::MASK_LENGTH); $this->data = substr_replace($this->data, '', $this->getNumPayloadBytes() + 1, static::MASK_LENGTH);
$this->_bytes_rec -= static::MASK_LENGTH; $this->_bytes_rec -= static::MASK_LENGTH;
$this->data = substr_replace($this->data, $this->applyMaskToPayload($maskingKey), $this->getPayloadStartingByte(), $this->getPayloadLength()); $this->data = substr_replace($this->data, $this->applyMask($maskingKey), $this->getPayloadStartingByte(), $this->getPayloadLength());
return $this; return $this;
} }
protected function applyMaskToPayload($maskingKey) { protected function applyMask($maskingKey, $payload = null) {
if (!$this->isCoalesced()) { if (null === $payload) {
throw new \UnderflowException('Frame must be coalesced to apply a mask'); if (!$this->isCoalesced()) {
throw new \UnderflowException('Frame must be coalesced to apply a mask');
}
$payload = substr($this->data, $this->getPayloadStartingByte(), $this->getPayloadLength());
} }
$plLen = $this->getPayloadLength();
$start = $this->getPayloadStartingByte();
$applied = ''; $applied = '';
for ($i = 0, $len = strlen($payload); $i < $len; $i++) {
for ($i = 0; $i < $plLen; $i++) { $applied .= substr($payload, $i, 1) ^ substr($maskingKey, $i % static::MASK_LENGTH, 1);
$applied .= substr($this->data, $i + $start, 1) ^ substr($maskingKey, $i % static::MASK_LENGTH, 1);
} }
return $applied; return $applied;
@ -337,24 +338,17 @@ class Frame implements FrameInterface {
/** /**
* {@inheritdoc} * {@inheritdoc}
* @todo Consider not checking mask, always returning the payload, masked or not
*/ */
public function getPayload() { public function getPayload() {
if (!$this->isCoalesced()) { if (!$this->isCoalesced()) {
throw new \UnderflowException('Can not return partial message'); throw new \UnderflowException('Can not return partial message');
} }
$length = $this->getPayloadLength();
$start = $this->getPayloadStartingByte();
if ($this->isMasked()) { if ($this->isMasked()) {
$payload = $this->applyMaskToPayload($this->getMaskingKey()); $payload = $this->applyMask($this->getMaskingKey());
} else { } else {
$payload = substr($this->data, $start, $this->getPayloadLength()); $payload = substr($this->data, $this->getPayloadStartingByte(), $this->getPayloadLength());
}
if (strlen($payload) !== $length) {
// Is this possible? isCoalesced() math _should_ ensure if there is mal-formed data, it would return false
throw new \UnexpectedValueException('Payload length does not match expected length');
} }
return $payload; return $payload;