fix cache key

Author: mobula9

src/ApiCache.php

@@ -294,7 +294,7 @@ private function saveRemediations(array $decisions): array
 
             if ('Ip' === $decision['scope']) {
                 $address = Factory::addressFromString($decision['value']);
-                $this->addRemediationToCacheItem(Bouncer::formatIpAsCacheKey($address), $type, $exp, $id);
+                $this->addRemediationToCacheItem($address->toString(), $type, $exp, $id);
             } elseif ('Range' === $decision['scope']) {
                 $range = Subnet::fromString($decision['value']);
 
@@ -310,11 +310,11 @@ private function saveRemediations(array $decisions): array
 
                 $comparableEndAddress = $range->getComparableEndString();
                 $address = $range->getStartAddress();
-                $this->addRemediationToCacheItem(Bouncer::formatIpAsCacheKey($address), $type, $exp, $id);
+                $this->addRemediationToCacheItem($address->toString(), $type, $exp, $id);
                 $ipCount = 1;
                 do {
                     $address = $address->getNextAddress();
-                    $this->addRemediationToCacheItem(Bouncer::formatIpAsCacheKey($address), $type, $exp, $id);
+                    $this->addRemediationToCacheItem($address->toString(), $type, $exp, $id);
                     ++$ipCount;
                     if ($ipCount >= 1000) {
                         throw new BouncerException("Unable to store the decision ${$decision['id']}, the IP range: ${$decision['value']} is too large and can cause storage problem. Decision ignored.");
@@ -333,7 +333,7 @@ private function removeRemediations(array $decisions): array
         foreach ($decisions as $decision) {
             if ('Ip' === $decision['scope']) {
                 $address = Factory::addressFromString($decision['value']);
-                if (!$this->removeDecisionFromRemediationItem(Bouncer::formatIpAsCacheKey($address), $decision['id'])) {
+                if (!$this->removeDecisionFromRemediationItem($address->toString(), $decision['id'])) {
                     $this->logger->debug('', ['type' => 'DECISION_TO_REMOVE_NOT_FOUND_IN_CACHE', 'decision' => $decision['id']]);
                 } else {
                     $this->logger->debug('', [
@@ -356,14 +356,14 @@ private function removeRemediations(array $decisions): array
 
                 $comparableEndAddress = $range->getComparableEndString();
                 $address = $range->getStartAddress();
-                if (!$this->removeDecisionFromRemediationItem(Bouncer::formatIpAsCacheKey($address), $decision['id'])) {
+                if (!$this->removeDecisionFromRemediationItem($address->toString(), $decision['id'])) {
                     $this->logger->debug('', ['type' => 'DECISION_TO_REMOVE_NOT_FOUND_IN_CACHE', 'decision' => $decision['id']]);
                 }
                 $ipCount = 1;
                 $success = true;
                 do {
                     $address = $address->getNextAddress();
-                    if (!$this->removeDecisionFromRemediationItem(Bouncer::formatIpAsCacheKey($address), $decision['id'])) {
+                    if (!$this->removeDecisionFromRemediationItem($address->toString(), $decision['id'])) {
                         $success = false;
                     }
                     ++$ipCount;
@@ -532,7 +532,7 @@ private function hit(string $ip): string
      */
     public function get(AddressInterface $address): string
     {
-        $cacheKey = Bouncer::formatIpAsCacheKey($address);
+        $cacheKey = $address->toString();
         $this->logger->debug('', ['type' => 'START_IP_CHECK', 'ip' => $cacheKey]);
         if (!$this->liveMode && !$this->warmedUp) {
             throw new BouncerException('CrowdSec Bouncer configured in "stream" mode. Please warm the cache up before trying to access it.');

src/Bouncer.php

@@ -7,8 +7,6 @@
 
 use Gregwar\Captcha\CaptchaBuilder;
 use Gregwar\Captcha\PhraseBuilder;
-use IPLib\Address\AddressInterface;
-use IPLib\Address\Type;
 use IPLib\Factory;
 use Monolog\Handler\NullHandler;
 use Monolog\Logger;
@@ -93,18 +91,6 @@ private function capRemediationLevel(string $remediation): string
         return $remediation;
     }
 
-    /**
-     * Format the input IP address as a cache key.
-     */
-    public static function formatIpAsCacheKey(AddressInterface $ip): string
-    {
-        if (Type::T_IPv6 === $ip->getAddressType) {
-            return implode(':', \array_slice($ip->toString(true), 0, 4));
-        }
-
-        return $ip->toString();
-    }
-
     /**
      * Get the remediation for the specified IP. This method use the cache layer.
      * In live mode, when no remediation was found in cache,