fluent-plugin-http-pull 0.7.0 → 0.8.1

data/test/plugin/test_in_http_pull_request_method.rb

@@ -1,79 +1,79 @@
-require "helper"
-require "fluent/plugin/in_http_pull.rb"
-
-require 'ostruct'
-
-class HttpPullInputTestRequestMethod < Test::Unit::TestCase
-  @stub_server = nil
-
-  setup do
-    @stub_server = StubServer.new
-    @stub_server.start
-  end
-
-  teardown do
-    @stub_server.shutdown
-  end
-
-  sub_test_case "request method" do
-    TEST_INTERVAL_3_POST = %[
-      tag test
-      url http://127.0.0.1:3939/method_post
-
-      interval 3s
-      format json
-      http_method post
-    ]
-
-    TEST_INTERVAL_3_DELETE = %[
-      tag test
-      url http://127.0.0.1:3939/method_delete
-
-      interval 3s
-      format json
-      http_method delete
-    ]
-
-    test 'interval 3 with :post' do
-      d = create_driver TEST_INTERVAL_3_POST
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal({"url"=>"http://127.0.0.1:3939/method_post","status"=>200, "message"=>{"status"=>"OK"}}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
-    end
-
-    test 'interval 3 with :delete' do
-      d = create_driver TEST_INTERVAL_3_DELETE
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal({"url"=>"http://127.0.0.1:3939/method_delete","status"=>200, "message"=>{"status"=>"OK"}}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
-    end
-  end
-
-  private
-
-  def create_driver(conf)
-    Fluent::Test::Driver::Input.new(Fluent::Plugin::HttpPullInput).configure(conf)
-  end
-end
+require "helper"
+require "fluent/plugin/in_http_pull.rb"
+
+require 'ostruct'
+
+class HttpPullInputTestRequestMethod < Test::Unit::TestCase
+  @stub_server = nil
+
+  setup do
+    @stub_server = StubServer.new
+    @stub_server.start
+  end
+
+  teardown do
+    @stub_server.shutdown
+  end
+
+  sub_test_case "request method" do
+    TEST_INTERVAL_3_POST = %[
+      tag test
+      url http://localhost:3939/method_post
+
+      interval 3s
+      format json
+      http_method post
+    ]
+
+    TEST_INTERVAL_3_DELETE = %[
+      tag test
+      url http://localhost:3939/method_delete
+
+      interval 3s
+      format json
+      http_method delete
+    ]
+
+    test 'interval 3 with :post' do
+      d = create_driver TEST_INTERVAL_3_POST
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://localhost:3939/method_post","status"=>200, "message"=>{"status"=>"OK"}}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+
+    test 'interval 3 with :delete' do
+      d = create_driver TEST_INTERVAL_3_DELETE
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://localhost:3939/method_delete","status"=>200, "message"=>{"status"=>"OK"}}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+  end
+
+  private
+
+  def create_driver(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::HttpPullInput).configure(conf)
+  end
+end

data/test/plugin/test_in_http_pull_ssl.rb

@@ -0,0 +1,173 @@
+require "helper"
+require "fluent/plugin/in_http_pull.rb"
+
+require 'ostruct'
+
+class HttpPullInputTestSSLBasic < Test::Unit::TestCase
+  @stub_server = nil
+
+  setup do
+    @stub_server = StubServer.new(4040, true)
+    @stub_server.start
+  end
+
+  teardown do
+    @stub_server.shutdown
+  end
+
+  sub_test_case "remote has valid ssl cert" do
+    TEST_INTERVAL_3_VALID_SSL_CONFIG = %[
+      tag test
+      url https://www.google.com
+
+      interval 3s
+      format none
+      status_only true
+    ]
+
+    # test 'interval 3' do
+    #   d = create_driver TEST_INTERVAL_3_VALID_SSL_CONFIG
+    #   assert_equal("test", d.instance.tag)
+    #   assert_equal(3, d.instance.interval)
+
+    #   d.run(timeout: 8) do
+    #     sleep 7
+    #   end
+    #   assert_equal(2, d.events.size)
+
+    #   d.events.each do |tag, time, record|
+    #     assert_equal("test", tag)
+
+    #     assert_equal({"url"=>"https://www.google.com","status"=>200}, record)
+    #     assert(time.is_a?(Fluent::EventTime))
+    #   end
+    # end
+  end
+
+  sub_test_case "remote has self-signed ssl cert" do
+    TEST_INTERVAL_3_CONFIG = %[
+      tag test
+      url https://localhost:4040
+
+      interval 3s
+      format none
+      status_only true
+    ]
+
+    TEST_INTERVAL_3_VERIFY_FALSE_CONFIG = %[
+      tag test
+      url https://localhost:4040
+
+      interval 3s
+      format none
+      status_only true
+      verify_ssl false
+    ]
+
+    TEST_INTERVAL_3_CA_CONFIG = %[
+      tag test
+      url https://localhost:4040
+
+      interval 3s
+      format none
+      status_only true
+      ca_path #{Dir.pwd}/test/helper/.ssl
+      ca_file #{Dir.pwd}/test/helper/.ssl/server.crt
+    ]
+
+    TEST_INTERVAL_3_INVALID_CA_CONFIG = %[
+      tag test
+      url https://localhost:4040
+
+      interval 3s
+      format none
+      status_only true
+      ca_path #{Dir.pwd}/test/helper/.ssl_not_exist
+      ca_file #{Dir.pwd}/test/helper/.ssl_not_exist/server.crt
+    ]
+
+    test 'should be fail with no ssl options' do
+      d = create_driver TEST_INTERVAL_3_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal("https://localhost:4040", record["url"])
+        assert(time.is_a?(Fluent::EventTime))
+
+        assert_equal(0, record["status"])
+        assert_not_nil(record["error"])
+      end
+    end
+
+    test 'should be success with verify_ssl false' do
+      d = create_driver TEST_INTERVAL_3_VERIFY_FALSE_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"https://localhost:4040","status"=>200}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+
+    test 'should be success with valid ca options' do
+      d = create_driver TEST_INTERVAL_3_CA_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"https://localhost:4040","status"=>200}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+
+    test 'should be fail with invalid ca options' do
+      d = create_driver TEST_INTERVAL_3_INVALID_CA_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal("https://localhost:4040", record["url"])
+        assert(time.is_a?(Fluent::EventTime))
+
+        assert_equal(0, record["status"])
+        assert_not_nil(record["error"])
+      end
+    end
+  end
+
+  private
+
+  def create_driver(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::HttpPullInput).configure(conf)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-http-pull
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - filepang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -144,6 +144,11 @@ files:
 - fluent-plugin-http-pull.gemspec
 - lib/fluent/plugin/in_http_pull.rb
 - test/helper.rb
+- test/helper/.ssl/README
+- test/helper/.ssl/server.crt
+- test/helper/.ssl/server.csr
+- test/helper/.ssl/server.key
+- test/helper/.ssl/server.key.org
 - test/helper/stub_proxy.rb
 - test/helper/stub_server.rb
 - test/plugin/test_in_http_pull.rb
@@ -152,6 +157,7 @@ files:
 - test/plugin/test_in_http_pull_http_header.rb
 - test/plugin/test_in_http_pull_proxy.rb
 - test/plugin/test_in_http_pull_request_method.rb
+- test/plugin/test_in_http_pull_ssl.rb
 homepage: https://github.com/HatsuneMiku3939/fluent-plugin-http-pull
 licenses:
 - Apache-2.0
@@ -178,6 +184,11 @@ specification_version: 4
 summary: fluent-plugin-http-pull
 test_files:
 - test/helper.rb
+- test/helper/.ssl/README
+- test/helper/.ssl/server.crt
+- test/helper/.ssl/server.csr
+- test/helper/.ssl/server.key
+- test/helper/.ssl/server.key.org
 - test/helper/stub_proxy.rb
 - test/helper/stub_server.rb
 - test/plugin/test_in_http_pull.rb
@@ -186,3 +197,4 @@ test_files:
 - test/plugin/test_in_http_pull_http_header.rb
 - test/plugin/test_in_http_pull_proxy.rb
 - test/plugin/test_in_http_pull_request_method.rb
+- test/plugin/test_in_http_pull_ssl.rb