test(geolocation): Update Unit Test for geolocation

Author: julienloizelet

tests/GeolocationTest.php

@@ -7,7 +7,6 @@
 use CrowdSecBouncer\ApiCache;
 use CrowdSecBouncer\ApiClient;
 use CrowdSecBouncer\Bouncer;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
@@ -46,7 +45,6 @@ public function testCanVerifyIpAndCountryWithMaxmindInLiveMode(array $maxmindCon
         // Check if MaxMind database exist
         if (!file_exists($maxmindConfig['database_path'])) {
             $this->fail('There must be a MaxMind Database here: '.$maxmindConfig['database_path']);
-            $this->stopFlag = true; // Stop further processing if this occurs
         }
         // Init context
         $cacheAdapter = new PhpFilesAdapter('php_array_adapter_backup_cache', 0,
@@ -81,9 +79,14 @@ public function testCanVerifyIpAndCountryWithMaxmindInLiveMode(array $maxmindCon
         $this->assertEquals(
             'captcha',
             $bouncer->getRemediationForIp(TestHelpers::IP_JAPAN),
-            'Get decisions for a clean IP but bad country'
+            'Get decisions for a clean IP but bad country (captcha)'
         );
 
+        $this->assertEquals(
+            'bypass',
+            $bouncer->getRemediationForIp(TestHelpers::IP_FRANCE),
+            'Get decisions for a clean IP and clean country'
+        );
 
         // Disable Geolocation feature
         $geolocationConfig['enabled'] = false;
@@ -98,5 +101,42 @@ public function testCanVerifyIpAndCountryWithMaxmindInLiveMode(array $maxmindCon
             'Get decisions for a clean IP and bad country but with geolocation disabled'
         );
 
+
+        // Enable again geolocation and change testing conditions
+        $this->watcherClient->setSecondState();
+        $geolocationConfig['enabled'] = true;
+        $bouncerConfig['geolocation'] = $geolocationConfig;
+        $bouncer = new Bouncer(null, $this->logger, $apiCache);
+        $bouncer->configure($bouncerConfig);
+        $cacheAdapter->clear();
+
+        $this->assertEquals(
+            'ban',
+            $bouncer->getRemediationForIp(TestHelpers::IP_JAPAN),
+            'Get decisions for a bad IP (ban) and bad country (captcha)'
+        );
+
+
+        $this->assertEquals(
+            'ban',
+            $bouncer->getRemediationForIp(TestHelpers::IP_FRANCE),
+            'Get decisions for a bad IP (ban) and clean country'
+        );
+
+    }
+
+
+    /**
+     * @group integration
+     * @covers       \Bouncer
+     * @dataProvider maxmindConfigProvider
+     * @group ignore_
+     * @throws \Symfony\Component\Cache\Exception\CacheException
+     */
+    public function testCanVerifyIpAndCountryWithMaxmindInStreamMode(array $maxmindConfig):
+    void
+    {
+        $this->markTestIncomplete('This test has not been implemented yet.');
+
     }
 }

tests/TestHelpers.php

@@ -21,7 +21,6 @@ class TestHelpers
     public const IPV6_RANGE = '64';
     public const JAPAN = 'JP';
     public const IP_JAPAN = '210.249.74.42';
-    public const FRANCE = 'FR';
     public const IP_FRANCE = '78.119.253.85';
 
 

tests/WatcherClient.php

@@ -65,6 +65,9 @@ public function setSecondState(): void
         $now = new DateTime();
         $this->addDecision($now, '36h', '+36 hours', TestHelpers::NEWLY_BAD_IP, 'ban');
         $this->addDecision($now, '48h', '+48 hours', TestHelpers::NEWLY_BAD_IP.'/'.TestHelpers::IP_RANGE, 'captcha');
+        $this->addDecision($now, '24h', '+24 hours', TestHelpers::JAPAN, 'captcha', Constants::SCOPE_COUNTRY);
+        $this->addDecision($now, '24h', '+24 hours', TestHelpers::IP_JAPAN, 'ban');
+        $this->addDecision($now, '24h', '+24 hours', TestHelpers::IP_FRANCE, 'ban');
     }
 
     /**
@@ -102,11 +105,11 @@ public function deleteAllDecisions(): void
     }
 
     protected function getFinalScope($scope, $value){
-        return ($scope === 'Ip' && 2 === count(explode('/', $value))) ? 'Range' : $scope;
+        return ($scope === Constants::SCOPE_IP && 2 === count(explode('/', $value))) ? Constants::SCOPE_RANGE : $scope;
     }
 
     public function addDecision(DateTime $now, string $durationString, string $dateTimeDurationString, string
-    $value, string $type, string $scope = 'Ip')
+    $value, string $type, string $scope = Constants::SCOPE_IP)
     {
         $stopAt = (clone $now)->modify($dateTimeDurationString)->format('Y-m-d\TH:i:s.000\Z');
         $startAt = $now->format('Y-m-d\TH:i:s.000\Z');