Skip to content
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

semgrep: updated IPv4 regex pattern #1382

Merged
merged 2 commits into from Sep 15, 2023
Merged

Conversation

hiteshbedre
Copy link
Contributor

Description

Current IPv4 validation accepting non-IPv4 addresses such as 000000.010101.256.101, 192.168.0.300, 256.0.0.0 and bunch of other cases I mentioned in regex101 link. Newly defined pattern will take care all of such cases.
You can play with newly defined regex pattern here: https://regex101.com/r/j4lkR3/1

Has your change been tested?

Changes has been tested on regex playground

Types of changes

What sort of change does your code introduce/modify?

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • This change is using publicly documented in cloudflare/api-schemas
    and relies on stable APIs.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 29, 2023

changelog detected ✅

@jacobbednarz
Copy link
Member

let me have a think about this one as the regex is intentionally broad to catch anything that looks like it may be an IP, not just valid ones. this ensures that even if someone provides an invalid IP, it recommends the documented ranges we expect here.

@hiteshbedre
Copy link
Contributor Author

If that is the case we need to better keep existing regex as is. Closing the pull request.

@jacobbednarz
Copy link
Member

to be clear here, I'm not against refining the regex. I just want to have a look over the previous tests cases that this helped and make sure we would have still caught them.

@hiteshbedre
Copy link
Contributor Author

Oh, I had the impression that the current broader-matching regex was acceptable. My apologies for the misinterpretation. Kindly inform me once you've had the opportunity to look into previous test cases. Reopening🚀

@hiteshbedre hiteshbedre reopened this Aug 30, 2023
@hiteshbedre
Copy link
Contributor Author

@jacobbednarz Have you had a chance to review the previous test cases to ensure that this PR's changes would still catch them? Your input is valuable.

@codecov-commenter
Copy link

Codecov Report

Merging #1382 (4e081a3) into master (b9ac804) will increase coverage by 0.33%.
Report is 303 commits behind head on master.
The diff coverage is 49.62%.

@@            Coverage Diff             @@
##           master    #1382      +/-   ##
==========================================
+ Coverage   48.33%   48.67%   +0.33%     
==========================================
  Files         133      139       +6     
  Lines       13023    13873     +850     
==========================================
+ Hits         6295     6752     +457     
- Misses       5201     5464     +263     
- Partials     1527     1657     +130     
Files Changed Coverage Δ
access_audit_log.go 79.31% <ø> (ø)
access_bookmark.go 72.44% <ø> (ø)
access_keys.go 71.42% <ø> (ø)
access_organization.go 53.84% <ø> (ø)
access_service_tokens.go 51.85% <ø> (ø)
account_members.go 65.54% <ø> (ø)
account_roles.go 53.84% <ø> (ø)
accounts.go 50.81% <ø> (ø)
addressing_address_map.go 39.04% <ø> (ø)
addressing_ip_prefix.go 45.45% <ø> (ø)
... and 121 more

... and 1 file with indirect coverage changes

@jacobbednarz jacobbednarz merged commit 2d9cecb into cloudflare:master Sep 15, 2023
22 checks passed
@github-actions github-actions bot added this to the v0.78.0 milestone Sep 15, 2023
@github-actions
Copy link
Contributor

This functionality has been released in v0.78.0.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants