Merge pull request #318 from dotkernel/issue-316

Issue #316: Obfuscate admin login IP address
dotkernel · Dec 11, 2024 · 3fb353d · 3fb353d
2 parents 3d258f9 + e436348
commit 3fb353d
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/Admin/src/Service/AdminService.php b/src/Admin/src/Service/AdminService.php
@@ -200,17 +200,12 @@ public function logAdminVisit(array $serverParams, string $name, string $status)
 
         $ipAddress = IpService::getUserIp($serverParams);
 
-        $country = ! empty($this->locationService->getCountry($ipAddress)->getName()) ?
-            $this->locationService->getCountry($ipAddress)->getName() : '';
-
-        $continent = ! empty($this->locationService->getContinent($ipAddress)->getName()) ?
-            $this->locationService->getContinent($ipAddress)->getName() : '';
-
-        $organization = ! empty($this->locationService->getOrganization($ipAddress)->getName()) ?
-            $this->locationService->getOrganization($ipAddress)->getName() : '';
+        $country      = $this->locationService->getCountry($ipAddress)->getName();
+        $continent    = $this->locationService->getContinent($ipAddress)->getName();
+        $organization = $this->locationService->getOrganization($ipAddress)->getName();
 
         $adminLogin = (new AdminLogin())
-            ->setAdminIp($ipAddress)
+            ->setAdminIp($this->locationService->obfuscateIpAddress($ipAddress))
             ->setContinent($continent)
             ->setCountry($country)
             ->setOrganization($organization)