Skip to content

fix: make all fields visible in JSON #67

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
secDre4mer wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −10
Open

fix: make all fields visible in JSON #67

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
12 changes: 6 additions & 6 deletions thorlog/v3/eventlog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
type WindowsEventlogEntry struct {
jsonlog.ObjectHeader

EventId uint16 `json:"-" textlog:"event_id"`
EventLevel int `json:"-" textlog:"event_level"`
EventTime time.Time `json:"-" textlog:"event_time"`
EventChannel string `json:"-" textlog:"event_channel,omitempty"`
EventComputer string `json:"-" textlog:"event_computer,omitempty"`
EventId uint16 `json:"event_id" textlog:"event_id"`
EventLevel int `json:"level" textlog:"event_level"`
EventTime time.Time `json:"time" textlog:"event_time"`
EventChannel string `json:"channel" textlog:"event_channel,omitempty"`
EventComputer string `json:"computer" textlog:"event_computer,omitempty"`

Entry KeyValueList `json:"entry" textlog:"entry"`
}
Expand All @@ -36,7 +36,7 @@ type EventlogProcessStart struct {
jsonlog.ObjectHeader
Process string `json:"process" textlog:"process"`
StartTimes []time.Time `json:"start_times" textlog:"-"`
Count int `json:"-" textlog:"count"`
Count int `json:"count" textlog:"count"`
}

func (EventlogProcessStart) observed() {}
Expand Down
4 changes: 2 additions & 2 deletions thorlog/v3/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type File struct {
Extension string `json:"extension" textlog:"extension,omitempty"`

// FileMode is the type of the file (e.g. file, directory, symlink, etc.)
FileMode FileModeType `json:"-" textlog:"-"`
FileMode FileModeType `json:"mode" textlog:"-"`

// MagicHeader is the magic header of the file (e.g. PE, ZIP, etc.)
MagicHeader string `json:"magic_header,omitempty" textlog:"type,omitempty"`
Expand Down Expand Up @@ -98,7 +98,7 @@ type FileHashes struct {
}

type RecycleBinIndexFile struct {
Version uint64 `json:"-" textlog:"-"`
Version uint64 `json:"version" textlog:"-"`
OriginalFilename string `json:"original_file_name" textlog:"original_filename"`
DeletionTime time.Time `json:"deletion_time" textlog:"deletion_time"`
OriginalFilesize uint64 `json:"original_file_size" textlog:"-"`
Expand Down
4 changes: 2 additions & 2 deletions thorlog/v3/process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func (s *Sections) RelativeTextPointer(pointee any) (string, bool, bool) {
type ProcessConnections struct {
ListenPorts ProcessListenPorts `json:"listen_ports" textlog:"listen_ports,omitempty" jsonschema:"nullable"`
Connections []ProcessConnection `json:"connections" textlog:"-" jsonschema:"nullable"`
ConnectionCount int `json:"-" textlog:"connection_count"`
ConnectionCount int `json:"count" textlog:"connection_count"`
}

type ProcessHandle struct {
Expand All @@ -127,7 +127,7 @@ func (p ProcessListenPorts) String() string {
}

type ProcessConnection struct {
Fd uint32 `json:"-" textlog:"-"`
Fd uint32 `json:"fd" textlog:"-"`
// Status is the connection status, e.g. ESTABLISHED, LISTEN, etc.
Status string `json:"status" textlog:"-"`
Ip string `json:"ip" textlog:"ip"`
Expand Down
Loading