fluentd 1.10.0 → 1.11.0

data/test/test_daemonizer.rb

@@ -0,0 +1,91 @@
+require_relative 'helper'
+require 'fluent/daemonizer'
+
+class DaemonizerTest < ::Test::Unit::TestCase
+  TMP_DIR = File.join(File.dirname(__FILE__), 'tmp', 'daemonizer')
+
+  setup do
+    FileUtils.mkdir_p(TMP_DIR)
+  end
+
+  teardown do
+    FileUtils.rm_rf(TMP_DIR) rescue nil
+  end
+
+  test 'makes pid file' do
+    pid_path = File.join(TMP_DIR, 'file.pid')
+
+    mock(Process).daemon(anything, anything).once
+    r = Fluent::Daemonizer.daemonize(pid_path) { 'ret' }
+    assert_equal 'ret', r
+    assert File.exist?(pid_path)
+    assert Process.pid.to_s, File.read(pid_path).to_s
+  end
+
+  test 'in platforms which do not support fork' do
+    pid_path = File.join(TMP_DIR, 'file.pid')
+
+    mock(Process).daemon(anything, anything) { raise NotImplementedError }
+    args = ['-c', 'test.conf']
+    mock(Process).spawn(anything, *args) { Process.pid }
+
+    Fluent::Daemonizer.daemonize(pid_path, args) { 'ret' }
+    assert File.exist?(pid_path)
+    assert Process.pid.to_s, File.read(pid_path).to_s
+  end
+
+  sub_test_case 'when pid file already exists' do
+    test 'raise an error when process is running' do
+      omit 'chmod of file does not affetct root user' if Process.uid.zero?
+      pid_path = File.join(TMP_DIR, 'file.pid')
+      File.write(pid_path, '1')
+
+      mock(Process).daemon(anything, anything).never
+      mock(Process).kill(0, 1).once
+
+      assert_raise(Fluent::ConfigError.new('pid(1) is running')) do
+        Fluent::Daemonizer.daemonize(pid_path) { 'ret' }
+      end
+    end
+
+    test 'raise an error when file is not redable' do
+      omit 'chmod of file does not affetct root user' if Process.uid.zero?
+      not_readable_path = File.join(TMP_DIR, 'not_readable.pid')
+
+      File.write(not_readable_path, '1')
+      FileUtils.chmod(0333, not_readable_path)
+
+      mock(Process).daemon(anything, anything).never
+      assert_raise(Fluent::ConfigError.new("Cannot access pid file: #{File.absolute_path(not_readable_path)}")) do
+        Fluent::Daemonizer.daemonize(not_readable_path) { 'ret' }
+      end
+    end
+
+    test 'raise an error when file is not writable' do
+      omit 'chmod of file does not affetct root user' if Process.uid.zero?
+      not_writable_path = File.join(TMP_DIR, 'not_writable.pid')
+
+      File.write(not_writable_path, '1')
+      FileUtils.chmod(0555, not_writable_path)
+
+      mock(Process).daemon(anything, anything).never
+      assert_raise(Fluent::ConfigError.new("Cannot access pid file: #{File.absolute_path(not_writable_path)}")) do
+        Fluent::Daemonizer.daemonize(not_writable_path) { 'ret' }
+      end
+    end
+
+    test 'raise an error when directory is not writable' do
+      omit 'chmod of file does not affetct root user' if Process.uid.zero?
+      not_writable_dir = File.join(TMP_DIR, 'not_writable')
+      pid_path = File.join(not_writable_dir, 'file.pid')
+
+      FileUtils.mkdir_p(not_writable_dir)
+      FileUtils.chmod(0555, not_writable_dir)
+
+      mock(Process).daemon(anything, anything).never
+      assert_raise(Fluent::ConfigError.new("Cannot access directory for pid file: #{File.absolute_path(not_writable_dir)}")) do
+        Fluent::Daemonizer.daemonize(pid_path) { 'ret' }
+      end
+    end
+  end
+end

data/test/test_log.rb

@@ -367,6 +367,50 @@ class LogTest < Test::Unit::TestCase
     end
   end
 
+  sub_test_case "ignore_repeated_log_interval" do
+    def test_same_message
+      message = "This is test"
+      logger = ServerEngine::DaemonLogger.new(@log_device, {log_level: ServerEngine::DaemonLogger::INFO})
+      log = Fluent::Log.new(logger, {ignore_repeated_log_interval: 5})
+
+      log.error message
+      10.times { |i|
+        Timecop.freeze(@timestamp + i)
+        log.error message
+      }
+
+      expected = [
+        "2016-04-21 02:58:41 +0000 [error]: This is test\n",
+        "2016-04-21 02:58:47 +0000 [error]: This is test\n"
+      ]
+      assert_equal(expected, log.out.logs)
+    end
+
+    def test_different_message
+      message = "This is test"
+      logger = ServerEngine::DaemonLogger.new(@log_device, {log_level: ServerEngine::DaemonLogger::INFO})
+      log = Fluent::Log.new(logger, {ignore_repeated_log_interval: 10})
+
+      log.error message
+      3.times { |i|
+        Timecop.freeze(@timestamp + i)
+        log.error message
+        log.error message
+        log.info "Hello! " + message
+      }
+
+      expected = [
+        "2016-04-21 02:58:41 +0000 [error]: This is test\n",
+        "2016-04-21 02:58:41 +0000 [info]: Hello! This is test\n",
+        "2016-04-21 02:58:42 +0000 [error]: This is test\n",
+        "2016-04-21 02:58:42 +0000 [info]: Hello! This is test\n",
+        "2016-04-21 02:58:43 +0000 [error]: This is test\n",
+        "2016-04-21 02:58:43 +0000 [info]: Hello! This is test\n",
+      ]
+      assert_equal(expected, log.out.logs)
+    end
+  end
+
   def test_dup
     dl_opts = {}
     dl_opts[:log_level] = ServerEngine::DaemonLogger::TRACE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -384,6 +384,7 @@ files:
 - bin/fluent-plugin-generate
 - bin/fluentd
 - code-of-conduct.md
+- docs/SECURITY_AUDIT.pdf
 - example/copy_roundrobin.conf
 - example/counter.conf
 - example/filter_stdout.conf
@@ -476,6 +477,7 @@ files:
 - lib/fluent/counter/store.rb
 - lib/fluent/counter/validator.rb
 - lib/fluent/daemon.rb
+- lib/fluent/daemonizer.rb
 - lib/fluent/engine.rb
 - lib/fluent/env.rb
 - lib/fluent/error.rb
@@ -801,6 +803,10 @@ files:
 - test/plugin_helper/data/cert/cert-with-CRLF.pem
 - test/plugin_helper/data/cert/cert-with-no-newline.pem
 - test/plugin_helper/data/cert/cert.pem
+- test/plugin_helper/data/cert/cert_chains/ca-cert-key.pem
+- test/plugin_helper/data/cert/cert_chains/ca-cert.pem
+- test/plugin_helper/data/cert/cert_chains/cert-key.pem
+- test/plugin_helper/data/cert/cert_chains/cert.pem
 - test/plugin_helper/data/cert/generate_cert.rb
 - test/plugin_helper/data/cert/with_ca/ca-cert-key-pass.pem
 - test/plugin_helper/data/cert/with_ca/ca-cert-key.pem
@@ -832,6 +838,7 @@ files:
 - test/plugin_helper/test_retry_state.rb
 - test/plugin_helper/test_server.rb
 - test/plugin_helper/test_service_discovery.rb
+- test/plugin_helper/test_socket.rb
 - test/plugin_helper/test_storage.rb
 - test/plugin_helper/test_thread.rb
 - test/plugin_helper/test_timer.rb
@@ -845,6 +852,7 @@ files:
 - test/test_clock.rb
 - test/test_config.rb
 - test/test_configdsl.rb
+- test/test_daemonizer.rb
 - test/test_engine.rb
 - test/test_event.rb
 - test/test_event_router.rb
@@ -1028,6 +1036,10 @@ test_files:
 - test/plugin_helper/data/cert/cert-with-CRLF.pem
 - test/plugin_helper/data/cert/cert-with-no-newline.pem
 - test/plugin_helper/data/cert/cert.pem
+- test/plugin_helper/data/cert/cert_chains/ca-cert-key.pem
+- test/plugin_helper/data/cert/cert_chains/ca-cert.pem
+- test/plugin_helper/data/cert/cert_chains/cert-key.pem
+- test/plugin_helper/data/cert/cert_chains/cert.pem
 - test/plugin_helper/data/cert/generate_cert.rb
 - test/plugin_helper/data/cert/with_ca/ca-cert-key-pass.pem
 - test/plugin_helper/data/cert/with_ca/ca-cert-key.pem
@@ -1059,6 +1071,7 @@ test_files:
 - test/plugin_helper/test_retry_state.rb
 - test/plugin_helper/test_server.rb
 - test/plugin_helper/test_service_discovery.rb
+- test/plugin_helper/test_socket.rb
 - test/plugin_helper/test_storage.rb
 - test/plugin_helper/test_thread.rb
 - test/plugin_helper/test_timer.rb
@@ -1072,6 +1085,7 @@ test_files:
 - test/test_clock.rb
 - test/test_config.rb
 - test/test_configdsl.rb
+- test/test_daemonizer.rb
 - test/test_engine.rb
 - test/test_event.rb
 - test/test_event_router.rb