Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ClientRejectedEvent update
  • Loading branch information
valentint committed Feb 20, 2017
commit 0edc7c7324fc7e6b7115cf1bf5d9d872c7461f9e
4 changes: 2 additions & 2 deletions Event/ClientEventListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ public function onClientError(ClientErrorEvent $event)
*/
public function onClientRejected(ClientRejectedEvent $event)
{
$this->logger->warning('Client rejected, bad origin', [
'origin' => $event->getOrigin(),
$this->logger->warning('Client rejected, msg', [
'msg' => $event->getMsg(),
]);
}
}
12 changes: 6 additions & 6 deletions Event/ClientRejectedEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,29 @@ class ClientRejectedEvent extends Event
/**
* @var string
*/
protected $origin;
protected $msg;

/**
* @var RequestInterface
*/
protected $request;

/**
* @param string $origin
* @param string $msg
* @param RequestInterface $request
*/
public function __construct($origin, RequestInterface $request = null)
public function __construct($msg, RequestInterface $request = null)
{
$this->origin = $origin;
$this->msg = $msg;
$this->request = $request;
}

/**
* @return string
*/
public function getOrigin()
public function getMsg()
{
return $this->origin;
return $this->msg;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions Resources/docs/Events.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ class AcmeClientEventListener
*/
public function onClientRejected(ClientRejectedEvent $event)
{
$origin = $event->getOrigin;
$msg = $event->getMsg();

echo 'connection rejected from '. $origin . PHP_EOL;
echo $msg . PHP_EOL;
}
}
```
Expand Down
2 changes: 1 addition & 1 deletion Server/App/Stack/OriginCheck.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function onOpen(ConnectionInterface $conn, RequestInterface $request = nu
if (!in_array($origin, $this->allowedOrigins)) {
$this->eventDispatcher->dispatch(
Events::CLIENT_REJECTED,
new ClientRejectedEvent($origin, $request)
new ClientRejectedEvent('connection rejected from '. $origin, $request)
);

return $this->close($conn, 403);
Expand Down