Skip to content

fix(contrib/registry/consul): validate port in consul Register #3658

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(contrib/registry/consul): validate port in consul Register #3658

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f63c8d4
fix(contrib/registry/consul): validate port in consul Register
May 6, 2025
61be00e
Merge branch 'main' into registry/consul
1911860538 Aug 16, 2025
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
9 changes: 6 additions & 3 deletions contrib/registry/consul/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type Client struct {
heartbeat bool
// deregisterCriticalServiceAfter time interval in seconds
deregisterCriticalServiceAfter int
// serviceChecks user custom checks
// serviceChecks user custom checks
serviceChecks api.AgentServiceChecks

// used to control heartbeat
Expand Down Expand Up @@ -161,7 +161,10 @@ func (c *Client) Register(ctx context.Context, svc *registry.ServiceInstance, en
return err
}
addr := raw.Hostname()
port, _ := strconv.ParseUint(raw.Port(), 10, 16)
port, err := strconv.ParseUint(raw.Port(), 10, 16)
if err != nil || port == 0 {
return fmt.Errorf("invalid port in endpoint: %q", endpoint)
}

checkAddresses = append(checkAddresses, net.JoinHostPort(addr, strconv.FormatUint(port, 10)))
addresses[raw.Scheme] = api.ServiceAddress{Address: endpoint, Port: int(port)}
Expand All @@ -175,7 +178,7 @@ func (c *Client) Register(ctx context.Context, svc *registry.ServiceInstance, en
}
if len(checkAddresses) > 0 {
host, portRaw, _ := net.SplitHostPort(checkAddresses[0])
port, _ := strconv.ParseInt(portRaw, 10, 32)
port, _ := strconv.ParseUint(portRaw, 10, 16)
Copy link

Copilot AI Jul 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The error from strconv.ParseUint is ignored here; consider handling parse errors to avoid silently defaulting to port 0, similar to the validation added above.

Suggested change
port, _ := strconv.ParseUint(portRaw, 10, 16)
port, err := strconv.ParseUint(portRaw, 10, 16)
if err != nil || port == 0 {
return fmt.Errorf("invalid port in check address: %q", checkAddresses[0])
}

Copilot uses AI. Check for mistakes.
asr.Address = host
asr.Port = int(port)
}
Expand Down
Loading