Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 13 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -746,10 +746,20 @@ func readAuditDevices(rootToken string) (map[string]auditDevice, error) {
return nil, fmt.Errorf("unexpected status %d", status)
}
var devices map[string]auditDevice
if err := json.Unmarshal(body, &devices); err != nil {
return nil, fmt.Errorf("decode audit devices: %w", err)
directErr := json.Unmarshal(body, &devices)
if directErr == nil {
return devices, nil
}
return devices, nil
var response struct {
Data map[string]auditDevice `json:"data"`
}
if err := json.Unmarshal(body, &response); err != nil {
return nil, fmt.Errorf("decode audit devices response: %w", err)
}
if response.Data == nil {
return nil, fmt.Errorf("decode audit devices: %w", directErr)
}
return response.Data, nil
}

func validateStdoutAuditDevice(device auditDevice) error {
Expand Down
2 changes: 1 addition & 1 deletion main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ func TestSecureBootstrapEnablesAuditBeforeRevokingRoot(t *testing.T) {
_, _ = response.Write([]byte(`{}`))
return
}
_, _ = response.Write([]byte(`{"cloudrun/":{"type":"file","options":{"file_path":"stdout","log_raw":"false"}}}`))
_, _ = response.Write([]byte(`{"request_id":"audit-list","lease_id":"","renewable":false,"lease_duration":0,"data":{"cloudrun/":{"type":"file","options":{"file_path":"stdout","log_raw":"false"}}},"wrap_info":null,"warnings":null,"auth":null,"mount_type":"system"}`))
case "POST /v1/sys/audit/cloudrun":
events = append(events, "audit")
auditEnabled = true
Expand Down
Loading