Skip to content

Commit 18154ef

Browse files
committed
added ip range for whitelist
1 parent f51cb15 commit 18154ef

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

src/Abstracts/Middleware.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Closure;
88
use Illuminate\Support\Facades\Redirect;
99
use Illuminate\Support\Facades\Response;
10+
use Symfony\Component\HttpFoundation\IpUtils;
1011

1112
abstract class Middleware
1213
{
@@ -73,7 +74,7 @@ public function isEnabled()
7374

7475
public function isWhitelist()
7576
{
76-
return in_array($this->ip(), config('firewall.whitelist'));
77+
return IpUtils::checkIp($this->ip(), config('firewall.whitelist'));
7778
}
7879

7980
public function isMethod()

tests/Feature/WhitelistTest.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
namespace Akaunting\Firewall\Tests\Feature;
4+
5+
use Akaunting\Firewall\Middleware\Whitelist;
6+
use Akaunting\Firewall\Models\Ip as Model;
7+
use Akaunting\Firewall\Tests\TestCase;
8+
9+
class WhitelistTest extends TestCase
10+
{
11+
public function testShouldAllow()
12+
{
13+
config(['firewall.whitelist' => ['127.0.0.0/24']]);
14+
15+
$this->assertEquals('next', (new Whitelist())->handle($this->app->request, $this->getNextClosure()));
16+
}
17+
18+
public function testShouldBlock()
19+
{
20+
$this->assertEquals('403', (new Whitelist())->handle($this->app->request, $this->getNextClosure())->getStatusCode());
21+
}
22+
}

0 commit comments

Comments
 (0)