gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pb: fix IPv6 double brackets in ServerAddress formatting (#8329)

Browse Source 
* pb: fix IPv6 double brackets in ServerAddress formatting

* pb: refactor IPv6 tests into table-driven test

* util: add JoinHostPortStr and use it in pb to avoid unsafe port parsing
This commit is contained in:
Chris Lu
2026-02-12 18:11:03 -08:00
committed by GitHub
parent 796f23f68a
commit 1e4f30c56f
3 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
weed/pb/server_address.go
View File

@@ -57,7 +57,7 @@ func (sa ServerAddress) ToHttpAddress() string {
sepIndex := strings.LastIndex(string(ports), ".")
if sepIndex >= 0 {
host := string(sa[0:portsSepIndex])
return net.JoinHostPort(host, ports[0:sepIndex])
return util.JoinHostPortStr(host, ports[0:sepIndex])
}
return string(sa)
}
@@ -74,7 +74,7 @@ func (sa ServerAddress) ToGrpcAddress() string {
sepIndex := strings.LastIndex(ports, ".")
if sepIndex >= 0 {
host := string(sa[0:portsSepIndex])
return net.JoinHostPort(host, ports[sepIndex+1:])
return util.JoinHostPortStr(host, ports[sepIndex+1:])
}
return ServerToGrpcAddress(string(sa))
}