fluent-plugin-windows-eventlog 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b003ba2ba48568f0aef6dbc9cb8181990d6c0c7aaf519c46716575f647bcc1f2
-  data.tar.gz: 6031954f7b32595d6c2ab9be37eb464c9bf5b0797ca5cd5eb4838b78adb29d36
+  metadata.gz: ce765b8becd1cc7835d19f2f1b9e3e0b1da48467f26434295e041887a4d8d057
+  data.tar.gz: 59129a827b949a6db83ba01f6d03da41ae0923304fcc479aecc7b37127517835
 SHA512:
-  metadata.gz: fc3ae080dd4fb87945a4ec803204e3d2a2753e4daeaa3ef316df6788514799c07d47b80b561755371d657cd151b60404a298a7ed8fa6887e422f1dd083421cb9
-  data.tar.gz: 941626f0a4e9656682eaf44b570590080f8aa9437307dbfd02c22efcd1355dbf8523d15e8531745b1a9a52c962847e874dae49addf818ca2b775011c2316ab36
+  metadata.gz: 74b3233cd11710c90c456e313d4f87ec0fcc5392bbb12761f8e62398aa8cda1b7ec6ae9cbbe5b4c74bb26be1e804c804a7eea6c8796887bd97924b768362e56f
+  data.tar.gz: 36e9a709f939d021e75ccc1723207b1dbb524aa2f5658aeefa319476a67d142e888518f037202934fbb2458006e77ce3269bd87572ca988457872aaf47cf6242

data/.github/workflows/unit-test.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
+        ruby: [ '3.4', '3.3', '3.2', '3.1', '3.0', '2.7' ]
         os:
           - windows-latest
         experimental: [false]
@@ -21,7 +21,7 @@ jobs:
             experimental: true
     name: Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# Release v0.9.2 - 2025/11/21
+
+* in_windows_eventlog2: remove unexpected spaces in parsing description (#121)
+
+# Release v0.9.1 - 2024/02/17
+
+* Relax required Nokogiri version (#117)
+  This change permit 1.16 or later version of Nokogiri.
+
 # Release v0.9.0 - 2024/08/02
 * in_windows_eventlog2: Enable expanding user names from SID and add `preserve_sid_on_hash` option
 * in_windows_eventlog2: Add Delimiter and Casing options for parsing

data/fluent-plugin-winevtlog.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-windows-eventlog"
-  spec.version       = "0.9.0"
+  spec.version       = "0.9.2"
   spec.authors       = ["okahashi117", "Hiroshi Hatake", "Masahiro Nakagawa"]
   spec.email         = ["naruki_okahashi@jbat.co.jp", "cosmo0920.oucc@gmail.com", "repeatedly@gmail.com"]
   spec.summary       = %q{Fluentd Input plugin to read windows event log.}
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit", "~> 3.4.0"
-  spec.add_development_dependency "nokogiri", [">= 1.10", "< 1.15"]
+  spec.add_development_dependency "nokogiri", "~> 1.10"
   spec.add_development_dependency "fluent-plugin-parser-winevt_xml", ">= 0.1.2"
   spec.add_runtime_dependency "fluentd", [">= 0.14.12", "< 2"]
   spec.add_runtime_dependency "win32-eventlog"

data/lib/fluent/plugin/in_windows_eventlog2.rb

@@ -417,7 +417,7 @@ module Fluent::Plugin
                          r.split(NONE_FIELD_DELIMITER)
                        end
           key = "" if key.nil?
-          key.chop!  # remove ':' from key
+          key.sub!(/:\s*$/, '')  # remove ':' from key
           if value.nil?
             parent_key = to_key(key)
           else

data/test/data/eventid_4697

@@ -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

data/test/plugin/test_in_windows_eventlog2.rb

@@ -325,6 +325,27 @@ DESC
     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
 

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-windows-eventlog
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - okahashi117
 - Hiroshi Hatake
 - Masahiro Nakagawa
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,22 +57,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: fluent-plugin-parser-winevt_xml
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +151,7 @@ files:
 - lib/fluent/plugin/bookmark_sax_parser.rb
 - lib/fluent/plugin/in_windows_eventlog.rb
 - lib/fluent/plugin/in_windows_eventlog2.rb
+- test/data/eventid_4697
 - test/data/eventid_6416
 - test/generate-windows-event.rb
 - test/helper.rb
@@ -168,7 +162,6 @@ homepage: https://github.com/fluent/fluent-plugin-windows-eventlog
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,11 +176,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Fluentd Input plugin to read windows event log.
 test_files:
+- test/data/eventid_4697
 - test/data/eventid_6416
 - test/generate-windows-event.rb
 - test/helper.rb