Update nokogiri to 1.13.6, and install it only on Windows

Only fluent-plugin-windows-eventlog and fluent-plugin-parser-winevt_xml are explicitly depdends on nokogiri. Because nokogiri is often reported vulnerabilities, it should be installed and updated by td-agent-gem if users really require it. TODO: Probably we need to install rexml or something other for aws-sdk-core with Ruby 3.x: https://github.com/aws/aws-sdk-ruby/blob/64e9ea97c318cb7a10fdf7c0979307a772f06b51/gems/aws-sdk-core/lib/aws-sdk-core/xml/parser.rb#L70 Signed-off-by: Takuro Ashie <[email protected]>
fluent · May 23, 2022 · f6d7de3 · f6d7de3
1 parent 91955c5
commit f6d7de3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/td-agent/Gemfile b/td-agent/Gemfile
@@ -61,7 +61,6 @@ gem "webhdfs", "0.10.2"
 gem "fluent-plugin-webhdfs", "1.5.0"
 gem "fluent-plugin-record-modifier", "2.1.0"
 gem "fluent-plugin-rewrite-tag-filter", "2.4.0"
-gem "nokogiri", "1.13.4"
 gem "fluent-plugin-sd-dns", "0.1.0"
 gem "fluent-plugin-flowcounter-simple", "0.1.0"
 gem "mini_portile2", "2.8.0"
@@ -74,6 +73,7 @@ gem "fluent-plugin-opensearch", "1.0.4"
 windows_platforms = [:mingw, :x64_mingw] # :mswin
 gem "ffi", "1.15.5", platforms: windows_platforms
 gem "ffi-win32-extensions", "1.0.4", platforms: windows_platforms
+gem "nokogiri", "1.13.6", platforms: windows_platforms
 gem "win32-api", "1.10.1", platforms: windows_platforms
 gem "win32-event", "0.6.3", platforms: windows_platforms
 gem "win32-ipc", "0.7.0", platforms: windows_platforms

diff --git a/td-agent/Gemfile.lock b/td-agent/Gemfile.lock
@@ -194,14 +194,7 @@ GEM
     multi_json (1.15.0)
     multipart-post (2.1.1)
     nio4r (2.5.8)
-    nokogiri (1.13.4)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
-    nokogiri (1.13.4-x64-mingw32)
-      racc (~> 1.4)
-    nokogiri (1.13.4-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.13.4-x86_64-linux)
+    nokogiri (1.13.6-x64-mingw32)
       racc (~> 1.4)
     oj (3.13.11)
     opensearch-api (1.0.0)
@@ -335,7 +328,7 @@ DEPENDENCIES
   jmespath (= 1.6.1)
   mini_portile2 (= 2.8.0)
   msgpack (= 1.5.1)
-  nokogiri (= 1.13.4)
+  nokogiri (= 1.13.6)
   oj (= 3.13.11)
   opensearch-ruby (= 1.0.0)
   prometheus-client (= 2.1.0)