add check for paginator theme before setting it in gateway

Author: reecefowell

Component/FloodControl.php

@@ -13,6 +13,9 @@
 
 namespace CCDNMessage\MessageBundle\Component;
 
+use Symfony\Component\Security\Core\SecurityContextInterface;
+use Symfony\Component\HttpFoundation\Session\Session;
+
 /**
  *
  * @category CCDNMessage
@@ -29,10 +32,24 @@ class FloodControl
     /**
      *
      * @access protected
-     * @var $session
+     * @var \Symfony\Component\Security\Core\SecurityContextInterface $securityContext
+     */
+    protected $securityContext;
+
+    /**
+     *
+     * @access protected
+     * @var \Symfony\Component\HttpFoundation\Session\Session $session
      */
     protected $session;
 
+    /**
+     *
+     * @access protected
+     * @var string $kernelEnv
+     */
+    protected $kernelEnv;
+
     /**
      *
      * @access protected
@@ -50,19 +67,24 @@ class FloodControl
     /**
      *
      * @access public
-     * @param $session
+     * @param  \Symfony\Component\Security\Core\SecurityContextInterface $securityContext
+     * @param  \Symfony\Component\HttpFoundation\Session\Session         $session
+     * @param  string                                                    $kernelEnv
+     * @param  int                                                       $sendLimit
+     * @param  int                                                       $blockForMinutes
      */
-    public function __construct($session, $sendLimit, $blockForMinutes)
+    public function __construct(SecurityContextInterface $securityContext, Session $session, $kernelEnv, $sendLimit, $blockForMinutes)
     {
+        $this->securityContext = $securityContext;
         $this->session = $session;
-
-        $this->sendLimit = $sendLimit;
-
-        $this->blockForMinutes = $blockForMinutes;
+        $this->kernelEnv = $kernelEnv;
 
         if ( ! $this->session->has('flood_control_message_send_count')) {
             $this->session->set('flood_control_message_send_count', array());
         }
+
+        $this->sendLimit = $sendLimit;
+        $this->blockForMinutes = $blockForMinutes;
     }
 
     /**
@@ -71,11 +93,13 @@ public function __construct($session, $sendLimit, $blockForMinutes)
      */
     public function incrementCounter()
     {
-        $sendCount = $this->session->get('flood_control_message_send_count');
+        if (! $this->securityContext->isGranted('ROLE_MODERATOR') || $this->kernelEnv != 'prod') {
+	        $sendCount = $this->session->get('flood_control_message_send_count');
 
-        $sendCount[] = new \DateTime('now');
+	        $sendCount[] = new \DateTime('now');
 
-        $this->session->set('flood_control_message_send_count', $sendCount);
+	        $this->session->set('flood_control_message_send_count', $sendCount);
+		}
     }
 
     /**
@@ -85,14 +109,17 @@ public function incrementCounter()
      */
     public function isFlooded()
     {
-        $timeLimit = new \DateTime('-' . $this->blockForMinutes . ' minutes');
+        if ($this->sendLimit < 1 || ! $this->securityContext->isGranted('ROLE_MODERATOR') || $this->kernelEnv != 'prod') {
+			return false;
+		}
 
         if ($this->session->has('flood_control_message_send_count')) {
             $attempts = $this->session->get('flood_control_message_send_count');
 
             // Iterate over attempts and only reveal attempts that fall within the $timeLimit.
             $freshenedAttempts = array();
 
+	        $timeLimit = new \DateTime('-' . $this->blockForMinutes . ' minutes');
             $limit = $timeLimit->getTimestamp();
 
             foreach ($attempts as $attempt) {

Model/Component/Gateway/BaseGateway.php

@@ -194,7 +194,10 @@ public function all(QueryBuilder $qb, $parameters = array())
     public function paginateQuery(QueryBuilder $qb, $itemsPerPage, $page)
     {
         $pager = $this->paginator->paginate($qb, $page, $itemsPerPage);
-        $pager->setTemplate($this->pagerTheme);
+        
+		if ($this->pagerTheme) {
+			$pager->setTemplate($this->pagerTheme);
+		}
 
         return $pager;
     }

Resources/config/services/components.yml

@@ -49,7 +49,9 @@ services:
     ccdn_message_message.component.flood_control:
         class: %ccdn_message_message.component.flood_control.class%
         arguments:
+            - @security.context
             - @session
+            - %kernel.environment%
             - %ccdn_message_message.message.flood_control.send_limit%
             - %ccdn_message_message.message.flood_control.block_for_minutes%