Skip to content

Commit aa22ec2

Browse files
committed
ignore not found
1 parent 7ff467c commit aa22ec2

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

internal/pkg/agent/cmd/run_darwin.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package cmd
88

99
import (
1010
"fmt"
11+
"os"
1112
"syscall"
1213

1314
"github.com/elastic/elastic-agent/pkg/core/logger"
@@ -41,5 +42,10 @@ func dropRootPrivileges(l *logger.Logger, ownership utils.FileOwner) error {
4142
}
4243

4344
func checkCapabilitiesPerms(agentCapabilitiesPath string, uid int) error {
44-
return utils.HasStrictExecPerms(agentCapabilitiesPath, uid)
45+
if err := utils.HasStrictExecPerms(agentCapabilitiesPath, uid); err != nil && !os.IsNotExist(err) {
46+
// capabilities are corrupted, we should not proceed
47+
return fmt.Errorf("invalid capabilities file permissions: %w", err)
48+
}
49+
50+
return nil
4551
}

internal/pkg/agent/cmd/run_linux.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package cmd
88

99
import (
1010
"fmt"
11+
"os"
1112
"syscall"
1213

1314
"github.com/elastic/elastic-agent/pkg/core/logger"
@@ -43,5 +44,10 @@ func dropRootPrivileges(l *logger.Logger, ownership utils.FileOwner) error {
4344
}
4445

4546
func checkCapabilitiesPerms(agentCapabilitiesPath string, uid int) error {
46-
return utils.HasStrictExecPerms(agentCapabilitiesPath, uid)
47+
if err := utils.HasStrictExecPerms(agentCapabilitiesPath, uid); err != nil && !os.IsNotExist(err) {
48+
// capabilities are corrupted, we should not proceed
49+
return fmt.Errorf("invalid capabilities file permissions: %w", err)
50+
}
51+
52+
return nil
4753
}

0 commit comments

Comments
 (0)