diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SecurityBundle] Comma separated ips for security.access_control

Browse Source
This commit is contained in:
Zmey 2020-09-10 23:01:01 +03:00 committed by Fabien Potencier
parent be6146c566
commit 0412e91060
5 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
View File

@ -7,6 +7,7 @@ CHANGELOG
* Added `FirewallListenerFactoryInterface`, which can be implemented by security factories to add firewall listeners
* Added `SortFirewallListenersPass` to make the execution order of firewall listeners configurable by
leveraging `Symfony\Component\Security\Http\Firewall\FirewallListenerInterface`
* Added ability to use comma separated ip address list for `security.access_control`
5.1.0
-----

3
src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/config.yml
View File

@ -3,6 +3,7 @@ imports:
parameters:
env(APP_IP): '127.0.0.1'
env(APP_IPS): '127.0.0.1, ::1'
security:
encoders:
@ -47,7 +48,9 @@ security:
- { path: ^/secured-by-one-real-ip-with-mask$, ips: '203.0.113.0/24', roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/secured-by-one-real-ipv6$, ips: 0:0:0:0:0:ffff:c633:6400, roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/secured-by-one-env-placeholder$, ips: '%env(APP_IP)%', roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/secured-by-one-env-placeholder-multiple-ips$, ips: '%env(APP_IPS)%', roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/secured-by-one-env-placeholder-and-one-real-ip$, ips: ['%env(APP_IP)%', 198.51.100.0], roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/secured-by-one-env-placeholder-multiple-ips-and-one-real-ip$, ips: ['%env(APP_IPS)%', 198.51.100.0], roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/highly_protected_resource$, roles: IS_ADMIN }
- { path: ^/protected-via-expression$, allow_if: "(is_anonymous() and request.headers.get('user-agent') matches '/Firefox/i') or is_granted('ROLE_USER')" }
- { path: .*, roles: IS_AUTHENTICATED_FULLY }

3
src/Symfony/Component/HttpFoundation/CHANGELOG.md
View File

@ -4,9 +4,10 @@ CHANGELOG
5.2.0
-----
* added support for `X-Forwarded-Prefix` header
* added support for `X-Forwarded-Prefix` header
* added `HeaderUtils::parseQuery()`: it does the same as `parse_str()` but preserves dots in variable names
* added `File::getContent()`
* added ability to use comma separated ip addresses for `RequestMatcher::matchIps()`
5.1.0
-----

6
src/Symfony/Component/HttpFoundation/RequestMatcher.php
View File

@ -125,7 +125,11 @@ class RequestMatcher implements RequestMatcherInterface
*/
public function matchIps($ips)
{
$this->ips = null !== $ips ? (array) $ips : [];
$ips = null !== $ips ? (array) $ips : [];
$this->ips = array_reduce($ips, static function (array $ips, string $ip) {
return array_merge($ips, preg_split('/\s*,\s*/', $ip));
}, []);
}
/**

34
src/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php
View File

@ -163,4 +163,38 @@ class RequestMatcherTest extends TestCase
$matcher->matchAttribute('foo', 'babar');
$this->assertFalse($matcher->matches($request));
}
public function testIps()
{
$matcher = new RequestMatcher();
$request = Request::create('', 'GET', [], [], [], ['REMOTE_ADDR' => '127.0.0.1']);
$matcher->matchIp('127.0.0.1');
$this->assertTrue($matcher->matches($request));
$matcher->matchIp('192.168.0.1');
$this->assertFalse($matcher->matches($request));
$matcher->matchIps('127.0.0.1');
$this->assertTrue($matcher->matches($request));
$matcher->matchIps('127.0.0.1, ::1');
$this->assertTrue($matcher->matches($request));
$matcher->matchIps('192.168.0.1, ::1');
$this->assertFalse($matcher->matches($request));
$matcher->matchIps(['127.0.0.1', '::1']);
$this->assertTrue($matcher->matches($request));
$matcher->matchIps(['192.168.0.1', '::1']);
$this->assertFalse($matcher->matches($request));
$matcher->matchIps(['1.1.1.1', '2.2.2.2', '127.0.0.1, ::1']);
$this->assertTrue($matcher->matches($request));
$matcher->matchIps(['1.1.1.1', '2.2.2.2', '192.168.0.1, ::1']);
$this->assertFalse($matcher->matches($request));
}
}