fluent-plugin-sumologic-cloud-syslog 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aea561a27d8d9487e788c66ea0663be108d8e1b
-  data.tar.gz: 7dbdccd19c99e6ba0d819f05e516b6b15c5a08e8
+  metadata.gz: cc1578a36f862ac01507d453ca8350c60372efd6
+  data.tar.gz: 5b70bff66226ac8825fbd755905933a3cfca92ff
 SHA512:
-  metadata.gz: 1319e8199d055e436df2945b99f08167cb193eb53cac0fd8a5e7a64764276bad8bb90828035f2b3092794c6dfc9c29862c06ec0d81db6495720b0843c2aa15da
-  data.tar.gz: b24bd65e7710d54a4a504be9a0dd674121ad10ce91d5ce052811814a0f1252d6319f8fa9823f9fe5153a5dd1753534bda404a3de2bf6482ab9e5d83600e214e8
+  metadata.gz: 2bf21eb35786fcf3c0ee842afdcc5f62ae8ac668f530f7e44a9c633cb4d6a27af7ead09473cf3ae647a6545a2bfd0b4c327e33b56418fe4d1e9bab54027c5b2f
+  data.tar.gz: 61f2320b80887d030696e36f7931519550a32777bfb6414a8f5bb94322f816f26e7055ebe8db63aef81b24ec2f7db1aa99c15c5a66fb64e27fe37231f21f3025

data/fluent-plugin-sumologic-cloud-syslog.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'fluent-mixin-plaintextformatter', '~> 0.2'
 
   s.add_development_dependency 'minitest', '~> 5.8'
+  s.add_development_dependency 'minitest-stub_any_instance', '~> 1.0.0'
   s.add_development_dependency 'rake', '~> 10.5'
   s.add_development_dependency 'test-unit', '~> 3.1'
   s.add_development_dependency 'webmock', '~> 2.0'

data/lib/sumologic_cloud_syslog/ssl_transport.rb

@@ -35,6 +35,11 @@ module SumologicCloudSyslog
     end
 
     def connect
+      @socket = get_ssl_connection
+      @socket.connect
+    end
+
+    def get_ssl_connection
       tcp = TCPSocket.new(host, port)
 
       ctx = OpenSSL::SSL::SSLContext.new
@@ -43,9 +48,7 @@ module SumologicCloudSyslog
 
       ctx.cert = OpenSSL::X509::Certificate.new(File.open(cert)) if cert
       ctx.key = OpenSSL::PKey::RSA.new(File.open(key)) if key
-
-      @socket = OpenSSL::SSL::SSLSocket.new(tcp, ctx)
-      @socket.connect
+      OpenSSL::SSL::SSLSocket.new(tcp, ctx)
     end
 
     # Allow to retry on failed writes
@@ -54,7 +57,7 @@ module SumologicCloudSyslog
         retry_id ||= 0
         @socket.send(:write, s)
       rescue => e
-        if (retry_id += 1) < retries
+        if (retry_id += 1) < @retries
           connect
           retry
         else

data/lib/sumologic_cloud_syslog/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module SumologicCloudSyslog
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/test/fluent/test_out_sumologic_cloud_syslog.rb

@@ -13,11 +13,12 @@
 # limitations under the License.
 
 require 'helper'
+require 'ssl'
 require 'date'
 require 'minitest/mock'
 require 'fluent/plugin/out_sumologic_cloud_syslog'
 
-class SumologicCloudSyslogOutput < Test::Unit::TestCase
+class SumologicCloudSyslogOutput < SSLTest
   def setup
     Fluent::Test.setup
     @driver = nil
@@ -135,4 +136,39 @@ class SumologicCloudSyslogOutput < Test::Unit::TestCase
 
     assert_true logger.transport.string.start_with?("<128>1")
   end
+
+  def test_ssl
+    time = Time.now
+    record = sample_record
+    formatted_time = time.dup.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+
+    server = ssl_server
+    st = Thread.new {
+        client = server.accept
+        assert_equal client.gets, "<134>1 #{time.to_datetime.rfc3339} host app #{$$} 1000 [1234567890] #{formatted_time}\ttest\t#{record.to_json.to_s}\n"
+        client.close
+    }
+
+    config = %{
+      host   localhost
+      port   #{server.addr[1]}
+      cert
+      key
+      token  1234567890
+      hostname_key hostname
+      procid_key procid
+      app_name_key app_name
+      msgid_key msgid
+    }
+    instance = driver('test', config).instance
+
+    chain = Minitest::Mock.new
+    chain.expect(:next, nil)
+
+    SumologicCloudSyslog::SSLTransport.stub_any_instance(:get_ssl_connection, ssl_client) do
+      instance.emit('test', {time.to_i => record}, chain)
+    end
+
+    st.join
+  end
 end

data/test/helper.rb

@@ -28,6 +28,7 @@ end
 require 'test/unit'
 require 'fluent/test'
 require 'minitest/pride'
+require 'minitest/stub_any_instance'
 
 require 'webmock/test_unit'
 WebMock.disable_net_connect!

data/test/ssl.rb

@@ -0,0 +1,53 @@
+require 'socket'
+require 'openssl'
+
+class SSLTest < Test::Unit::TestCase
+    def ssl_server
+        @ssl_server ||= begin
+            tcp_server = TCPServer.new("localhost", 33000 + Random.rand(1000))
+            ssl_context = OpenSSL::SSL::SSLContext.new
+            ssl_context.cert = certificate
+            ssl_context.key = rsa_key
+            OpenSSL::SSL::SSLServer.new(tcp_server, ssl_context)
+        end
+    end
+
+    def ssl_client
+      tcp = TCPSocket.new("localhost", ssl_server.addr[1])
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.set_params(verify_mode: OpenSSL::SSL::VERIFY_NONE)
+      ctx.cert = certificate
+      ctx.key = rsa_key
+      OpenSSL::SSL::SSLSocket.new(tcp, ctx)
+    end
+
+    def rsa_key
+        @rsa_key ||= OpenSSL::PKey::RSA.new(2048)
+    end
+
+    def certificate
+        @cert ||= begin
+            subject = "/C=BE/O=Test/OU=Test/CN=Test"
+
+            @cert = OpenSSL::X509::Certificate.new
+            @cert.subject = @cert.issuer = OpenSSL::X509::Name.parse(subject)
+            @cert.not_before = Time.now
+            @cert.not_after = Time.now + 365 * 24 * 60 * 60
+            @cert.public_key = rsa_key.public_key
+            @cert.serial = 0x0
+            @cert.version = 2
+
+            ef = OpenSSL::X509::ExtensionFactory.new
+            ef.subject_certificate = @cert
+            ef.issuer_certificate = @cert
+            @cert.extensions = [
+                ef.create_extension("basicConstraints","CA:TRUE", true),
+                ef.create_extension("subjectKeyIdentifier", "hash"),
+                # ef.create_extension("keyUsage", "cRLSign,keyCertSign", true),
+            ]
+            @cert.add_extension ef.create_extension("authorityKeyIdentifier", "keyid:always,issuer:always")
+            @cert.sign(rsa_key, OpenSSL::Digest::SHA1.new)
+            @cert
+        end
+    end
+end

data/test/sumologic_cloud_syslog/test_ssl_transport.rb

@@ -0,0 +1,52 @@
+# Copyright 2016 Acquia, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'helper'
+require 'ssl'
+require 'sumologic_cloud_syslog/ssl_transport'
+
+class SSLTransport < SSLTest
+  def test_ok_connection
+    server = ssl_server
+    st = Thread.new {
+      client = server.accept
+      assert_equal client.gets, "TESTTEST2\n"
+      client.close
+    }
+    SumologicCloudSyslog::SSLTransport.stub_any_instance(:get_ssl_connection, ssl_client) do
+      t = SumologicCloudSyslog::SSLTransport.new("localhost", server.addr[1], max_retries: 3)
+      t.write("TEST")
+      t.write("TEST2\n")
+    end
+    st.join
+  end
+
+  def test_retry
+    client = Object.new
+    client.class.module_eval { attr_accessor :retries }
+    def client.connect
+      true
+    end
+    def client.write(s)
+      raise "Test"
+    end
+
+    SumologicCloudSyslog::SSLTransport.stub_any_instance(:get_ssl_connection, client) do
+      assert_raises RuntimeError do
+        t = SumologicCloudSyslog::SSLTransport.new("localhost", 33000, max_retries: 3)
+        t.write("TEST\n")
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sumologic-cloud-syslog
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Acquia Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.8'
+- !ruby/object:Gem::Dependency
+  name: minitest-stub_any_instance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -149,8 +163,10 @@ files:
 - lib/sumologic_cloud_syslog/version.rb
 - test/fluent/test_out_sumologic_cloud_syslog.rb
 - test/helper.rb
+- test/ssl.rb
 - test/sumologic_cloud_syslog/test_logger.rb
 - test/sumologic_cloud_syslog/test_protocol.rb
+- test/sumologic_cloud_syslog/test_ssl_transport.rb
 homepage: https://github.com/acquia/fluent-plugin-sumologic-cloud-syslog
 licenses:
 - Apache v2
@@ -178,6 +194,7 @@ summary: Fluent Sumologic Cloud Syslog plugin
 test_files:
 - test/fluent/test_out_sumologic_cloud_syslog.rb
 - test/helper.rb
+- test/ssl.rb
 - test/sumologic_cloud_syslog/test_logger.rb
 - test/sumologic_cloud_syslog/test_protocol.rb
-has_rdoc: 
+- test/sumologic_cloud_syslog/test_ssl_transport.rb