Use CIDR mask in IP whitelist check

LKaemmerling · Feb 9, 2021 · 5d985dc · 5d985dc
1 parent ff7e998
commit 5d985dc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/Http/Middleware/IPWhitelistingMiddleware.php b/src/Http/Middleware/IPWhitelistingMiddleware.php
@@ -5,14 +5,15 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Symfony\Component\HttpFoundation\IpUtils;
 
 class IPWhitelistingMiddleware
 {
     public function handle(Request $request, \Closure $next): Response
     {
         if (!empty(config('horizon-exporter.ip_whitelist'))) {
             $clientIp = $request->ip();
-            if (in_array($clientIp, config('horizon-exporter.ip_whitelist'))) {
+            if (IpUtils::checkIp($clientIp, config('horizon-exporter.ip_whitelist'))) {
                 return $next($request);
             } else {
                 abort(403);

diff --git a/tests/Http/Middleware/IPWhitelistingMiddlewareTest.php b/tests/Http/Middleware/IPWhitelistingMiddlewareTest.php
@@ -38,6 +38,14 @@ public function testCases()
             [
                 "127.0.0.2",
                 Response::HTTP_FORBIDDEN
+            ],
+            [
+                "10.0.0.1",
+                Response::HTTP_OK
+            ],
+            [
+                "10.0.1.1",
+                Response::HTTP_FORBIDDEN
             ]
         ];
     }

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -8,6 +8,6 @@ class TestCase extends \Orchestra\Testbench\TestCase
     protected function getEnvironmentSetUp($app)
     {
         $app['config']->set('horizon-exporter.exporters', [NoopExporter::class]);
-        $app['config']->set('horizon-exporter.ip_whitelist', ["127.0.0.1"]);
+        $app['config']->set('horizon-exporter.ip_whitelist', ["127.0.0.1", "10.0.0.0/24"]);
     }
 }