KJZH001/nezha-2024
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix netip parsing (#20)

Browse Source
This commit is contained in:
UUBulb 2024-11-25 21:20:08 +08:00 committed by GitHub
parent 238ec25314
commit f853cd9ec9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/utils/utils.go
View File

@ -58,14 +58,14 @@ func BinaryToIPString(b []byte) string {
func GetIPFromHeader(headerValue string) (string, error) { func GetIPFromHeader(headerValue string) (string, error) {
a := strings.Split(headerValue, ",") a := strings.Split(headerValue, ",")
h := strings.TrimSpace(a[len(a)-1]) h := strings.TrimSpace(a[len(a)-1])
ip, err := netip.ParseAddrPort(h) ip, err := netip.ParseAddr(h)
if err != nil { if err != nil {
return "", err return "", err
} }
if !ip.IsValid() { if !ip.IsValid() {
return "", errors.New("invalid ip") return "", errors.New("invalid ip")
} }
return ip.Addr().String(), nil return ip.String(), nil
} }
// SplitIPAddr 传入/分割的v4v6混合地址，返回v4和v6地址与有效地址 // SplitIPAddr 传入/分割的v4v6混合地址，返回v4和v6地址与有效地址