Merge pull request #52 from crowdsecurity/handle-invalid-ip-format

handle invalid ip format

Author: mobula9

src/AbstractBounce.php

@@ -126,6 +126,14 @@ protected function bounceCurrentIp()
     protected function shouldTrustXforwardedFor(string $ip): bool
     {
         $comparableAddress = Factory::addressFromString($ip)->getComparableString();
+        if (null === $comparableAddress) {
+            $this->logger->warning('', [
+                'type' => 'INVALID_INPUT_IP',
+                'ip' => $ip,
+            ]);
+
+            return false;
+        }
         foreach ($this->getTrustForwardedIpBoundsList() as $comparableIpBounds) {
             if ($comparableAddress >= $comparableIpBounds[0] && $comparableAddress <= $comparableIpBounds[1]) {
                 return true;

src/ApiCache.php

@@ -308,6 +308,13 @@ private function saveRemediations(array $decisions): array
 
             if ('Ip' === $decision['scope']) {
                 $address = Factory::addressFromString($decision['value']);
+                if (null === $address) {
+                    $this->logger->warning('', [
+                        'type' => 'INVALID_IP_TO_ADD_FROM_REMEDIATION',
+                        'decision' => $decision,
+                    ]);
+                    continue;
+                }
                 $this->addRemediationToCacheItem($address->toString(), $type, $exp, $id);
             } elseif ('Range' === $decision['scope']) {
                 $range = Subnet::fromString($decision['value']);
@@ -347,6 +354,13 @@ private function removeRemediations(array $decisions): array
         foreach ($decisions as $decision) {
             if ('Ip' === $decision['scope']) {
                 $address = Factory::addressFromString($decision['value']);
+                if (null === $address) {
+                    $this->logger->warning('', [
+                        'type' => 'INVALID_IP_TO_REMOVE_FROM_REMEDIATION',
+                        'decision' => $decision,
+                    ]);
+                    continue;
+                }
                 if (!$this->removeDecisionFromRemediationItem($address->toString(), $decision['id'])) {
                     $this->logger->debug('', ['type' => 'DECISION_TO_REMOVE_NOT_FOUND_IN_CACHE', 'decision' => $decision['id']]);
                 } else {