fluent-plugin-out-http 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 433d2a376477171e9efc1b1413dafbfb5517018495967e3f1c59f9034aae2baf
-  data.tar.gz: 6705a5554d7080cfa7b32f85899b6184be19c2b9a40e97feec90161e903b3e41
+  metadata.gz: a3dfa31c31f15188b9975d34a9997f4ec9a5d2d7faa3d5a159689ab7f6e643f2
+  data.tar.gz: a33cf636b0f25ff45d8920de78c454eec77958e41fffd76adfd07e2b1cd0da53
 SHA512:
-  metadata.gz: '08dcfb49bbc1bf9d9b509e1bffc4e5774a0939a3653d58d3ddca98483654ba9a87d245c0c8bcef73551a907342e225950f72c9b0aba3bcedd4d6f27a5c209108'
-  data.tar.gz: a7853666a4a876981babd8288880d3ce1297267cf706777e5f40c922bd721d120969c50d590f342728778374a4a664b506fa4bd6b307ebdaaad273631401a5c8
+  metadata.gz: 02bfa51bd6026ee1370bc296a290002f85b6209361fa8707c0b065a7111c1d02bc36d78a43b498f36672454c4ee87bd789011dd07e049981ae4ed2a7e2dbe664
+  data.tar.gz: f5dd4c2646dfb524a14ef17db5d35858b4652ea15f7482a928f616a68936d7a0b222390e31094a9d9036b3f7e1f8ceaca6ab6e7811e87d27fb5764389e3d44bf

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.3.1
+### Added
+* Added plain text transport capability
+* Added specify cacert file for ssl verify
+
+## 0.3.0
+### Added
+* Support for jwt token authentication:
+
 ## 0.2.0
 ### Added
 * SSL is now supported if `endpoint_url` uses the `https` scheme (uses ruby-2.1 syntax internally)

data/README.md

@@ -16,6 +16,7 @@ A generic [fluentd][1] output plugin for sending logs to an HTTP endpoint.
       authentication  basic  # default: none
       username        alice  # default: ''
       password        bobpop # default: '', secret: true
+      cacert_file     /etc/ssl/endpoint1.cert # default: ''
       token           tokent # default: ''
     </match>
 

data/fluent-plugin-out-http.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-out-http"
-  gem.version       = "0.3.0"
+  gem.version       = "0.3.1"
   gem.authors       = ["Marica Odagaki"]
   gem.email         = ["ento.entotto@gmail.com"]
   gem.summary       = %q{A generic Fluentd output plugin to send logs to an HTTP endpoint}

data/lib/fluent/plugin/out_http.rb

@@ -27,6 +27,9 @@ class Fluent::HTTPOutput < Fluent::Output
   # Raise errors that were rescued during HTTP requests?
   config_param :raise_on_error, :bool, :default => true
 
+  # ca file to use for https request
+  config_param :cacert_file, :string, :default => ''
+
   # nil | 'none' | 'basic' | 'jwt' | 'bearer'
   config_param :authentication, :string, :default => nil
   config_param :username, :string, :default => ''
@@ -42,7 +45,9 @@ class Fluent::HTTPOutput < Fluent::Output
                          OpenSSL::SSL::VERIFY_PEER
                        end
 
-    serializers = [:json, :form]
+    @ca_file = @cacert_file
+
+    serializers = [:json, :form, :text]
     @serializer = if serializers.include? @serializer.intern
                     @serializer.intern
                   else
@@ -74,7 +79,7 @@ class Fluent::HTTPOutput < Fluent::Output
   def shutdown
     super
   end
-
+  
   def format_url(tag, time, record)
     @endpoint_url
   end
@@ -82,6 +87,8 @@ class Fluent::HTTPOutput < Fluent::Output
   def set_body(req, tag, time, record)
     if @serializer == :json
       set_json_body(req, record)
+    elsif @serializer == :text
+      set_text_body(req, record)
     else
       req.set_form_data(record)
     end
@@ -97,6 +104,11 @@ class Fluent::HTTPOutput < Fluent::Output
     req['Content-Type'] = 'application/json'
   end
 
+  def set_text_body(req, data)
+    req.body = data["message"]
+    req['Content-Type'] = 'text/plain'
+  end
+
   def create_request(tag, time, record)
     url = format_url(tag, time, record)
     uri = URI.parse(url)
@@ -111,6 +123,7 @@ class Fluent::HTTPOutput < Fluent::Output
         :use_ssl => uri.scheme == 'https'
       }
       opts[:verify_mode] = @ssl_verify_mode if opts[:use_ssl]
+      opts[:ca_file] = File.join(@ca_file) if File.file?(@ca_file)
       opts
   end
 

data/test/plugin/test_out_http.rb

@@ -92,6 +92,9 @@ class HTTPOutputTestBase < Test::Unit::TestCase
           record = {:auth => nil}
           if req.content_type == 'application/json'
             record[:json] = Yajl.load(req.body)
+          elsif req.content_type == 'text/plain'
+            puts req
+            record[:data] = req.body
           else
             record[:form] = Hash[*(req.body.split('&').map{|kv|kv.split('=')}.flatten)]
           end
@@ -192,6 +195,11 @@ class HTTPOutputTest < HTTPOutputTestBase
     serializer json
   ]
 
+  CONFIG_TEXT = %[
+    endpoint_url http://127.0.0.1:#{port}/api/
+    serializer text
+  ]
+
   CONFIG_PUT = %[
     endpoint_url http://127.0.0.1:#{port}/api/
     http_method put
@@ -278,6 +286,17 @@ class HTTPOutputTest < HTTPOutputTestBase
     assert_equal 1, record[:json]['otherfield']
     assert_equal binary_string, record[:json]['binary']
     assert_nil record[:auth]
+  end  
+  
+  def test_emit_text
+    binary_string = "\xe3\x81\x82"
+    d = create_driver CONFIG_TEXT
+    d.emit({ "message" => "hello" })
+    d.run
+    assert_equal 1, @posts.size
+    record = @posts[0]
+    assert_equal 'hello', record[:data]
+    assert_nil record[:auth]
   end
 
   def test_http_error_is_raised
@@ -422,6 +441,20 @@ class HTTPSOutputTest < HTTPOutputTestBase
     http_opts = d.instance.http_opts(test_uri)
     assert_equal true, http_opts[:use_ssl]
     assert_equal OpenSSL::SSL::VERIFY_NONE, http_opts[:verify_mode]
+
+    cacert_file_config = %[
+    endpoint_url https://127.0.0.1:#{self.class.port}/api/
+    ssl_no_verify true
+    cacert_file /tmp/ssl.cert
+    ]
+    d = create_driver cacert_file_config
+    FileUtils::touch '/tmp/ssl.cert'
+    http_opts = d.instance.http_opts(test_uri)
+    assert_equal true, http_opts[:use_ssl]
+    assert_equal OpenSSL::SSL::VERIFY_NONE, http_opts[:verify_mode]
+    assert_equal true, File.file?('/tmp/ssl.cert')
+    puts http_opts
+    assert_equal File.join('/tmp/ssl.cert'), http_opts[:ca_file]
   end
 
   def test_emit_form_ssl
@@ -438,4 +471,20 @@ class HTTPSOutputTest < HTTPOutputTestBase
 
     assert_equal '50', record[:form]['field1']
   end
+
+  def test_emit_form_ssl_ca
+    config = %[
+    endpoint_url https://127.0.0.1:#{self.class.port}/api/
+    ssl_no_verify true
+    cacert_file /tmp/ssl.cert
+    ]
+    d = create_driver config
+    d.emit({ 'field1' => 50 })
+    d.run
+
+    assert_equal 1, @posts.size
+    record = @posts[0]
+
+    assert_equal '50', record[:form]['field1']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-out-http
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Marica Odagaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby