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

rework IsLocalIP using standard library functions #364

Open
wants to merge 4 commits into
base: unstable
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .clabot
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"contributors": ["azukaar", "jwr1", "Jogai", "InterN0te", "catmandx", "revam", "Kawanaao", "davis4acca", "george-radu-cs", "BearTS", "lilkidsuave", "ryan-schubert", "madejackson", "RaidMax"],
"contributors": ["azukaar", "jwr1", "Jogai", "InterN0te", "catmandx", "revam", "Kawanaao", "davis4acca", "george-radu-cs", "BearTS", "lilkidsuave", "ryan-schubert", "madejackson", "RaidMax", "r41d"],
"message": "We require contributors to sign our [Contributor License Agreement](https://github.com/azukaar/Cosmos-Server/blob/master/cla.md). In order for us to review and merge your code, add yourself to the .clabot file as contributor, as a way of signing the CLA."
}
}
23 changes: 16 additions & 7 deletions src/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -898,17 +898,26 @@ func Exec(cmd string, args ...string) (string, error) {
}

func IsLocalIP(ip string) bool {
// IPv4 specific local addresses
if strings.HasPrefix(ip, "192.168.") || strings.HasPrefix(ip, "10.") || strings.HasPrefix(ip, "172.") || ip == "127.0.0.1" || ip == "localhost" {
// explicit localhost
if ip == "localhost" {
return true
}
// IPv6 specific local addresses
if strings.HasPrefix(ip, "fe80:") || strings.HasPrefix(ip, "fc00:") || strings.HasPrefix(ip, "fd00:") || ip == "::1" {
parsed := osnet.ParseIP(ip)
// check for loopback or private address space using go std lib
if parsed.IsLoopback() || parsed.IsPrivate() {
return true
}
// more private IPv4 address ranges
if ip4 := parsed.To4(); ip4 != nil {
// https://en.wikipedia.org/wiki/Reserved_IP_addresses
// 100.64.0.0 - 100.127.255.255 (100.64/10 prefix)
// 192.0.0.0 - 192.0.0.255 (192.0.0.0/24 prefix)
return (ip4[0] == 100 && ip4[1]&0x40 == 64) ||
(ip4[0] == 192 && ip4[1] == 0 && ip4[2] == 0)
}
// Handling cases where IPv6 might be enclosed in brackets
if strings.HasPrefix(ip, "[fe80:") || strings.HasPrefix(ip, "[fc00:") || strings.HasPrefix(ip, "[fd00:") || ip == "[::1]" {
return true
if strings.HasPrefix(ip, "[") && strings.HasSuffix(ip, "]") {
return IsLocalIP(strings.TrimSuffix(strings.TrimPrefix(ip, "["), "]"))
}
return false
}
Expand Down Expand Up @@ -1007,4 +1016,4 @@ func GetNextAvailableLocalPort(startPort int) (string, error) {
}
}
return "", fmt.Errorf("no available ports")
}
}