Skip to content

Add information about CIDR notation support in trusted proxy list #2287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2013

Conversation

lazyhammer
Copy link
Contributor

Q A
Doc fix? no
New docs? yes (symfony/symfony#7312)
Applies to 2.3
Fixed tickets n/a

CIDR notation support was introduced, so you can whitelist whole
subnets (e.g. ``10.0.0.0/8``, ``fc00::/7``).

::
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should use .. code-block:: php here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But there is a rule in contributing guidelines that says you have to prefer :: over .. code-block:: php

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, but not in this case. The :: is used in sentences that ends with a colon, e.g: See this example:. In that case, instead of adding .. code-block:: php 2 lines after this sentences, you should use ::: See this example::. Sphinx will display the indented text under it as PHP code and change :: into :.

But, 👍 for reading the standards before contributing!!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Thanks for clarification!

fabpot added a commit to symfony/symfony that referenced this pull request Apr 20, 2013
This PR was merged into the master branch.

Discussion
----------

[HttpFoundation][FrameworkBundle] Add CIDR notation support in trusted proxy list

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7312, #7262
| License       | MIT
| Doc PR        | symfony/symfony-docs#2287

Should be rebased once #7734 is merged.

Commits
-------

7b32794 [HttpFoundation] updated CHANGELOG
e7c1696 [HttpFoundation] refactored code to avoid code duplication
1695067 [HttpFoundation] added some unit tests for ranges of trusted IP addresses
811434f Allow setting trusted_proxies using CIDR notation
ddc9e38 Modify Request::getClientIp() to use IpUtils::checkIp()
@lazyhammer
Copy link
Contributor Author

Rebased.
@weaverryan, this should be merged now.

weaverryan added a commit that referenced this pull request Apr 26, 2013
[WaitingCodeMerge] Add information about CIDR notation support in trusted proxy list
@weaverryan weaverryan merged commit af8bd77 into symfony:master Apr 26, 2013
@weaverryan
Copy link
Member

Well-done, perfect PR!

Thanks Dmitrii!

@lazyhammer lazyhammer deleted the trusted-proxies-cidr branch April 27, 2013 11:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants