fluentd 0.12.34 → 0.12.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd21d1304c2f951d877baf533d64ddb647805de
-  data.tar.gz: 44faf3d4806bfc29b9cf2a1eab46b4fffd2c7b21
+  metadata.gz: d2d3102f961d9f56eeac91f42b95c2599067c951
+  data.tar.gz: 5f86c48d0a436f06e8f7c4b2b017e6b301041bae
 SHA512:
-  metadata.gz: e30eb92f16978286232710abdb1512144cfbe44c8b96b1acbe200530e9aa3b446e609c1d69b2b5b4ca82e3d3101f6755e0c090061713f90af6a0e024b736780e
-  data.tar.gz: f9bb8a3b4019a9de03ad06f6486f74de29abf5c49cf6a98eecc8720776ad8cf4aa01fd8a72c161c95092786bafec953cdda4d2a10d721cdb4de43abe9f14b819
+  metadata.gz: b34637aa560ca457b313f9caf63f5fa8df8fa79398a876efa24299e3f7537719e03c745a5bc302f04f78975a81e6e5b959b4f5867c684cdf8bdf057aef37137d
+  data.tar.gz: 01b2bec5a9948f4a10e12f66bbe2b91427dfb6127834a9dfba8bf0ba8b28e10a39a1e1dd6dad1241b18a781b640cb03aff2924cd9713956e2f2fc6e87831fd5f

data/ChangeLog

@@ -1,5 +1,14 @@
 # v0.12
 
+## Release 0.12.35 - 2017/04/19
+
+### Bug fixes
+
+* in_http: Fix X-Forwarded-For header handling. Accpet multiple headers
+  https://github.com/fluent/fluentd/pull/1535
+* in_tail: Do not warn that directories are unreadable
+  https://github.com/fluent/fluentd/pull/1540
+
 ## Release 0.12.34 - 2017/03/25
 
 ### New features / Enhancement

data/lib/fluent/plugin/in_http.rb

@@ -301,6 +301,8 @@ module Fluent
           when /Origin/i
             @origin  = v
           when /X-Forwarded-For/i
+            # For multiple X-Forwarded-For headers. Use first header value.
+            v = v.first if v.is_a?(Array)
             @remote_addr = v.split(",").first
           end
         }

data/lib/fluent/plugin/in_tail.rb

@@ -157,14 +157,17 @@ module Fluent
         path = date.strftime(path)
         if path.include?('*')
           paths += Dir.glob(path).select { |p|
-            if File.readable?(p) && !File.directory?(p)
+            is_file = !File.directory?(p)
+            if File.readable?(p) && is_file
               if @limit_recently_modified && File.mtime(p) < (date - @limit_recently_modified)
                 false
               else
                 true
               end
             else
-              log.warn "#{p} unreadable. It is excluded and would be examined next time."
+              if is_file
+                log.warn "#{p} unreadable. It is excluded and would be examined next time."
+              end
               false
             end
           }

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.12.34'
+  VERSION = '0.12.35'
 
 end

data/test/plugin/test_in_http.rb

@@ -152,6 +152,33 @@ class HttpInputTest < Test::Unit::TestCase
 
   end
 
+  def test_add_remote_addr_given_multi_x_forwarded_for
+    d = create_driver(CONFIG + "add_remote_addr true")
+
+    tag = "tag1"
+    time = event_time("2011-01-02 13:14:15 UTC").to_i
+    record = {"a" => 1}
+
+    d.expect_emit tag, time, {"REMOTE_ADDR"=>"129.78.138.66", "a" => 1}
+
+    d.run do
+      res = post("/#{tag}", {"json" => record.to_json, "time" => time.to_s}) { |http, req|
+        # net/http can't send multiple headers so overwrite it.
+        def req.each_capitalized
+          block_given? or return enum_for(__method__) { @header.size }
+          @header.each do |k, vs|
+            vs.each { |v|
+              yield capitalize(k), v
+            }
+          end
+        end
+        req.add_field("X-Forwarded-For", "129.78.138.66, 127.0.0.1")
+        req.add_field("X-Forwarded-For", "8.8.8.8")
+      }
+      assert_equal "200", res.code
+    end
+  end
+
   def test_multi_json_with_add_http_headers
     d = create_driver(CONFIG + "add_http_headers true")
 
@@ -431,9 +458,10 @@ class HttpInputTest < Test::Unit::TestCase
     end
   end
 
-  def post(path, params, header = {})
+  def post(path, params, header = {}, &block)
     http = Net::HTTP.new("127.0.0.1", PORT)
     req = Net::HTTP::Post.new(path, header)
+    block.call(http, req) if block
     if params.is_a?(String)
       req.body = params
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.34
+  version: 0.12.35
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -496,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Fluentd event collector