mirror/Cosmos-Server
1
0
Fork 0
mirror of https://github.com/azukaar/Cosmos-Server.git synced 2026-05-02 00:59:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

[skip ci] rework IsLocalIP using standard library functions (#364)

Browse Source 
* rework IsLocalIP using standard library functions

* sign CLA
This commit is contained in:
Lennart Buhl
2025-01-20 19:27:40 +01:00
committed by GitHub
parent 2878e85fa2
commit 48012d5856
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.clabot
+2 -2
View File
@@ -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."
}
}
src/utils/utils.go
+16 -7
View File
@@ -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
}
@@ -1007,4 +1016,4 @@ func GetNextAvailableLocalPort(startPort int) (string, error) {
}
}
return "", fmt.Errorf("no available ports")
}
}