Skip to content

in_windows_eventlog2: remove unexpected spaces in parsing description #121

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

in_windows_eventlog2: remove unexpected spaces in parsing description #121

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
1 change: 1 addition & 0 deletions lib/fluent/plugin/in_windows_eventlog2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ def parse_desc(record)
r.split(NONE_FIELD_DELIMITER)
end
key = "" if key.nil?
key.strip! # parsed key sometimes contain unexpected " ". So remove it.
key.chop! # remove ':' from key
if value.nil?
parent_key = to_key(key)
Expand Down
14 changes: 14 additions & 0 deletions test/data/eventid_4697
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
A service was installed in the system.

Subject:
Security ID: SYSTEM
Account Name: 824ZWL3$
Account Domain: WORKGROUP
Logon ID: 0x3E7

Service Information:
Service Name: WpnUserService_a46b7
Service File Name: C:\WINDOWS\system32\svchost.exe -k UnistackSvcGroup
Service Type: 0xE0
Service Start Type: 2
Service Account: LocalSystem
21 changes: 21 additions & 0 deletions test/plugin/test_in_windows_eventlog2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,27 @@ def test_parse_privileges_description
assert_equal(expected, h)
end

test "A service was installed in the system." do
d = create_driver
desc = nil
File.open('./test/data/eventid_4697', 'r') do |f|
desc = f.read.gsub(/\R/, "\r\n")
end
h = {"Description" => desc}
expected = {"DescriptionTitle" => "A service was installed in the system.",
"service_information.service_account" => "LocalSystem",
"service_information.service_file_name" => "C:\\WINDOWS\\system32\\svchost.exe -k UnistackSvcGroup",
"service_information.service_name" => "WpnUserService_a46b7",
"service_information.service_start_type" => "2",
"service_information.service_type" => "0xE0",
"subject.account_domain" => "WORKGROUP",
"subject.account_name" => "824ZWL3$",
"subject.logon_id" => "0x3E7",
"subject.security_id" => "SYSTEM"}
d.instance.parse_desc(h)
assert_equal(expected, h)
end

def test_write
d = create_driver XML_RENDERING_CONFIG

Expand Down