Fix IP validation in digital signature file download (CIDR support)#305
Open
cableman wants to merge 2 commits intoOS2Forms:developfrom
Open
Fix IP validation in digital signature file download (CIDR support)#305cableman wants to merge 2 commits intoOS2Forms:developfrom
cableman wants to merge 2 commits intoOS2Forms:developfrom
Conversation
cableman
force-pushed
the
feature/digital_signature_ips
branch
2 times, most recently
from
7631097 to
83921fd
Compare
cableman
force-pushed
the
feature/digital_signature_ips
branch
from
83921fd to
de2282a
Compare
jekuaitk
reviewed
Feb 18, 2026
Comment on lines
116
to
125
| $ip = ip2long($ip); | ||
| $subnet = ip2long($subnet); | ||
|
|
||
| if ($ip === FALSE || $subnet === FALSE || $bits < 0 || $bits > 32) { | ||
| return FALSE; | ||
| } | ||
|
|
||
| $mask = -1 << (32 - $bits); | ||
|
|
||
| return ($ip & $mask) === ($subnet & $mask); |
Contributor
There was a problem hiding this comment.
It is not obvious what and why this is happening. A comment or two would do wonders
Contributor
Author
There was a problem hiding this comment.
Yes, a simpler way will be to use the IpUtils class from symfony. We switch over to that...
jekuaitk
approved these changes
Feb 18, 2026
| $mask = -1 << (32 - $bits); | ||
|
|
||
| return ($ip & $mask) === ($subnet & $mask); | ||
| return IpUtils::checkIp($ip, $cidr); |
Contributor
There was a problem hiding this comment.
Consider just using the IpUtils directly in the above code.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This allow us to filter on CIDR, which is useful in a dynamic setup where the IP may change