Skip to content
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

[Elastic Agent]: Reduce allowed socket path length #24914

Merged
merged 1 commit into from
Apr 2, 2021
Merged

[Elastic Agent]: Reduce allowed socket path length #24914

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
4 changes: 2 additions & 2 deletions x-pack/elastic-agent/pkg/agent/control/addr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ func Address() string {
return paths.SocketPath
}

// unix socket path cannot be longer than 107 characters
// unix socket path must be less than 104 characters
path := fmt.Sprintf("unix://%s.sock", filepath.Join(paths.TempDir(), "elastic-agent-control"))
if len(path) <= 107 {
if len(path) < 104 {
return path
}
// place in global /tmp to ensure that its small enough to fit; current path is way to long
Expand Down
8 changes: 4 additions & 4 deletions x-pack/elastic-agent/pkg/core/monitoring/beats/monitoring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ func getMonitoringEndpoint(spec program.Spec, operatingSystem, pipelineID string
if operatingSystem == "windows" {
return fmt.Sprintf(mbEndpointFileFormatWin, pipelineID, spec.Cmd)
}
// unix socket path cannot be longer than 107 characters
// unix socket path must be less than 104 characters
path := fmt.Sprintf("unix://%s.sock", filepath.Join(paths.TempDir(), pipelineID, spec.Cmd, spec.Cmd))
if len(path) <= 107 {
if len(path) < 104 {
return path
}
// place in global /tmp to ensure that its small enough to fit; current path is way to long
Expand All @@ -58,9 +58,9 @@ func AgentMonitoringEndpoint(operatingSystem string) string {
if operatingSystem == "windows" {
return agentMbEndpointFileFormatWin
}
// unix socket path cannot be longer than 107 characters
// unix socket path must be less than 104 characters
path := fmt.Sprintf("unix://%s.sock", filepath.Join(paths.TempDir(), "elastic-agent"))
if len(path) <= 107 {
if len(path) < 104 {
return path
}
// place in global /tmp to ensure that its small enough to fit; current path is way to long
Expand Down