fluent-plugin-syslog_rfc5424 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d18ce4a652bcc4290cc9dacb98e7b6d8c05d7d8d
-  data.tar.gz: 9f8bcbc47850d81ebaee276d454efb2efb889972
+  metadata.gz: ee4be79798fa377cdaa6f46eac5164605a6e776f
+  data.tar.gz: c2bcd1dbd5ad4a831aa0e5f41dbd7817fd2e9620
 SHA512:
-  metadata.gz: 8368f0f1c15eb5f06733f0741d1014e9f30f875fd9abad9891d9c8012095346c76727c1a0514ef759f0c8ac9c6a41895d67d16888e872ca15086c418ab08f338
-  data.tar.gz: a2fbeccef2c610298a71368e2fe646db1c2d54394fb666f1d0f57c452455618be6bd2013ae1e62039a705683f59ed4f74ddc67eb7db5c89a8240a08af297b0d7
+  metadata.gz: d49f27b105429bbb813a503f67cbdba4ef88b3a9767d26f5a072905f53f5639ed235b28bbc3e6971535675ede46cbad0275da8ef933ea0db9af5938f9f91ea03
+  data.tar.gz: ef36eedddc6089415d4b5704e2ec7df02498923268571dfbc1ee833bb2f7c8fe958e9b1518b13d75e540ddca624eabb0c83861143a4168c25ec925b61c072106

data/fluent-plugin-syslog_rfc5424.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-syslog_rfc5424"
-  spec.version       = "0.4.0"
+  spec.version       = "0.5.1"
   spec.authors       = ["Pivotal"]
   spec.email         = %w(cf-loggregator@pivotal.io)
   spec.homepage      = "https://github.com/cloudfoundry/fluent-plugin-syslog_rfc5424"

data/lib/fluent/plugin/out_syslog_rfc5424.rb

@@ -12,6 +12,7 @@ module Fluent
       config_param :port, :integer
       config_param :transport, :string, default: "tls"
       config_param :insecure, :bool, default: false
+      config_param :trusted_ca_path, :string, default: nil
       config_section :format do
         config_set_default :@type, DEFAULT_FORMATTER
         config_set_default :rfc6587_message_size, true
@@ -49,7 +50,7 @@ module Fluent
       def socket_options
         return {} unless @transport == 'tls'
 
-        { insecure: @insecure, verify_fqdn: !@insecure }
+        { insecure: @insecure, verify_fqdn: !@insecure, cert_paths: @trusted_ca_path }
       end
 
       def socket_key(transport, host, port)

data/test/plugin/out_syslog_rfc5424_spec.rb

@@ -35,7 +35,7 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
     stub(socket).close
 
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
-      mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>false, :verify_fqdn=>true}).returns(socket)
+      mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>false, :verify_fqdn=>true, :cert_paths=>nil}).returns(socket)
     end
 
     output_driver.run do
@@ -78,7 +78,29 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
     stub(socket).close
 
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
-      mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>true, :verify_fqdn=>false}).returns(socket)
+      mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>true, :verify_fqdn=>false, :cert_paths=>nil}).returns(socket)
+    end
+
+    output_driver.run do
+      output_driver.feed("tag", @time, {"log" => "hi"})
+    end
+  end
+
+  def test_secure_tls
+    output_driver = create_driver %(
+      @type syslog_rfc5424
+      host example.com
+      port 123
+      transport tls
+      trusted_ca_path supertrustworthy
+    )
+
+    socket = Minitest::Mock.new
+    mock(socket).puts(@formatted_log)
+    stub(socket).close
+
+    any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
+      mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>false, :verify_fqdn=>true, :cert_paths=>"supertrustworthy"}).returns(socket)
     end
 
     output_driver.run do
@@ -97,7 +119,7 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
     stub(socket).puts(@formatted_log)
 
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
-      mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>false, :verify_fqdn=>true}).returns(socket)
+      mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>false, :verify_fqdn=>true, :cert_paths=>nil}).returns(socket)
     end
 
     mock(socket).close

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog_rfc5424
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Pivotal