From d63a146eb997d51cdefde476442af65d0e033c04 Mon Sep 17 00:00:00 2001
From: Martin Honek <martin.honek@transfergo.com>
Date: Tue, 26 Mar 2024 15:07:53 +0100
Subject: [PATCH] Sanitize cache keys to prevent an exception on IPv6 addresses

---
 src/cache/DefaultCache.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/cache/DefaultCache.php b/src/cache/DefaultCache.php
index fe89d49..964dd23 100644
--- a/src/cache/DefaultCache.php
+++ b/src/cache/DefaultCache.php
@@ -3,6 +3,7 @@
 namespace ipinfo\ipinfo\cache;
 
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\CacheItem;
 use Symfony\Contracts\Cache\ItemInterface;
 
 /**
@@ -32,6 +33,8 @@ public function __construct(int $maxsize, int $ttl)
    */
     public function has(string $name): bool
     {
+        $name = $this->sanitizeName($name);
+
         return $this->cache->hasItem($name);
     }
 
@@ -42,11 +45,12 @@ public function has(string $name): bool
    */
     public function set(string $name, $value)
     {
+        $name = $this->sanitizeName($name);
         if (!$this->cache->hasItem($name)) {
             $this->element_queue[] = $name;
         }
 
-        $this->cache->get($name, function (ItemInterface $item) use  ($value) {
+        $this->cache->get($name, function (ItemInterface $item) use ($value) {
             $item->set($value)->expiresAfter($this->ttl);
             return $item->get();
         });
@@ -61,6 +65,8 @@ public function set(string $name, $value)
    */
     public function get(string $name)
     {
+        $name = $this->sanitizeName($name);
+
         return $this->cache->getItem($name)->get();
     }
 
@@ -79,4 +85,14 @@ private function manageSize()
             $this->element_queue = array_slice($this->element_queue, $overflow);
         }
     }
+
+   /**
+    * Remove forbidden characters from cache keys
+    */
+    private function sanitizeName(string $name): string
+    {
+        $forbiddenCharacters = str_split(CacheItem::RESERVED_CHARACTERS);
+
+        return str_replace($forbiddenCharacters, "", $name);
+    }
 }