From 4fb6e59b1492a0923a9cd351fcbbaf7604cb51ec Mon Sep 17 00:00:00 2001 From: ghostika Date: Thu, 9 Jan 2014 20:49:57 +0100 Subject: [PATCH 1/5] Add host config to the security documentation --- book/security.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/book/security.rst b/book/security.rst index e60e581abc5..b006beb260b 100644 --- a/book/security.rst +++ b/book/security.rst @@ -151,6 +151,9 @@ that looks like the following: Let's look briefly at how security works and how each part of the configuration comes into play. +.. versionadded:: 2.4 + A new property was added to the firewall configuration, where you can make a restriction, called ``host``. + How Security Works: Authentication and Authorization ---------------------------------------------------- From 0244173f3a3b187c3e57a108ab30766652dc9768 Mon Sep 17 00:00:00 2001 From: Ghostika Date: Thu, 9 Jan 2014 21:15:30 +0100 Subject: [PATCH 2/5] add host to the config page --- reference/configuration/security.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index bdaa387acc8..4a6b355782a 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -98,6 +98,8 @@ Each part will be explained in the next section. # Examples: somename: pattern: .* + # restrict the firewall for a specific host + host: admin\.example\.com request_matcher: some.service.id access_denied_url: /foo/error403 access_denied_handler: some.service.id From cc8d19ac8729da4fa0cc0cd1bf4a364e6a1cb722 Mon Sep 17 00:00:00 2001 From: Ghostika Date: Thu, 9 Jan 2014 22:14:46 +0100 Subject: [PATCH 3/5] line break --- book/security.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/book/security.rst b/book/security.rst index b006beb260b..68f322823cb 100644 --- a/book/security.rst +++ b/book/security.rst @@ -152,7 +152,8 @@ Let's look briefly at how security works and how each part of the configuration comes into play. .. versionadded:: 2.4 - A new property was added to the firewall configuration, where you can make a restriction, called ``host``. + A new property was added to the firewall configuration, where you can +make a restriction, called ``host``. How Security Works: Authentication and Authorization ---------------------------------------------------- From 3e42b84281ac6a17764873b4d450e8869bdfe720 Mon Sep 17 00:00:00 2001 From: Ghostika Date: Sat, 11 Jan 2014 20:26:10 +0100 Subject: [PATCH 4/5] Add versionadded tag to security config reference, reference cookbok entry in book --- book/security.rst | 7 ++++--- reference/configuration/security.rst | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/book/security.rst b/book/security.rst index 68f322823cb..389df85d3ff 100644 --- a/book/security.rst +++ b/book/security.rst @@ -152,8 +152,8 @@ Let's look briefly at how security works and how each part of the configuration comes into play. .. versionadded:: 2.4 - A new property was added to the firewall configuration, where you can -make a restriction, called ``host``. + Support for restricting security firewalls to a specific host was added in + Symfony 2.4. How Security Works: Authentication and Authorization ---------------------------------------------------- @@ -1102,7 +1102,7 @@ Thanks to the SensioFrameworkExtraBundle, you can also secure your controller us // ... } -For more information, see the +For more information, see the :doc:`FrameworkExtraBundle documentation `. Securing other Services @@ -2168,6 +2168,7 @@ Learn more from the Cookbook * :doc:`Blacklist users by IP address with a custom voter ` * :doc:`Access Control Lists (ACLs) ` * :doc:`/cookbook/security/remember_me` +* :doc:`How to Restrict Firewalls to a Specific Host ` .. _`FOSUserBundle`: https://github.com/FriendsOfSymfony/FOSUserBundle .. _`implement the \Serializable interface`: http://php.net/manual/en/class.serializable.php diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index 4a6b355782a..c69a9a987a5 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -13,6 +13,10 @@ Full Default Configuration The following is the full default configuration for the security system. Each part will be explained in the next section. +.. versionadded:: 2.4 + Support for restricting security firewalls to a specific host was added in + Symfony 2.4. + .. configuration-block:: .. code-block:: yaml From 6cba1922f54066a36594a8f352cb506c3064f80f Mon Sep 17 00:00:00 2001 From: Ghostika Date: Sat, 11 Jan 2014 20:52:16 +0100 Subject: [PATCH 5/5] remove versionadded from book and fix words --- book/security.rst | 4 ---- cookbook/security/host_restriction.rst | 2 +- reference/configuration/security.rst | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/book/security.rst b/book/security.rst index 389df85d3ff..671e9373dac 100644 --- a/book/security.rst +++ b/book/security.rst @@ -151,10 +151,6 @@ that looks like the following: Let's look briefly at how security works and how each part of the configuration comes into play. -.. versionadded:: 2.4 - Support for restricting security firewalls to a specific host was added in - Symfony 2.4. - How Security Works: Authentication and Authorization ---------------------------------------------------- diff --git a/cookbook/security/host_restriction.rst b/cookbook/security/host_restriction.rst index 232f1cd5ff6..b5b2e529d95 100644 --- a/cookbook/security/host_restriction.rst +++ b/cookbook/security/host_restriction.rst @@ -5,7 +5,7 @@ How to Restrict Firewalls to a Specific Host ============================================ .. versionadded:: 2.4 - Support for restricting security firewalls to a specific host was added in + Support for restricting security firewalls to a specific host was introduced in Symfony 2.4. When using the Security component, you can create firewalls that match certain diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index c69a9a987a5..6a1d6c6ed67 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -14,7 +14,7 @@ The following is the full default configuration for the security system. Each part will be explained in the next section. .. versionadded:: 2.4 - Support for restricting security firewalls to a specific host was added in + Support for restricting security firewalls to a specific host was introduced in Symfony 2.4. .. configuration-block:: @@ -102,7 +102,7 @@ Each part will be explained in the next section. # Examples: somename: pattern: .* - # restrict the firewall for a specific host + # restrict the firewall to a specific host host: admin\.example\.com request_matcher: some.service.id access_denied_url: /foo/error403