fluent-plugin-scalyr 0.8.7 → 0.8.12

data/test/test_handle_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Scalyr Output Plugin for Fluentd
 #
@@ -15,76 +17,73 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require "helper"
+require "flexmock/test_unit"
 
-require 'helper'
-require 'flexmock/test_unit'
-
+# rubocop:disable Layout/LineLength
 class HandleResponseTest < Scalyr::ScalyrOutTest
-
   def test_handle_response_missing_status
     d = create_driver
-    response = flexmock( Net::HTTPResponse, :code => '200', :body =>'{ "message":"An invalid message" }'  )
-    exception = assert_raise( Scalyr::ServerError, "Server error not raised for missing status" ) {
-      d.instance.handle_response( response )
+    response = flexmock(Net::HTTPResponse, code: "200", body: '{ "message":"An invalid message" }')
+    exception = assert_raise(Scalyr::ServerError, "Server error not raised for missing status") {
+      d.instance.handle_response(response)
     }
 
-    assert_equal( "JSON response does not contain status message", exception.message )
+    assert_equal("JSON response does not contain status message", exception.message)
   end
 
   def test_handle_response_discard_buffer
     d = create_driver
-    response = flexmock( Net::HTTPResponse, :code => '200', :body =>'{ "message":"An invalid message", "status":"error/server/discardBuffer" }'  )
-    logger = flexmock( $log )
-    logger.should_receive( :warn ).with( /buffer dropped/i )
-    assert_nothing_raised( Scalyr::ServerError, Scalyr::ClientError, "Nothing should be raised when discarding the buffer" ) {
-      d.instance.handle_response( response )
+    response = flexmock(Net::HTTPResponse, code: "200", body: '{ "message":"An invalid message", "status":"error/server/discardBuffer" }')
+    logger = flexmock($log)
+    logger.should_receive(:warn).once.with(/buffer dropped/i)
+    assert_nothing_raised(Scalyr::ServerError, Scalyr::ClientError, "Nothing should be raised when discarding the buffer") {
+      d.instance.handle_response(response)
     }
-
   end
 
   def test_handle_response_unknown_error
     d = create_driver
-    response = flexmock( Net::HTTPResponse, :code => '200', :body =>'{ "message":"An invalid message", "status":"error/other" }'  )
-    exception = assert_raise( Scalyr::ServerError, "Server error not raised for error status" ) {
-      d.instance.handle_response( response )
+    response = flexmock(Net::HTTPResponse, code: "200", body: '{ "message":"An invalid message", "status":"error/other" }')
+    exception = assert_raise(Scalyr::ServerError, "Server error not raised for error status") {
+      d.instance.handle_response(response)
     }
-    assert_equal( "error/other", exception.message )
+    assert_equal("error/other", exception.message)
   end
 
   def test_handle_response_client_error
     d = create_driver
-    response = flexmock( Net::HTTPResponse, :code => '200', :body =>'{ "message":"An invalid message", "status":"error/client/test" }'  )
-    exception = assert_raise( Scalyr::ClientError, "Client  error not raised for error status" ) {
-      d.instance.handle_response( response )
+    response = flexmock(Net::HTTPResponse, code: "200", body: '{ "message":"An invalid message", "status":"error/client/test" }')
+    exception = assert_raise(Scalyr::ClientError, "Client  error not raised for error status") {
+      d.instance.handle_response(response)
     }
-    assert_equal( "error/client/test", exception.message )
+    assert_equal("error/client/test", exception.message)
   end
 
   def test_handle_response_server_error
     d = create_driver
-    response = flexmock( Net::HTTPResponse, :code => '200', :body =>'{ "message":"An invalid message", "status":"error/server/test" }'  )
-    exception = assert_raise( Scalyr::ServerError, "Server error not raised for error status" ) {
-      d.instance.handle_response( response )
+    response = flexmock(Net::HTTPResponse, code: "200", body: '{ "message":"An invalid message", "status":"error/server/test" }')
+    exception = assert_raise(Scalyr::ServerError, "Server error not raised for error status") {
+      d.instance.handle_response(response)
     }
-    assert_equal( "error/server/test", exception.message )
+    assert_equal("error/server/test", exception.message)
   end
 
   def test_handle_response_code_4xx
     d = create_driver
-    response = flexmock( Net::HTTPResponse, :code => '404', :body =>'{ "status":"error/server/fileNotFound" }'  )
-    exception = assert_raise( Scalyr::Client4xxError, "No 4xx exception raised" ) {
-      d.instance.handle_response( response )
+    response = flexmock(Net::HTTPResponse, code: "404", body: '{ "status":"error/server/fileNotFound" }')
+    exception = assert_raise(Scalyr::Client4xxError, "No 4xx exception raised") {
+      d.instance.handle_response(response)
     }
-    assert_equal( "error/server/fileNotFound", exception.message )
+    assert_equal("error/server/fileNotFound", exception.message)
   end
 
   def test_handle_response_code_200
     d = create_driver
-    response = flexmock( Net::HTTPResponse, :code => '200', :body =>'{ "status":"success" }'  )
-    exception = assert_nothing_raised( Scalyr::ServerError, Scalyr::ClientError, "Error raised on success" ) {
-      d.instance.handle_response( response )
+    response = flexmock(Net::HTTPResponse, code: "200", body: '{ "status":"success" }')
+    assert_nothing_raised(Scalyr::ServerError, Scalyr::ClientError, "Error raised on success") {
+      d.instance.handle_response(response)
     }
   end
-
 end
-
+# rubocop:enable Layout/LineLength

data/test/test_ssl_verify.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Scalyr Output Plugin for Fluentd
 #
@@ -15,21 +17,110 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-require 'helper'
+require "helper"
+require "flexmock/test_unit"
 
 class SSLVerifyTest < Scalyr::ScalyrOutTest
+  def test_good_ssl_certificates
+    d = create_driver CONFIG
+
+    d.run(default_tag: "test") do
+      time = event_time("2015-04-01 10:00:00 UTC")
+      d.feed(time, {"a" => 1})
+
+      logger = flexmock($log)
+      logger.should_receive(:warn).times(0).with(/certificate verification failed/i)
+      logger.should_receive(:warn).times(0).with(/certificate verify failed/i)
+      logger.should_receive(:warn).once.with(/discarding buffer/i)
+    end
+  end
+
+  def test_no_ssl_certificates
+    d = create_driver %(
+      api_write_token test_token
+    )
+
+    d.run(default_tag: "test") do
+      time = event_time("2015-04-01 10:00:00 UTC")
+      d.feed(time, {"a" => 1})
+
+      logger = flexmock($log)
+      logger.should_receive(:warn).times(0).with(/certificate verification failed/i)
+      logger.should_receive(:warn).times(0).with(/certificate verify failed/i)
+      logger.should_receive(:warn).once.with(/discarding buffer/i)
+    end
+  end
+
   def test_bad_ssl_certificates
-    d = create_driver CONFIG + 'ssl_ca_bundle_path /home/invalid'
+    d = create_driver CONFIG + "ssl_ca_bundle_path /home/invalid"
+
+    d.run(default_tag: "test") do
+      time = event_time("2015-04-01 10:00:00 UTC")
+      d.feed(time, {"a" => 1})
+
+      logger = flexmock($log)
+      logger.should_receive(:warn).once.with(/certificate verification failed/i)
+      logger.should_receive(:warn).once.with(/certificate verify failed/i)
+      logger.should_receive(:warn).once.with(/discarding buffer/i)
+    end
+  end
+
+  def test_bad_system_ssl_certificates
+    `sudo mv #{OpenSSL::X509::DEFAULT_CERT_FILE} /tmp/system_cert.pem`
+    `sudo mv #{OpenSSL::X509::DEFAULT_CERT_DIR} /tmp/system_certs`
+
+    begin
+      d = create_driver %(
+        api_write_token test_token
+      )
+
+      d.run(default_tag: "test") do
+        time = event_time("2015-04-01 10:00:00 UTC")
+        d.feed(time, {"a" => 1})
+
+        logger = flexmock($log)
+        logger.should_receive(:warn).once.with(/certificate verification failed/i)
+        logger.should_receive(:warn).once.with(/certificate verify failed/i)
+        logger.should_receive(:warn).once.with(/discarding buffer/i)
+      end
+    ensure
+      `sudo mv /tmp/system_certs #{OpenSSL::X509::DEFAULT_CERT_DIR}`
+      `sudo mv /tmp/system_cert.pem #{OpenSSL::X509::DEFAULT_CERT_FILE}`
+    end
+  end
+
+  def test_hostname_verification
+    agent_scalyr_com_ip = `dig +short agent.scalyr.com 2> /dev/null | tail -n 1 | tr -d "\n"`
+    if agent_scalyr_com_ip.empty?
+      agent_scalyr_com_ip = `getent hosts agent.scalyr.com \
+      | awk '{ print $1 }' | tail -n 1 | tr -d "\n"`
+    end
+    mock_host = "invalid.mitm.should.fail.test.agent.scalyr.com"
+    etc_hosts_entry = "#{agent_scalyr_com_ip} #{mock_host}"
+    hosts_bkp = `sudo cat /etc/hosts`
+    hosts_bkp = hosts_bkp.chomp
+    # Add mock /etc/hosts entry and config scalyr_server entry
+    `echo "#{etc_hosts_entry}" | sudo tee -a /etc/hosts`
 
-    time = Time.parse("2015-04-01 10:00:00 UTC").to_i
-    d.emit( { "a" => 1 }, time )
+    begin
+      d = create_driver %(
+        api_write_token test_token
+        scalyr_server https://invalid.mitm.should.fail.test.agent.scalyr.com:443
+      )
 
-    logger = flexmock( $log )
-    logger.should_receive( :warn ).with( /certificate verification failed/i )
-    logger.should_receive( :warn ).with( /certificate verify failed/i )
-    logger.should_receive( :warn ).with( /discarding buffer/i )
+      d.run(default_tag: "test") do
+        time = event_time("2015-04-01 10:00:00 UTC")
+        d.feed(time, {"a" => 1})
 
-      d.run
+        logger = flexmock($log)
+        logger.should_receive(:warn).once.with(/certificate verification failed/i)
+        logger.should_receive(:warn).once.with(/certificate verify failed/i)
+        logger.should_receive(:warn).once.with(/discarding buffer/i)
+      end
+    ensure
+      # Clean up the hosts file
+      `sudo truncate -s 0 /etc/hosts`
+      `echo "#{hosts_bkp}" | sudo tee -a /etc/hosts`
+    end
   end
 end

data/test/test_utils.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+#
+# Scalyr Output Plugin for Fluentd
+#
+# Copyright (C) 2015 Scalyr, 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 "flexmock/test_unit"
+
+require "fluent/plugin/scalyr_utils"
+include Scalyr # rubocop:disable Style/MixinUsage
+
+module Scalyr
+  class UtilsTest < Test::Unit::TestCase
+    def test_sanitize_and_reencode_value_simple_types
+      # Simple value - string
+      result = sanitize_and_reencode_value("test foo")
+      assert_equal("test foo", result)
+
+      # Simple value - string with bad unicode sequences
+      result = sanitize_and_reencode_value("test \xC2 foo \xC2 bar")
+      assert_equal("test <?> foo <?> bar", result)
+
+      # Simple value - int
+      result = sanitize_and_reencode_value(100)
+      assert_equal(100, result)
+
+      # Simple value - nill
+      result = sanitize_and_reencode_value(nil)
+      assert_equal(nil, result)
+
+      # Simple value - bool
+      result = sanitize_and_reencode_value(true)
+      assert_equal(true, result)
+
+      result = sanitize_and_reencode_value(false)
+      assert_equal(false, result)
+    end
+
+    def test_sanitize_and_reencode_value_complex_nested_types
+      actual = [1, 2, "a", "b", nil, "7", "\xC2"]
+      expected = [1, 2, "a", "b", nil, "7", "<?>"]
+
+      result = sanitize_and_reencode_value(actual)
+      assert_equal(expected, result)
+
+      actual = [1, 2, "a", "b", nil, "7",
+                [8, 9, [10, "\xC2"]],
+                {"a" => 1, "b" => "\xC2"}]
+      expected = [1, 2, "a", "b", nil, "7",
+                  [8, 9, [10, "<?>"]],
+                  {"a" => 1, "b" => "<?>"}]
+
+      result = sanitize_and_reencode_value(actual)
+      assert_equal(expected, result)
+
+      actual = {
+        "a" => "1",
+        "b" => {
+          "c" => "\xC2",
+          "d" => "e",
+          "f" => nil,
+          "g" => {
+            "h" => "bar \xC2",
+            "b" => 3,
+            "l" => [1, 2, "foo\xC2", 3, 4, 5]
+          }
+        }
+      }
+      expected = {
+        "a" => "1",
+        "b" => {
+          "c" => "<?>",
+          "d" => "e",
+          "f" => nil,
+          "g" => {
+            "h" => "bar <?>",
+            "b" => 3,
+            "l" => [1, 2, "foo<?>", 3, 4, 5]
+          }
+        }
+      }
+      result = sanitize_and_reencode_value(actual)
+      assert_equal(expected, result)
+    end
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-scalyr
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.12
 platform: ruby
 authors:
 - Imron Alston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.25
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.25
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -30,20 +44,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.9.25
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.9.25
 - !ruby/object:Gem::Dependency
   name: rbzip2
   requirement: !ruby/object:Gem::Requirement
@@ -73,61 +73,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: flexmock
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Sends log data collected by fluentd to Scalyr (http://www.scalyr.com)
 email: imron@scalyr.com
 executables: []
@@ -143,12 +157,14 @@ files:
 - fluent-plugin-scalyr.gemspec
 - fluent.conf.sample
 - lib/fluent/plugin/out_scalyr.rb
-- lib/fluent/plugin/scalyr-exceptions.rb
+- lib/fluent/plugin/scalyr_exceptions.rb
+- lib/fluent/plugin/scalyr_utils.rb
 - test/helper.rb
 - test/test_config.rb
 - test/test_events.rb
 - test/test_handle_response.rb
 - test/test_ssl_verify.rb
+- test/test_utils.rb
 homepage: https://github.com/scalyr/scalyr-fluentd
 licenses:
 - Apache-2.0
@@ -168,14 +184,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Scalyr plugin for fluentd
 test_files:
-- test/test_events.rb
-- test/test_config.rb
 - test/helper.rb
+- test/test_events.rb
 - test/test_handle_response.rb
+- test/test_config.rb
+- test/test_utils.rb
 - test/test_ssl_verify.rb