[Elastic Agent]: Reduce allowed socket path length

simitt · simitt · commit bfc5c02e7f56 · 2021-04-02T13:47:22.000+02:00
Length limit is 104 on unix.
diff --git a/x-pack/elastic-agent/pkg/agent/control/addr.go b/x-pack/elastic-agent/pkg/agent/control/addr.go
@@ -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
diff --git a/x-pack/elastic-agent/pkg/core/monitoring/beats/monitoring.go b/x-pack/elastic-agent/pkg/core/monitoring/beats/monitoring.go
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ func Address() string {`
`22`	`22`	`return paths.SocketPath`
`23`	`23`	`}`
`24`	`24`
`25`		`- // unix socket path cannot be longer than 107 characters`
	`25`	`+ // unix socket path must be less than 104 characters`
`26`	`26`	`path := fmt.Sprintf("unix://%s.sock", filepath.Join(paths.TempDir(), "elastic-agent-control"))`
`27`		`- if len(path) <= 107 {`
	`27`	`+ if len(path) < 104 {`
`28`	`28`	`return path`
`29`	`29`	`}`
`30`	`30`	`// place in global /tmp to ensure that its small enough to fit; current path is way to long`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ func getMonitoringEndpoint(spec program.Spec, operatingSystem, pipelineID string`
`33`	`33`	`if operatingSystem == "windows" {`
`34`	`34`	`return fmt.Sprintf(mbEndpointFileFormatWin, pipelineID, spec.Cmd)`
`35`	`35`	`}`
`36`		`- // unix socket path cannot be longer than 107 characters`
	`36`	`+ // unix socket path must be less than 104 characters`
`37`	`37`	`path := fmt.Sprintf("unix://%s.sock", filepath.Join(paths.TempDir(), pipelineID, spec.Cmd, spec.Cmd))`
`38`		`- if len(path) <= 107 {`
	`38`	`+ if len(path) < 104 {`
`39`	`39`	`return path`
`40`	`40`	`}`
`41`	`41`	`// place in global /tmp to ensure that its small enough to fit; current path is way to long`
`@@ -58,9 +58,9 @@ func AgentMonitoringEndpoint(operatingSystem string) string {`
`58`	`58`	`if operatingSystem == "windows" {`
`59`	`59`	`return agentMbEndpointFileFormatWin`
`60`	`60`	`}`
`61`		`- // unix socket path cannot be longer than 107 characters`
	`61`	`+ // unix socket path must be less than 104 characters`
`62`	`62`	`path := fmt.Sprintf("unix://%s.sock", filepath.Join(paths.TempDir(), "elastic-agent"))`
`63`		`- if len(path) <= 107 {`
	`63`	`+ if len(path) < 104 {`
`64`	`64`	`return path`
`65`	`65`	`}`
`66`	`66`	`// place in global /tmp to ensure that its small enough to fit; current path is way to long`