-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
🚀 Make IP validation 2x faster (#2158)
* 🚀 Make IP vallidation 2x faster * Add tests for IP validation * phrasing & linter fix * change test assert function That was a surprise that testing style in gofiber/utils and in gofiber/fiber/utils are different 😳
- Loading branch information
Showing
4 changed files
with
344 additions
and
46 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| package utils | ||
|
|
||
| import "net" | ||
|
|
||
| // IsIPv4 works the same way as net.ParseIP, | ||
| // but without check for IPv6 case and without returning net.IP slice, whereby IsIPv4 makes no allocations. | ||
| func IsIPv4(s string) bool { | ||
| for i := 0; i < net.IPv4len; i++ { | ||
| if len(s) == 0 { | ||
| return false | ||
| } | ||
|
|
||
| if i > 0 { | ||
| if s[0] != '.' { | ||
| return false | ||
| } | ||
| s = s[1:] | ||
| } | ||
|
|
||
| n, ci := 0, 0 | ||
|
|
||
| for ci = 0; ci < len(s) && '0' <= s[ci] && s[ci] <= '9'; ci++ { | ||
| n = n*10 + int(s[ci]-'0') | ||
| if n >= 0xFF { | ||
| return false | ||
| } | ||
| } | ||
|
|
||
| if ci == 0 || n > 0xFF || (ci > 1 && s[0] == '0') { | ||
| return false | ||
| } | ||
|
|
||
| s = s[ci:] | ||
| } | ||
|
|
||
| return len(s) == 0 | ||
| } | ||
|
|
||
| // IsIPv6 works the same way as net.ParseIP, | ||
| // but without check for IPv4 case and without returning net.IP slice, whereby IsIPv6 makes no allocations. | ||
| func IsIPv6(s string) bool { | ||
| ellipsis := -1 // position of ellipsis in ip | ||
|
|
||
| // Might have leading ellipsis | ||
| if len(s) >= 2 && s[0] == ':' && s[1] == ':' { | ||
| ellipsis = 0 | ||
| s = s[2:] | ||
| // Might be only ellipsis | ||
| if len(s) == 0 { | ||
| return true | ||
| } | ||
| } | ||
|
|
||
| // Loop, parsing hex numbers followed by colon. | ||
| i := 0 | ||
| for i < net.IPv6len { | ||
| // Hex number. | ||
| n, ci := 0, 0 | ||
|
|
||
| for ci = 0; ci < len(s); ci++ { | ||
| if '0' <= s[ci] && s[ci] <= '9' { | ||
| n *= 16 | ||
| n += int(s[ci] - '0') | ||
| } else if 'a' <= s[ci] && s[ci] <= 'f' { | ||
| n *= 16 | ||
| n += int(s[ci]-'a') + 10 | ||
| } else if 'A' <= s[ci] && s[ci] <= 'F' { | ||
| n *= 16 | ||
| n += int(s[ci]-'A') + 10 | ||
| } else { | ||
| break | ||
| } | ||
| if n > 0xFFFF { | ||
| return false | ||
| } | ||
| } | ||
| if ci == 0 || n > 0xFFFF { | ||
| return false | ||
| } | ||
|
|
||
| if ci < len(s) && s[ci] == '.' { | ||
| if ellipsis < 0 && i != net.IPv6len-net.IPv4len { | ||
| return false | ||
| } | ||
| if i+net.IPv4len > net.IPv6len { | ||
| return false | ||
| } | ||
|
|
||
| if !IsIPv4(s) { | ||
| return false | ||
| } | ||
|
|
||
| s = "" | ||
| i += net.IPv4len | ||
| break | ||
| } | ||
|
|
||
| // Save this 16-bit chunk. | ||
| i += 2 | ||
|
|
||
| // Stop at end of string. | ||
| s = s[ci:] | ||
| if len(s) == 0 { | ||
| break | ||
| } | ||
|
|
||
| // Otherwise must be followed by colon and more. | ||
| if s[0] != ':' || len(s) == 1 { | ||
| return false | ||
| } | ||
| s = s[1:] | ||
|
|
||
| // Look for ellipsis. | ||
| if s[0] == ':' { | ||
| if ellipsis >= 0 { // already have one | ||
| return false | ||
| } | ||
| ellipsis = i | ||
| s = s[1:] | ||
| if len(s) == 0 { // can be at end | ||
| break | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Must have used entire string. | ||
| if len(s) != 0 { | ||
| return false | ||
| } | ||
|
|
||
| // If didn't parse enough, expand ellipsis. | ||
| if i < net.IPv6len { | ||
| if ellipsis < 0 { | ||
| return false | ||
| } | ||
| } else if ellipsis >= 0 { | ||
| // Ellipsis must represent at least one 0 group. | ||
| return false | ||
| } | ||
| return true | ||
| } |
Oops, something went wrong.
5316f08There 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.
Possible performance regression was detected for benchmark.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold
2.Benchmark_AcquireCtx1361ns/op 1568 B/op 5 allocs/op596.1ns/op 1568 B/op 5 allocs/op2.28Benchmark_App_ETag6575ns/op 1044 B/op 3 allocs/op3279ns/op 1044 B/op 3 allocs/op2.01This comment was automatically generated by workflow using github-action-benchmark.