-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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
[SHIRO-764] Add IpFilter for restricting access IP ranges #219
Conversation
@mookkiah thanks for the PR! |
Don't we loose the original contributor (@rswheeldon) name when we squash? I don't see option in the github UI to squash. Do you want me to recreate another PR by squashing all commits ? |
You can choose the commits that you want to squash, not all. |
No need to recreate a PR |
Squashed. Learned to squash via command line. So far addicted to GitLab's checkbox to do the same. |
* /another/path/** = localLan | ||
* </pre> | ||
* | ||
* @since 1.4 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can set to 1.5, we will have a maintance branch for 1.5.x.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
version set to 1.5.
@fpapon Is there any challenge in accepting this pull request. Or any action needed from my end? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thanks!
* IPv4 address will never match a request which returns an IPv6 address, and vice-versa. | ||
* | ||
* @see <a href="https://github.com/spring-projects/spring-security/blob/master/web/src/main/java/org/springframework/security/web/util/matcher/IpAddressMatcher.java">Original Spring Security version</a> | ||
* @since 1.5 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to be set to the next version
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bdemers I was thinking to release it in the 1.5.4 too. Thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have no objection to another 1.x release. Though my pref for this change would be a 1.6 (as it is a new feature)
We can also, just mark this as some sort of placeholder like NEXT_VERSION
and then update it before the release (if we are undecided on the exact version)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bdemers ok as it's a new feature. I would prefer to move on 2.0 to keep focus on it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: the @SInCE tags need to be updated before merging
(likely to 2.0)
Other than that, it looks good to me!
Thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
…om without (or outside) specific IP ranges. Add IpAddressMatcher taken from Spring Security used for range tests IpFilter fixes based on code review comments Add ip to DefaultFilter
@721806280 can you write comments in english please? |
@fpapon Ipfilter When is this update expected to be released? Why hasn't Hostfilter been perfected for a long time? |
Resolved merge conflict from original PR #57 as per @fpapon recommendation.