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.

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

linux capabilities: normalization and auditbeat process support #37453

Merged
merged 22 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
bc80df8
Capabilities normalization and auditbeat support
haesbaert Dec 4, 2023
593afcc
Error messages should be lowercase, thanks matt@
haesbaert Dec 13, 2023
810f4c2
Turn allMask into a package var, thanks to matt
haesbaert Dec 13, 2023
cac206b
range()->range, thanks to matt
haesbaert Dec 13, 2023
a3e7b8b
typo
haesbaert Dec 18, 2023
b6859ab
Add process.thread.capabilities to ECS fields
haesbaert Dec 18, 2023
1456e53
Make gofmt happy
haesbaert Dec 18, 2023
17d94fa
Curb journald test to linux
haesbaert Dec 18, 2023
62ade13
Update libbeat/common/capabilities/capabilities_linux_test.go
haesbaert Dec 20, 2023
4e33d51
Update libbeat/common/capabilities/capabilities_linux_test.go
haesbaert Dec 20, 2023
d7a0459
Update libbeat/common/capabilities/capabilities_other.go
haesbaert Dec 20, 2023
51ce44e
CHANGELOG.next.asciidoc entry
haesbaert Dec 19, 2023
c60b637
Fix the remaining empty slices cases
haesbaert Dec 20, 2023
020e2c5
Shuffle things around like Dan suggested
haesbaert Dec 20, 2023
28c241d
Rename 'v' to 'enabled' as suggested by Lee
haesbaert Jan 9, 2024
77218a7
Make the linter happy about error documentation
haesbaert Jan 11, 2024
2f2e444
Handle SetFlag error
haesbaert Jan 11, 2024
676cc5a
Merge remote-tracking branch 'origin/main' into newcaps.capall
haesbaert Jan 29, 2024
a008721
Remove CAP_ALL
haesbaert Jan 26, 2024
1271f79
Progress has arrived, go 1.21 has a generic ErrUnsupported
haesbaert Jan 26, 2024
7b717d8
Don't bother fetching capabilities of kernel processes
haesbaert Jan 26, 2024
6b158f9
Update CHANGELOG.next.asciidoc
haesbaert Jan 29, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ Setting environmental variable ELASTIC_NETINFO:false in Elastic Agent pod will d

- Add `ignore_errors` option to audit module. {issue}15768[15768] {pull}36851[36851]
- Fix copy arguments for strict aligned architectures. {pull}36976[36976]
- Add linux capabilities to processes in the system/process. {pull}37453[37453]

*Filebeat*

Expand Down
22 changes: 22 additions & 0 deletions auditbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18925,6 +18925,28 @@ type: keyword
--


*`process.thread.capabilities.effective`*::
+
--
This is the set of capabilities used by the kernel to perform permission checks for the thread.

type: keyword

example: ["CAP_BPF", "CAP_SYS_ADMIN"]

--

*`process.thread.capabilities.permitted`*::
+
--
This is a limiting superset for the effective capabilities that the thread may assume.

type: keyword

example: ["CAP_BPF", "CAP_SYS_ADMIN"]

--

[float]
=== hash

Expand Down
65 changes: 3 additions & 62 deletions filebeat/input/journald/pkg/journalfield/conv.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

import (
"fmt"
"math/bits"
"regexp"
"strconv"
"strings"

"github.com/elastic/beats/v7/libbeat/common/capabilities"
"github.com/elastic/elastic-agent-libs/logp"
"github.com/elastic/elastic-agent-libs/mapstr"
)
Expand Down Expand Up @@ -190,72 +190,13 @@
if !ok {
return
}
w, err := strconv.ParseUint(c, 16, 64)
if err != nil {
return
}
if w == 0 {
caps, err := capabilities.FromString(c, 16)
if err != nil || len(caps) == 0 {
return
}
caps := make([]string, 0, bits.OnesCount64(w))
for i := 0; w != 0; i++ {
if w&1 != 0 {
if i < len(capTable) {
caps = append(caps, capTable[i])
} else {
caps = append(caps, strconv.Itoa(i))
}
}
w >>= 1
}
fields.Put("process.thread.capabilities.effective", caps)
}

// include/uapi/linux/capability.h
var capTable = [...]string{
0: "CAP_CHOWN",
1: "CAP_DAC_OVERRIDE",
2: "CAP_DAC_READ_SEARCH",
3: "CAP_FOWNER",
4: "CAP_FSETID",
5: "CAP_KILL",
6: "CAP_SETGID",
7: "CAP_SETUID",
8: "CAP_SETPCAP",
9: "CAP_LINUX_IMMUTABLE",
10: "CAP_NET_BIND_SERVICE",
11: "CAP_NET_BROADCAST",
12: "CAP_NET_ADMIN",
13: "CAP_NET_RAW",
14: "CAP_IPC_LOCK",
15: "CAP_IPC_OWNER",
16: "CAP_SYS_MODULE",
17: "CAP_SYS_RAWIO",
18: "CAP_SYS_CHROOT",
19: "CAP_SYS_PTRACE",
20: "CAP_SYS_PACCT",
21: "CAP_SYS_ADMIN",
22: "CAP_SYS_BOOT",
23: "CAP_SYS_NICE",
24: "CAP_SYS_RESOURCE",
25: "CAP_SYS_TIME",
26: "CAP_SYS_TTY_CONFIG",
27: "CAP_MKNOD",
28: "CAP_LEASE",
29: "CAP_AUDIT_WRITE",
30: "CAP_AUDIT_CONTROL",
31: "CAP_SETFCAP",
32: "CAP_MAC_OVERRIDE",
33: "CAP_MAC_ADMIN",
34: "CAP_SYSLOG",
35: "CAP_WAKE_ALARM",
36: "CAP_BLOCK_SUSPEND",
37: "CAP_AUDIT_READ",
38: "CAP_PERFMON",
39: "CAP_BPF",
40: "CAP_CHECKPOINT_RESTORE",
}

func getStringFromFields(key string, fields mapstr.M) string {
value, _ := fields.GetValue(key)
str, _ := value.(string)
Expand All @@ -276,7 +217,7 @@
}

// helpers for creating a field conversion table.
var ignoredField = Conversion{Dropped: true}

Check failure on line 220 in filebeat/input/journald/pkg/journalfield/conv.go

View workflow job for this annotation

GitHub Actions / lint (darwin)

var `ignoredField` is unused (unused)

func text(names ...string) Conversion {
return Conversion{Names: names, IsInteger: false, Dropped: false}
Expand Down
48 changes: 5 additions & 43 deletions filebeat/input/journald/pkg/journalfield/conv_expand_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
// specific language governing permissions and limitations
// under the License.

//go:build linux && cgo

package journalfield

import (
Expand Down Expand Up @@ -121,47 +123,7 @@ var expandCapabilitiesTests = []struct {
"thread": mapstr.M{
"capabilities": mapstr.M{
"effective": []string{
"CAP_CHOWN",
"CAP_DAC_OVERRIDE",
"CAP_DAC_READ_SEARCH",
"CAP_FOWNER",
"CAP_FSETID",
"CAP_KILL",
"CAP_SETGID",
"CAP_SETUID",
"CAP_SETPCAP",
"CAP_LINUX_IMMUTABLE",
"CAP_NET_BIND_SERVICE",
"CAP_NET_BROADCAST",
"CAP_NET_ADMIN",
"CAP_NET_RAW",
"CAP_IPC_LOCK",
"CAP_IPC_OWNER",
"CAP_SYS_MODULE",
"CAP_SYS_RAWIO",
"CAP_SYS_CHROOT",
"CAP_SYS_PTRACE",
"CAP_SYS_PACCT",
"CAP_SYS_ADMIN",
"CAP_SYS_BOOT",
"CAP_SYS_NICE",
"CAP_SYS_RESOURCE",
"CAP_SYS_TIME",
"CAP_SYS_TTY_CONFIG",
"CAP_MKNOD",
"CAP_LEASE",
"CAP_AUDIT_WRITE",
"CAP_AUDIT_CONTROL",
"CAP_SETFCAP",
"CAP_MAC_OVERRIDE",
"CAP_MAC_ADMIN",
"CAP_SYSLOG",
"CAP_WAKE_ALARM",
"CAP_BLOCK_SUSPEND",
"CAP_AUDIT_READ",
"CAP_PERFMON",
"CAP_BPF",
"CAP_CHECKPOINT_RESTORE",
"CAP_ALL",
haesbaert marked this conversation as resolved.
Show resolved Hide resolved
},
},
},
Expand Down Expand Up @@ -228,8 +190,8 @@ var expandCapabilitiesTests = []struct {
"CAP_PERFMON",
"CAP_BPF",
"CAP_CHECKPOINT_RESTORE",
"41",
"42",
"CAP_41",
"CAP_42",
},
},
},
Expand Down
Loading
Loading