Skip to content

OCPBUGS-62730 - Fixed typos and truncated field values in JSON audit logs generated by the JSON enricher #3071

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

Open
BhargaviGudi wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −2
Open

OCPBUGS-62730 - Fixed typos and truncated field values in JSON audit logs generated by the JSON enricher #3071

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
16 changes: 14 additions & 2 deletions internal/pkg/daemon/enricher/jsonenricher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,14 +320,20 @@
"unable to get uid and gid", "line", line)
}

logBucket.ProcessInfo = e.fetchProcessInfo(auditLine.ProcessID,
pi := e.fetchProcessInfo(auditLine.ProcessID,
auditLine.Executable, uid, gid)
logBucket.Mu.Lock()

Check failure on line 325 in internal/pkg/daemon/enricher/jsonenricher.go

View workflow job for this annotation

GitHub Actions / macos 

missing whitespace above this line (no shared variables above expr) (wsl_v5)
logBucket.ProcessInfo = pi
logBucket.Mu.Unlock()
}

e.processEbpf(logBucket, auditLine)

if logBucket.ContainerInfo == nil {
logBucket.ContainerInfo = e.fetchContainerInfo(ctx, auditLine.ProcessID, nodeName)
ci := e.fetchContainerInfo(ctx, auditLine.ProcessID, nodeName)
logBucket.Mu.Lock()

Check failure on line 334 in internal/pkg/daemon/enricher/jsonenricher.go

View workflow job for this annotation

GitHub Actions / macos 

missing whitespace above this line (no shared variables above expr) (wsl_v5)
logBucket.ContainerInfo = ci
logBucket.Mu.Unlock()
}

logBucket.SyscallIds.LoadOrStore(auditLine.SystemCallID, struct{}{})
Expand All @@ -341,6 +347,9 @@
}

func (e *JsonEnricher) processEbpf(logBucket *types.LogBucket, auditLine *types.AuditLine) {
logBucket.Mu.Lock()
defer logBucket.Mu.Unlock()

if e.bpfProcessCache != nil && logBucket.ProcessInfo != nil && logBucket.ProcessInfo.CmdLine == "" {
cmdLine, errCmdLine := e.bpfProcessCache.GetCmdLine(auditLine.ProcessID)
if errCmdLine == nil {
Expand Down Expand Up @@ -435,6 +444,9 @@
return true
})

logBucket.Mu.RLock()
defer logBucket.Mu.RUnlock()

var resource map[string]string

if logBucket.ProcessInfo == nil {
Expand Down
1 change: 1 addition & 0 deletions internal/pkg/daemon/enricher/types/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ type ProcessInfo struct {
ExecRequestId *string
}
type LogBucket struct {
Mu sync.RWMutex
SyscallIds sync.Map
ContainerInfo *ContainerInfo
ProcessInfo *ProcessInfo
Expand Down
Loading