Handshake middleware for server

Client/Auth/WebsocketAuthenticationProvider.php

@@ -77,7 +77,11 @@ protected function getToken(ConnectionInterface $connection)
         }
 
         if (null === $token) {
-            $token = new AnonymousToken($this->firewalls[0], 'anon-' . $connection->WAMP->sessionId);
+            if (!$this->tokenStorage->getToken()) {
+                $token = new AnonymousToken($this->firewalls[0], 'anon-' . $connection->WAMP->sessionId);
+            } else {
+                $token = $this->tokenStorage->getToken();
+            }
         }
 
         if ($this->tokenStorage->getToken() !== $token) {

DependencyInjection/Configuration.php

@@ -95,6 +95,11 @@ public function getConfigTreeBuilder()
                             ->end()
                         ->end()
                     ->end()
+                    ->arrayNode('handshake_middleware')
+                        ->prototype('scalar')
+                            ->example('@some_service # have to extends Gos\Bundle\WebSocketBundle\Server\App\Stack\HandshakeMiddlewareAbstract')
+                        ->end()
+                    ->end()
                 ->end()
             ->end()
             ->arrayNode('rpc')

DependencyInjection/GosWebSocketExtension.php

@@ -64,6 +64,15 @@ public function load(array $configs, ContainerBuilder $container)
             }
         }
 
+        $HandshakeMiddlewareRegistryDef = $container->getDefinition('gos_web_socket.handshake_middleware.registry');
+        if (!empty($configs['server']['handshake_middleware'])) {
+            foreach ($configs['server']['handshake_middleware'] as $middleware) {
+                $HandshakeMiddlewareRegistryDef->addMethodCall('addMiddleware', [new Reference(ltrim($middleware, '@'))]);
+            }
+        }
+
+
+
         $container->setParameter('web_socket_server.client_storage.ttl', $configs['client']['storage']['ttl']);
         $container->setParameter('web_socket_server.client_storage.prefix', $configs['client']['storage']['prefix']);
 

Event/ClientEventListener.php

@@ -3,6 +3,7 @@
 namespace Gos\Bundle\WebSocketBundle\Event;
 
 use Gos\Bundle\WebSocketBundle\Client\Auth\WebsocketAuthenticationProvider;
+use Gos\Bundle\WebSocketBundle\Client\Auth\WebsocketAuthenticationProviderInterface;
 use Gos\Bundle\WebSocketBundle\Client\ClientStorageInterface;
 use Gos\Bundle\WebSocketBundle\Client\Exception\ClientNotFoundException;
 use Psr\Log\LoggerInterface;
@@ -31,12 +32,12 @@ class ClientEventListener
 
     /**
      * @param ClientStorageInterface $clientStorage
-     * @param WebsocketAuthenticationProvider $authenticationProvider
+     * @param WebsocketAuthenticationProviderInterface $authenticationProvider
      * @param LoggerInterface|null $logger
      */
     public function __construct(
         ClientStorageInterface $clientStorage,
-        WebsocketAuthenticationProvider $authenticationProvider,
+        WebsocketAuthenticationProviderInterface $authenticationProvider,
         LoggerInterface $logger = null
     ) {
         $this->clientStorage = $clientStorage;
@@ -124,8 +125,6 @@ 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, ' . $event->getMsg());
     }
 }

Event/ClientRejectedEvent.php

@@ -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;
     }
 
     /**

README.md

@@ -52,6 +52,7 @@ Resources
 * [Performance Bench](Resources/docs/Performance.md)
 * [Push integration](Resources/docs/Pusher.md)
 * [SSL configuration](Resources/docs/Ssl.md)
+* [Handshake Middleware For Server](Resources/docs/HandshakeMiddleware.md)
 
 Code Cookbook
 --------------

Resources/config/services/services.yml

@@ -52,6 +52,7 @@ services:
             - '@gos_web_socket.wamp.topic_manager'
             - '@gos_web_socket.server_push_handler.registry'
             - '@?monolog.logger.websocket'
+            - '@gos_web_socket.handshake_middleware.registry'
         tags:
             - { name: gos_web_socket.server }
 
@@ -85,6 +86,9 @@ services:
     gos_web_socket.origins.registry:
         class: Gos\Bundle\WebSocketBundle\Server\App\Registry\OriginRegistry
 
+    gos_web_socket.handshake_middleware.registry:
+        class: Gos\Bundle\WebSocketBundle\Server\App\Registry\HandshakeMiddlewareRegistry
+
     gos_web_socket_server.wamp_application:
         class: Gos\Bundle\WebSocketBundle\Server\App\WampApplication
         public: false

Resources/docs/ConfigurationReference.md

@@ -19,6 +19,9 @@ gos_web_socket:
                 - @AcmeBundle/Resources/config/pubsub/routing.yml
             context:
                 tokenSeparator: "/"
+        handshake_middleware: []
+            # - @some_service
+
     rpc:                  []
     topics:               []
     periodic:             []

Resources/docs/Events.md

@@ -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;
     }
 }
 ```

Resources/docs/HandshakeMiddleware.md

@@ -0,0 +1,14 @@
+# HandshakeMiddleware
+
+You can add any middleware as service to server with your business logic  
+
+
+**Bundle Configuration**
+
+```yaml
+# Gos Web Socket Bundle
+gos_web_socket:
+    server:
+        handshake_middleware: 
+            - @some_service # have to extends Gos\Bundle\WebSocketBundle\Server\App\Stack\HandshakeMiddlewareAbstract
+```

Server/App/Registry/HandshakeMiddlewareRegistry.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Gos\Bundle\WebSocketBundle\Server\App\Registry;
+
+use Gos\Bundle\WebSocketBundle\Server\App\Stack\HandshakeMiddlewareAbstract;
+
+/**
+ * @author Tkachew <[email protected]>
+ */
+class HandshakeMiddlewareRegistry
+{
+    /**
+     * @var HandshakeMiddlewareAbstract[]
+     */
+    protected $middlewares;
+
+    public function __construct()
+    {
+        $this->middlewares = [];
+    }
+
+    /**
+     * @param HandshakeMiddlewareAbstract $middleware
+     * @throws \Exception
+     */
+    public function addMiddleware(HandshakeMiddlewareAbstract $middleware)
+    {
+        $this->middlewares[] = $middleware;
+    }
+
+    /**
+     * @return HandshakeMiddlewareAbstract[]
+     */
+    public function getMiddlewares()
+    {
+        return $this->middlewares;
+    }
+}

Server/App/Stack/Factory/Middleware.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace Gos\Bundle\WebSocketBundle\Server\App\Stack\Factory;
+
+use Gos\Bundle\WebSocketBundle\Event\ClientRejectedEvent;
+use Gos\Bundle\WebSocketBundle\Event\Events;
+use Gos\Bundle\WebSocketBundle\Server\App\Stack\HandshakeMiddlewareAbstract;
+use Guzzle\Http\Message\RequestInterface;
+use Ratchet\ConnectionInterface;
+use Ratchet\Http\HttpServerInterface;
+use Ratchet\MessageComponentInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
+/**
+ * @author Johann Saunier <[email protected]>
+ */
+class Middleware implements HttpServerInterface
+{
+    /**
+     * @var \Ratchet\MessageComponentInterface
+     */
+    protected $_component;
+
+    /**
+     * @var HandshakeMiddlewareAbstract
+     */
+    protected $_middleware;
+
+    /**
+     * @param MessageComponentInterface $component
+     * @param HandshakeMiddlewareAbstract  $middleware
+     */
+    public function __construct(
+        MessageComponentInterface $component,
+        HandshakeMiddlewareAbstract $middleware
+    ) {
+        $this->_component = $component;
+        $this->_middleware = $middleware;
+        $this->_middleware->setComponent($component);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function onOpen(ConnectionInterface $conn, RequestInterface $request = null)
+    {
+        return $this->_middleware->onOpen($conn, $request);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function onMessage(ConnectionInterface $from, $msg)
+    {
+        return $this->_middleware->onMessage($from, $msg);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function onClose(ConnectionInterface $conn)
+    {
+        return $this->_middleware->onClose($conn);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function onError(ConnectionInterface $conn, \Exception $e)
+    {
+        return $this->_middleware->onError($conn, $e);
+    }
+}

Server/App/Stack/HandshakeMiddlewareAbstract.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Gos\Bundle\WebSocketBundle\Server\App\Stack;
+
+use Guzzle\Http\Message\RequestInterface;
+use Ratchet\Http\HttpServerInterface;
+use Ratchet\ConnectionInterface;
+use Ratchet\MessageComponentInterface;
+
+/**
+ * @author Tkachew <[email protected]>
+ */
+abstract class HandshakeMiddlewareAbstract implements HttpServerInterface
+{
+    /**
+     * @var MessageComponentInterface
+     */
+    protected $_component;
+
+    /**
+     * @param MessageComponentInterface $component
+     */
+    public function setComponent(MessageComponentInterface $component)
+    {
+        $this->_component = $component;
+    }
+
+    /**
+     * @param ConnectionInterface $conn
+     * @param RequestInterface|null $request
+     * @return mixed
+     */
+    public function onOpen(ConnectionInterface $conn, RequestInterface $request = null)
+    {
+        return $this->_component->onOpen($conn, $request);
+    }
+
+    /**
+     * @param ConnectionInterface $conn
+     * @return mixed
+     */
+    public function onClose(ConnectionInterface $conn)
+    {
+        return $this->_component->onClose($conn);
+    }
+
+    /**
+     * @param ConnectionInterface $conn
+     * @param \Exception $e
+     * @return mixed
+     */
+    public function onError(ConnectionInterface $conn, \Exception $e)
+    {
+        return $this->_component->onError($conn, $e);
+    }
+
+    /**
+     * @param ConnectionInterface $from
+     * @param string $msg
+     * @return mixed
+     */
+    public function onMessage(ConnectionInterface $from, $msg)
+    {
+        return $this->_component->onMessage($from, $msg);
+    }
+}

Server/App/Stack/OriginCheck.php

@@ -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);