No expiration limits in stream mode

crowdsecurity · Dec 24, 2020 · e0270ff · e0270ff
1 parent 44741cf
commit e0270ff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/ApiCache.php b/src/ApiCache.php
@@ -208,10 +208,20 @@ private static function parseDurationToSeconds(string $duration): int
     private function formatRemediationFromDecision(?array $decision): array
     {
         if (!$decision) {
-            return [Constants::REMEDIATION_BYPASS, time() + $this->cacheExpirationForCleanIp, 0];
+            $duration = time() + $this->cacheExpirationForCleanIp;
+            if (!$this->liveMode) {
+                // In stream mode we considere an clean IP forever... until the next resync.
+                $duration = PHP_INT_MAX;
+            }
+            return [Constants::REMEDIATION_BYPASS, $duration, 0];
         }
 
-        $duration = min($this->cacheExpirationForBadIp, self::parseDurationToSeconds($decision['duration']));
+        $duration = self::parseDurationToSeconds($decision['duration']);
+
+        // Don't set a max duration in stream mode to avoid bugs. Only the stream update has to change the cache state.
+        if ($this->liveMode) {
+            $duration = min($this->cacheExpirationForBadIp, $duration);
+        }
 
         return [
             $decision['type'], // ex: ban, captcha

diff --git a/src/RestClient.php b/src/RestClient.php
@@ -96,7 +96,7 @@ public function request(
 
         $this->logger->debug('', [
             'type' => 'HTTP CALL',
-            'method' => $this->baseUri,
+            'method' => $method,
             'uri' => $this->baseUri.$endpoint,
         ]);
 

diff --git a/src/templates/captcha.php b/src/templates/captcha.php
@@ -45,7 +45,7 @@ function displayCaptchaTemplate(bool $error, string $captchaImageSrc, string $ca
     <p class="desc">Please complete the security check.</p>
 
     <img src="<?php echo $captchaImageSrc; ?>" alt="captcha to fill" />
-    <p><small><a href="#" onclick="newImage()">refresh image</a></small></p>
+    <p><small><a id="refresh_link" href="#" onclick="newImage()">refresh image</a></small></p>
 
     <form method="post" id="captcha" action="<?php echo $captchaResolutionFormUrl; ?>">
         <input type="text" name="phrase" placeholder="Type here..." autofocus autocomplete="off" />