Skip to content

Commit 84b85ba

Browse files
authored
xds/googledirectpath: Check if ipv6 address is non empty (#6959)
1 parent 6f63f05 commit 84b85ba

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Diff for: xds/googledirectpath/utils.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"io"
2525
"net/http"
2626
"net/url"
27+
"strings"
2728
"sync"
2829
"time"
2930
)
@@ -85,11 +86,15 @@ var (
8586
// Defined as var to be overridden in tests.
8687
var getIPv6Capable = func(timeout time.Duration) bool {
8788
ipv6CapableOnce.Do(func() {
88-
_, err := getFromMetadata(timeout, ipv6URL)
89+
addr, err := getFromMetadata(timeout, ipv6URL)
8990
if err != nil {
9091
logger.Warningf("could not discover ipv6 capability: %v", err)
9192
return
9293
}
94+
if trimmedAddr := strings.TrimSpace(string(addr)); trimmedAddr == "" {
95+
logger.Warningf("metadata server returned empty ipv6 address")
96+
return
97+
}
9398
ipv6Capable = true
9499
})
95100
return ipv6Capable

0 commit comments

Comments
 (0)