logstash-filter-dns 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e354fcb8db6795eda49ca3c4bcf0971eed81af89d90fec4a1f6b4ec3a9bade
-  data.tar.gz: 377b1a63e87937e249fc439d5d332dbdd5b9fffca84830c53dd7175c9ba9b3db
+  metadata.gz: e49f024b4c80ef883b2293e4360c9bc8db1fed00f341291097372d0e43fda374
+  data.tar.gz: 6560e0fb3de4628f6cc40250d82c0de7d2a80db8116aeb66acfb43b7c2d994ea
 SHA512:
-  metadata.gz: e5ad88694cf8f01c733a798d1bef59616eaf63d196caea8c49bd3e45a843e401d84c93ebf0125a59e621d7b3a6bd1227109e0e8ed660cd41db3a88a415f92ff9
-  data.tar.gz: 628ec7747dafe97e40f54241f1b75f6a333aeeb0ee2841c0939143a911e45102c3068c7b6f6df9f6f2c42b777860a3db412471780b9d78f8f2bfd2dc0a826ca3
+  metadata.gz: 3c5f59c303e6cf2a5631c132d1d51c37cd1423f021acb79988a233652e1401a0a9bb2cbe5dfd9bb692ab7a981d3f85720552f6acecea6ad022f6c6643b953782
+  data.tar.gz: 95fa82bd33893694c0bd091a5e79969c4d1f1400b30cdba790fbdb33870dc081e38a34edbad0b0914dddb916b9e32299b40312cc1e92dacdbea538b2e303ad88

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 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)
+
 ## 3.0.10
   - Log timeouts as warn instead of error #43
   - Allow concurrent queries when cache enabled #42

data/lib/logstash/filters/dns.rb

@@ -4,6 +4,7 @@ require "logstash/namespace"
 require "lru_redux"
 require "resolv"
 require "timeout"
+require "logstash/filters/resolv_patch"
 
 java_import 'java.net.IDN'
 

data/lib/logstash/filters/resolv_patch.rb

@@ -0,0 +1,35 @@
+require "resolv"
+
+# 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
+# resolution after 64k unique IP addresses resolutions.
+#
+# Note that the oldest JRuby version in LS 6 is 9.1.13.0 and
+# JRuby 1.7.25 and 1.7.27 (the 2 versions used across LS 5) are not affected by this bug.
+#
+# 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")
+  class Resolv
+    class DNS
+      class Requester
+        class UnconnectedUDP
+          def sender(msg, data, host, port=Port)
+            sock = @socks_hash[host.index(':') ? "::" : "0.0.0.0"]
+            return nil if !sock
+            service = [IPAddr.new(host), port]
+            id = DNS.allocate_request_id(service[0], service[1])
+            request = msg.encode
+            request[0,2] = [id].pack('n')
+            return @senders[[service, id]] =
+                Sender.new(request, data, sock, host, port)
+          end
+        end
+      end
+    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.10'
+  s.version         = '3.0.11'
   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"

metadata

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