logstash-filter-dns 3.0.11 → 3.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49f024b4c80ef883b2293e4360c9bc8db1fed00f341291097372d0e43fda374
-  data.tar.gz: 6560e0fb3de4628f6cc40250d82c0de7d2a80db8116aeb66acfb43b7c2d994ea
+  metadata.gz: 2fecd0c2688b23a9c5da63dc4ac117c8f4e76868772fdf70ac0ec0372b8898e5
+  data.tar.gz: b57f5fe1078cafdd5581d3b2b4f2c00ddb77d6880648b6f83b28d0ed36acb86f
 SHA512:
-  metadata.gz: 3c5f59c303e6cf2a5631c132d1d51c37cd1423f021acb79988a233652e1401a0a9bb2cbe5dfd9bb692ab7a981d3f85720552f6acecea6ad022f6c6643b953782
-  data.tar.gz: 95fa82bd33893694c0bd091a5e79969c4d1f1400b30cdba790fbdb33870dc081e38a34edbad0b0914dddb916b9e32299b40312cc1e92dacdbea538b2e303ad88
+  metadata.gz: 95fb7b4dc6a26a12aee442d2f191d040090ee9b705acf6e5b07d4aca927d406a3ac2997306a00424d9e5083fbe26459bcfb2c76df10a9b22fb085a1756787c7a
+  data.tar.gz: 9efb520db0550bec7401aee447d4f283c10884110020ea44fb873fec5f58c6a36fbb09cfeaa5dcc93283dbc92ef78a277e2c8d01c76d7853756883fcbdd63af7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.12
+  - Fixed issue where unqualified domains would fail to resolve when running this plugin with Logstash 5.x [#48](https://github.com/logstash-plugins/logstash-filter-dns/pull/48)
+  - Fixed crash that could occur when encountering certain classes of invalid inputs [#49](https://github.com/logstash-plugins/logstash-filter-dns/pull/49)
+
 ## 3.0.11
   - Fixed JRuby resolver bug for versions prior to 9.1.16.0 [#45](https://github.com/logstash-plugins/logstash-filter-dns/pull/45)
 

data/lib/logstash/filters/dns.rb

@@ -4,7 +4,7 @@ require "logstash/namespace"
 require "lru_redux"
 require "resolv"
 require "timeout"
-require "logstash/filters/resolv_patch"
+require "logstash/filters/dns/resolv_patch"
 
 java_import 'java.net.IDN'
 
@@ -166,6 +166,14 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
         @logger.error("DNS: Encountered SocketError.",
                       :field => field, :value => raw, :message => e.message)
         return
+      rescue Java::JavaLang::IllegalArgumentException => e
+        @logger.error("DNS: Unable to parse address.",
+                      :field => field, :value => raw, :message => e.message)
+        return
+      rescue => e
+        @logger.error("DNS: Unexpected Error.",
+                      :field => field, :value => raw, :message => e.message)
+        return
       end
 
       if @action == "replace"
@@ -238,6 +246,14 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
         @logger.error("DNS: Encountered SocketError.",
                       :field => field, :value => raw, :message => e.message)
         return
+      rescue Java::JavaLang::IllegalArgumentException => e
+        @logger.error("DNS: Unable to parse address.",
+                      :field => field, :value => raw, :message => e.message)
+        return
+      rescue => e
+        @logger.error("DNS: Unexpected Error.",
+                      :field => field, :value => raw, :message => e.message)
+        return
       end
 
       if @action == "replace"

data/lib/logstash/filters/{resolv_patch.rb → dns/resolv_patch.rb}

@@ -1,5 +1,7 @@
 require "resolv"
 
+jruby_gem_version = Gem::Version.new(JRUBY_VERSION)
+
 # ref: https://github.com/logstash-plugins/logstash-filter-dns/issues/40
 #
 # JRuby 9k versions prior to 9.1.16.0 have a bug which crashes IP address
@@ -10,10 +12,7 @@ require "resolv"
 #
 # The code below is copied from JRuby 9.1.16.0 resolv.rb:
 # https://github.com/jruby/jruby/blob/9.1.16.0/lib/ruby/stdlib/resolv.rb#L775-L784
-
-JRUBY_GEM_VERSION = Gem::Version.new(JRUBY_VERSION)
-
-if JRUBY_GEM_VERSION >= Gem::Version.new("9.1.13.0") && JRUBY_GEM_VERSION < Gem::Version.new("9.1.16.0")
+if jruby_gem_version >= Gem::Version.new("9.1.13.0") && jruby_gem_version < Gem::Version.new("9.1.16.0")
   class Resolv
     class DNS
       class Requester
@@ -32,4 +31,29 @@ if JRUBY_GEM_VERSION >= Gem::Version.new("9.1.13.0") && JRUBY_GEM_VERSION < Gem:
       end
     end
   end
-end
+end
+
+# JRuby 1.x ships with a Ruby stdlib that has a bug in its resolv implementation
+# in which it fails to correctly canonicalise unqualified or underqualified
+# domains (e.g., domain names with fewer than the configured ndots, which defaults
+# to 1).
+#
+# See: https://bugs.ruby-lang.org/issues/10412
+#
+# Conditionally apply the patch to the method definition by wrapping it at runtime.
+if jruby_gem_version < Gem::Version.new("9.0")
+  class Resolv::DNS
+    class Config
+      alias generate_candidates_without_toplevel generate_candidates
+      def generate_candidates_with_toplevel(name)
+        candidates = generate_candidates_without_toplevel(name)
+        fname = Name.create("#{name}.")
+        if !candidates.include?(fname)
+          candidates << fname
+        end
+        candidates
+      end
+      alias generate_candidates generate_candidates_with_toplevel
+    end
+  end
+end

data/logstash-filter-dns.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-dns'
-  s.version         = '3.0.11'
+  s.version         = '3.0.12'
   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"

data/spec/filters/dns_spec.rb

@@ -389,6 +389,14 @@ describe LogStash::Filters::DNS do
         end
       end
 
+      context 'with a label too long' do
+        let(:host) { "#{'0' * 64}.com" }
+
+        it 'should not raise' do
+          subject.filter(event)
+        end
+      end
+
       context "when failing temporarily" do
         before(:each) do
           allow(subject).to receive(:getaddress) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-dns
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.0.12
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ files:
 - README.md
 - docs/index.asciidoc
 - lib/logstash/filters/dns.rb
-- lib/logstash/filters/resolv_patch.rb
+- lib/logstash/filters/dns/resolv_patch.rb
 - logstash-filter-dns.gemspec
 - spec/filters/dns_spec.rb
 - spec/fixtures/hosts