Skip to content

Commit

Permalink
[Elastic Agent]: Reduce allowed socket path length (elastic#24914) (e…
Browse files Browse the repository at this point in the history
…lastic#24978)

Length limit is 104 on unix.
  • Loading branch information
simitt authored Apr 7, 2021
1 parent 76bf809 commit b161b5b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions x-pack/elastic-agent/pkg/agent/control/addr.go
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
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

0 comments on commit b161b5b

Please sign in to comment.