logstash-filter-dns 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42e105e5fc1ecf91266bcd1497c8ea82ac0b0224b26980c9c4cce814b1f2ec14
-  data.tar.gz: 96585aa3899ec180dc844cd4b9e4197e42052fd6054de5e206d1c9c11e2efc1d
+  metadata.gz: c66e9cc4c24075018788af9b4c55806d560baef3fb0650eba76ff5e8bb3dcb3e
+  data.tar.gz: 0aefc64b12ccc9febf31e874b3eb2e3491f4876dba593e74f390c5378b947b3b
 SHA512:
-  metadata.gz: 61b22319a08350fb1c33199332217bf54cee91989e1a2bfc03cf80c7c2a5e785056da4d0f0a2dafdcd2821147982f5c50e638e79478f1b8f7b1a0ff507dfdd33
-  data.tar.gz: bb8fa5118a9a2ee2f32f736ecc7fccbea4362dc2966edb36f50e40eb8eb1569af33a1df9945c027a6a5cefae8ec718b3ae98acf7bca772dbf220ff7bf1ff01cb
+  metadata.gz: 0eb13a2bb6ba82cabfc2c400efa9f7e64f78360a37c1330736eee4cc556192ef8451c98b6744d7eec4482dffcd9c2c5b194e55de36b33eb2f94f3e9dadb2a3ef
+  data.tar.gz: 6165e2266bddf1bd33cead92f8caf6faadf85a22b4352ecd520fd77b583cfd12f90958b99542c7357bccb4e884868546fe162508673cd96e436f9c01c088a42a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.1.4
+  - Replaced Timeout::timeout block with `Resolv::DNS::timeouts=` [#62](https://github.com/logstash-plugins/logstash-filter-dns/pull/62)
+  - Added restriction for ruby version > 2.0, effectively making Logstash 6.x+ a requirement [#62](https://github.com/logstash-plugins/logstash-filter-dns/pull/62)
+
 ## 3.1.3
   - Fixed an issue where each missed lookup could result in unreclaimed memory ([jruby bug](https://github.com/jruby/jruby/issues/6015)) by handling lookup misses without raising exceptions [#61](https://github.com/logstash-plugins/logstash-filter-dns/pull/61)
 

data/lib/logstash/filters/dns.rb

@@ -3,7 +3,6 @@ require "logstash/filters/base"
 require "logstash/namespace"
 require "lru_redux"
 require "resolv"
-require "timeout"
 require "logstash/filters/dns/resolv_patch"
 
 java_import 'java.net.IDN'
@@ -29,7 +28,6 @@ java_import 'java.net.IDN'
 # milliseconds, the maximum throughput you can achieve with a single filter
 # worker is 500 events per second (1000 milliseconds / 2 milliseconds).
 class LogStash::Filters::DNS < LogStash::Filters::Base
-  # TODO(sissel): The timeout limitation does seem to be fixed in here: http://redmine.ruby-lang.org/issues/5100 # but isn't currently in JRuby.
   # TODO(sissel): make `action` required? This was always the intent, but it
   # due to a typo it was never enforced. Thus the default behavior in past
   # versions was `append` by accident.
@@ -94,7 +92,7 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
   public
   def register
     if @nameserver.nil? && @hostsfile.nil?
-      @resolv = Resolv.new
+      @resolv = Resolv.new(default_resolvers)
     else
       @resolv = Resolv.new(build_resolvers)
     end
@@ -125,6 +123,20 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
 
   private
 
+  def default_resolvers
+    [::Resolv::Hosts.new, default_dns_resolver]
+  end
+
+  def default_dns_resolver
+    dns_resolver(nil)
+  end
+
+  def dns_resolver(args=nil)
+    dns_resolver = ::Resolv::DNS.new(args)
+    dns_resolver.timeouts = @timeout
+    dns_resolver
+  end
+
   def build_resolvers
     build_user_host_resolvers.concat([::Resolv::Hosts.new]).concat(build_user_dns_resolver)
   end
@@ -136,8 +148,7 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
 
   def build_user_dns_resolver
     return [] if @nameserver.nil? || @nameserver.empty?
-
-    [::Resolv::DNS.new(normalised_nameserver)]
+    [dns_resolver(normalised_nameserver)]
   end
 
   def normalised_nameserver
@@ -201,7 +212,7 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
                         :field => field, :value => raw)
           return
         end
-      rescue Resolv::ResolvTimeout, Timeout::Error
+      rescue Resolv::ResolvTimeout
         @failed_cache[raw] = true if @failed_cache
         @logger.warn("DNS: timeout on resolving the hostname.",
                       :field => field, :value => raw)
@@ -282,7 +293,7 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
                         :field => field, :value => raw)
           return
         end
-      rescue Resolv::ResolvTimeout, Timeout::Error
+      rescue Resolv::ResolvTimeout
         @failed_cache[raw] = true if @failed_cache
         @logger.warn("DNS: timeout on resolving address.",
                       :field => field, :value => raw)
@@ -323,10 +334,8 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
   def retriable_request(&block)
     tries = 0
     begin
-      Timeout::timeout(@timeout) do
-        block.call
-      end
-    rescue Timeout::Error, SocketError
+      block.call
+    rescue Resolv::ResolvTimeout,  SocketError
       if tries < @max_retries
         tries = tries + 1
         retry

data/logstash-filter-dns.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-dns'
-  s.version         = '3.1.3'
+  s.version         = '3.1.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Performs a standard or reverse DNS lookup"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -10,6 +10,9 @@ Gem::Specification.new do |s|
   s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
   s.require_paths = ["lib"]
 
+  # This effectively requires Logstash >= 6.x
+  s.required_ruby_version = '>= 2.0.0'
+
   # Files
   s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "docs/**/*"]
 

data/spec/filters/dns_spec.rb

@@ -2,6 +2,8 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/filters/dns"
 require "resolv"
+require "logstash/filters/dns/resolv_patch"
+
 
 describe LogStash::Filters::DNS do
   describe "with stubbed Resolv" do
@@ -377,7 +379,7 @@ describe LogStash::Filters::DNS do
 
       context "when failing permanently" do
         before(:each) do
-          allow(subject).to receive(:getaddress).and_raise(Timeout::Error)
+          allow(subject).to receive(:getaddress).and_raise(Resolv::ResolvTimeout)
         end
 
         it "should fail a resolve after max_retries" do
@@ -385,7 +387,24 @@ describe LogStash::Filters::DNS do
           subject.filter(event)
         end
 
-        it "should cache the timeout" do
+        it "should cache the failure" do
+          expect do
+            subject.filter(event)
+          end.to change { subject.failed_cache[host] }.from(nil).to(true)
+        end
+      end
+
+      context "when unable to resolve an address" do
+        before(:each) do
+          allow(subject).to receive(:getaddress).and_return(nil)
+        end
+
+        it "should fail a resolve after max_retries" do
+          expect(subject).to receive(:getaddress).once
+          subject.filter(event)
+        end
+
+        it "should cache the failure" do
           expect do
             subject.filter(event)
           end.to change { subject.failed_cache[host] }.from(nil).to(true)
@@ -406,7 +425,7 @@ describe LogStash::Filters::DNS do
             @try ||= 0
             if @try < 2
               @try = @try + 1
-              raise Timeout::Error
+              raise SocketError
             else
               "127.0.0.1"
             end
@@ -527,7 +546,7 @@ describe LogStash::Filters::DNS do
         # Resolv::DNS.new will be called without arguments thus reading /etc/resolv.conf
         # for its configuration which is the desired behaviour for backward compatibility
 
-        expect(Resolv::DNS).to receive(:new).once.with(no_args)
+        expect(Resolv::DNS).to receive(:new).once.with(nil).and_call_original
         dns_filter_plugin.register
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-dns
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="