Skip to content

[confighttp] Fix parseIP to support IPv6 addresses with zone IDs #14590

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.

Sign up for GitHub

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

Open
RoryGlenn wants to merge 1 commit into
base: main
Choose a base branch
from
+41 −9
Open

[confighttp] Fix parseIP to support IPv6 addresses with zone IDs #14590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion config/confighttp/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ func TestContextWithClient(t *testing.T) {
},
expected: client.Info{
Addr: &net.IPAddr{
IP: net.IPv4(1, 2, 3, 4),
IP: net.IPv4(1, 2, 3, 4).To4(),
},
},
},
Expand Down
14 changes: 8 additions & 6 deletions config/confighttp/clientinfohandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"context"
"net"
"net/http"
"net/netip"

"go.opentelemetry.io/collector/client"
)
Expand Down Expand Up @@ -56,11 +57,12 @@ func parseIP(source string) *net.IPAddr {
if err == nil {
source = ipstr
}
ip := net.ParseIP(source)
if ip != nil {
return &net.IPAddr{
IP: ip,
}
addr, err := netip.ParseAddr(source)
if err != nil {
return nil
}
return &net.IPAddr{
IP: addr.AsSlice(),
Zone: addr.Zone(),
}
return nil
}
34 changes: 32 additions & 2 deletions config/confighttp/clientinfohandler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ func TestParseIP(t *testing.T) {
name: "addr",
input: "1.2.3.4",
expected: &net.IPAddr{
IP: net.IPv4(1, 2, 3, 4),
IP: net.IPv4(1, 2, 3, 4).To4(),
},
},
{
name: "addr:port",
input: "1.2.3.4:33455",
expected: &net.IPAddr{
IP: net.IPv4(1, 2, 3, 4),
IP: net.IPv4(1, 2, 3, 4).To4(),
},
},
{
Expand All @@ -43,6 +43,36 @@ func TestParseIP(t *testing.T) {
input: "1.2.3.4/orders",
expected: nil,
},
{
name: "IPv6 addr",
input: "::1",
expected: &net.IPAddr{
IP: net.ParseIP("::1"),
},
},
{
name: "IPv6 [addr]:port",
input: "[::1]:12345",
expected: &net.IPAddr{
IP: net.ParseIP("::1"),
},
},
{
name: "IPv6 addr with zone",
input: "fe80::1%eth0",
expected: &net.IPAddr{
IP: net.ParseIP("fe80::1"),
Zone: "eth0",
},
},
{
name: "IPv6 [addr%zone]:port",
input: "[fe80::1%eth0]:12345",
expected: &net.IPAddr{
IP: net.ParseIP("fe80::1"),
Zone: "eth0",
},
},
}
for _, tt := range testCases {
t.Run(tt.name, func(t *testing.T) {
Expand Down