[NodeBundle] Fix not checking on online status in some cases

src/Kunstmaan/NodeBundle/Event/SlugSecurityEvent.php

@@ -12,4 +12,83 @@
 final class SlugSecurityEvent extends Event
 {
 
+    private $node;
+
+    private $nodeTranslation;
+
+    private $entity;
+
+    private $request;
+
+    /**
+     * @return mixed
+     */
+    public function getNode()
+    {
+        return $this->node;
+    }
+
+    /**
+     * @param mixed $node
+     */
+    public function setNode($node)
+    {
+        $this->node = $node;
+
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getNodeTranslation()
+    {
+        return $this->nodeTranslation;
+    }
+
+    /**
+     * @param mixed $nodeTranslation
+     */
+    public function setNodeTranslation($nodeTranslation)
+    {
+        $this->nodeTranslation = $nodeTranslation;
+
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getEntity()
+    {
+        return $this->entity;
+    }
+
+    /**
+     * @param mixed $entity
+     */
+    public function setEntity($entity)
+    {
+        $this->entity = $entity;
+
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+
+    /**
+     * @param mixed $request
+     */
+    public function setRequest($request)
+    {
+        $this->request = $request;
+
+        return $this;
+    }
 }

src/Kunstmaan/NodeBundle/EventListener/SlugListener.php

@@ -65,6 +65,11 @@ public function onKernelController(FilterControllerEvent $event)
 
             // Do security check by firing an event that gets handled by the SlugSecurityListener
             $securityEvent = new SlugSecurityEvent();
+            $securityEvent->setNode($nodeTranslation->getNode())
+                ->setEntity($entity)
+                ->setRequest($request)
+                ->setNodeTranslation($nodeTranslation);
+
             $this->eventDispatcher->dispatch(Events::SLUG_SECURITY, $securityEvent);
 
             // Set the right controller

src/Kunstmaan/NodeBundle/EventListener/SlugSecurityListener.php

@@ -4,11 +4,15 @@
 
 
 use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionMap;
+use Kunstmaan\NodeBundle\Event\SlugSecurityEvent;
 use Kunstmaan\NodeBundle\Helper\NodeMenu;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\Security\Core\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContextInterface;
+
 /**
  * Class SlugSecurityListener
  * @package Kunstmaan\NodeBundle\EventListener
@@ -36,36 +40,41 @@ class SlugSecurityListener
     protected $acl;
 
     /**
-     * @param RequestStack $requestStack
      * @param EntityManager $entityManager
      * @param $securityContext
      * @param $acl
      */
-    public function __construct(RequestStack $requestStack,EntityManager $entityManager, SecurityContext $securityContext, $acl)
+    public function __construct(EntityManager $entityManager, SecurityContext $securityContext, $acl)
     {
         $this->securityContext = $securityContext;
-        $this->request = $requestStack->getCurrentRequest();
         $this->em = $entityManager;
         $this->acl = $acl;
     }
 
     /**
      *
      */
-    public function onSlugSecurityEvent()
+    public function onSlugSecurityEvent(SlugSecurityEvent $event)
     {
-        $node = $this->request->attributes->get('_nodeTranslation')->getNode();
+        $node               = $event->getNode();
+        $nodeTranslation    = $event->getNodeTranslation();
+        $request            = $event->getRequest();
 
         /* @var SecurityContextInterface $securityContext */
         if (false === $this->securityContext->isGranted(PermissionMap::PERMISSION_VIEW, $node)) {
             throw new AccessDeniedException('You do not have sufficient rights to access this page.');
         }
 
-        $locale = $this->request->attributes->get('_locale');
-        $preview = $this->request->attributes->get('preview');
+        $locale = $request->attributes->get('_locale');
+        $preview = $request->attributes->get('preview');
+
+        // check if the requested node is online, else throw a 404 exception (only when not previewing!)
+        if (!$preview && !$nodeTranslation->isOnline()) {
+            throw new NotFoundHttpException("The requested page is not online");
+        }
 
-        $nodeMenu       = new NodeMenu($this->em, $this->securityContext, $this->acl, $locale , $node, PermissionMap::PERMISSION_VIEW, $preview);
+        $nodeMenu = new NodeMenu($this->em, $this->securityContext, $this->acl, $locale , $node, PermissionMap::PERMISSION_VIEW, $preview);
 
-        $this->request->attributes->set('_nodeMenu', $nodeMenu);
+        $request->attributes->set('_nodeMenu', $nodeMenu);
     }
 }

src/Kunstmaan/NodeBundle/Resources/config/services.yml

@@ -138,7 +138,7 @@ services:
 
     kunstmaan_node.slug.security.listener:
         class: Kunstmaan\NodeBundle\EventListener\SlugSecurityListener
-        arguments: ["@request_stack" , "@doctrine.orm.entity_manager", "@security.context" , "@kunstmaan_admin.acl.helper" ]
+        arguments: ["@doctrine.orm.entity_manager", "@security.context" , "@kunstmaan_admin.acl.helper" ]
         tags:
             - { name: kernel.event_listener, event: kunstmaan_node.slug.security, method: onSlugSecurityEvent }