logstash-filter-dns 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ee891cdca96c9fc77706efc72b6d33931c261fe000d1ccd2bfd77f4649544a0
-  data.tar.gz: dbf27cff110158f8f0a69a31826a1817929115461816d405c6494138ad99fe29
+  metadata.gz: 42e105e5fc1ecf91266bcd1497c8ea82ac0b0224b26980c9c4cce814b1f2ec14
+  data.tar.gz: 96585aa3899ec180dc844cd4b9e4197e42052fd6054de5e206d1c9c11e2efc1d
 SHA512:
-  metadata.gz: 5ef252d8dd5e6d990182b036c09f47ae9326b7af4e1ccb6dcae37d1de86fa52c6972308cf386bd735ea977c9cf3087fcecb523980807d67b4df4ceed27092018
-  data.tar.gz: 81392b44caeab24cdc0f7105795fb952890a384256f369c9a637b5bb93e8c60e8aaa1d03c86f01ce8028406dfde3f8c3608cf340d56585f915147cd7bf232fa3
+  metadata.gz: 61b22319a08350fb1c33199332217bf54cee91989e1a2bfc03cf80c7c2a5e785056da4d0f0a2dafdcd2821147982f5c50e638e79478f1b8f7b1a0ff507dfdd33
+  data.tar.gz: bb8fa5118a9a2ee2f32f736ecc7fccbea4362dc2966edb36f50e40eb8eb1569af33a1df9945c027a6a5cefae8ec718b3ae98acf7bca772dbf220ff7bf1ff01cb

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 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)
+
 ## 3.1.2
   - Added restriction on JRuby resolv.rb patch to versions prior to 9.2.9.0 [#58](https://github.com/logstash-plugins/logstash-filter-dns/pull/58)
 

data/lib/logstash/filters/dns.rb

@@ -195,11 +195,12 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
         else
           address = retriable_getaddress(raw)
         end
-      rescue Resolv::ResolvError => e
-        @failed_cache[raw] = true if @failed_cache
-        @logger.debug("DNS: couldn't resolve the hostname.",
-                      :field => field, :value => raw, :message => e.message)
-        return
+        if address.nil?
+          @failed_cache[raw] = true if @failed_cache
+          @logger.debug("DNS: couldn't resolve the hostname.",
+                        :field => field, :value => raw)
+          return
+        end
       rescue Resolv::ResolvTimeout, Timeout::Error
         @failed_cache[raw] = true if @failed_cache
         @logger.warn("DNS: timeout on resolving the hostname.",
@@ -275,11 +276,12 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
         else
           hostname = retriable_getname(raw)
         end
-      rescue Resolv::ResolvError => e
-        @failed_cache[raw] = true if @failed_cache
-        @logger.debug("DNS: couldn't resolve the address.",
-                      :field => field, :value => raw, :message => e.message)
-        return
+        if hostname.nil?
+          @failed_cache[raw] = true if @failed_cache
+          @logger.debug("DNS: couldn't resolve the address.",
+                        :field => field, :value => raw)
+          return
+        end
       rescue Resolv::ResolvTimeout, Timeout::Error
         @failed_cache[raw] = true if @failed_cache
         @logger.warn("DNS: timeout on resolving address.",
@@ -350,13 +352,43 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
 
   private
   def getname(address)
-    name = @resolv.getname(address).force_encoding(Encoding::UTF_8)
-    IDN.toUnicode(name)
+    name = resolv_getname_or_nil(@resolv, address)
+    name && name.force_encoding(Encoding::UTF_8)
+    name && IDN.toUnicode(name)
   end
 
   private
   def getaddress(name)
     idn = IDN.toASCII(name)
-    @resolv.getaddress(idn).force_encoding(Encoding::UTF_8)
+    address = resolv_getaddress_or_nil(@resolv, idn)
+    address && address.force_encoding(Encoding::UTF_8)
+  end
+
+  private
+  def resolv_getname_or_nil(resolver, address)
+    # `Resolv#each_name` yields to the provided block zero or more times;
+    # to prevent it from yielding multiple times when more than one match
+    # is found, we return directly in the block.
+    # See also `Resolv#getname`
+    resolver.each_name(address) do |name|
+      return name
+    end
+
+    # If no match was found, we return nil.
+    return nil
+  end
+
+  private
+  def resolv_getaddress_or_nil(resolver, name)
+    # `Resolv#each_address` yields to the provided block zero or more times;
+    # to prevent it from yielding multiple times when more than one match
+    # is found, we return directly in the block.
+    # See also `Resolv#getaddress`
+    resolver.each_address(name) do |address|
+      return address
+    end
+
+    # If no match was found, we return nil.
+    return nil
   end
 end # class LogStash::Filters::DNS

data/logstash-filter-dns.gemspec

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

@@ -6,13 +6,16 @@ require "resolv"
 describe LogStash::Filters::DNS do
   describe "with stubbed Resolv" do
     before(:each) do
-      allow_any_instance_of(Resolv).to receive(:getaddress).with("carrera.databits.net").and_return("199.192.228.250")
-      allow_any_instance_of(Resolv).to receive(:getaddress).with("does.not.exist").and_raise(Resolv::ResolvError)
-      allow_any_instance_of(Resolv).to receive(:getaddress).with("nonexistanthostname###.net").and_raise(Resolv::ResolvError)
-      allow_any_instance_of(Resolv).to receive(:getname).with("199.192.228.250").and_return("carrera.databits.net")
-      allow_any_instance_of(Resolv).to receive(:getname).with("127.0.0.1").and_return("localhost")
-      allow_any_instance_of(Resolv).to receive(:getname).with("128.0.0.1").and_raise(Resolv::ResolvError)
-      allow_any_instance_of(Resolv).to receive(:getname).with("199.192.228.250").and_return("carrera.databits.net")
+      # We use `Resolv#each_address` and `Resolv#each_name`, which have
+      # undefined return values but _yield_ once per result, so our stubs
+      # need to either yield a result or not yield at all if there is no result.
+      allow_any_instance_of(Resolv).to receive(:each_address).with("carrera.databits.net").and_yield("199.192.228.250")
+      allow_any_instance_of(Resolv).to receive(:each_address).with("does.not.exist") # no yield
+      allow_any_instance_of(Resolv).to receive(:each_address).with("nonexistanthostname###.net") # no yield
+      allow_any_instance_of(Resolv).to receive(:each_name).with("199.192.228.250").and_yield("carrera.databits.net")
+      allow_any_instance_of(Resolv).to receive(:each_name).with("127.0.0.1").and_yield("localhost")
+      allow_any_instance_of(Resolv).to receive(:each_name).with("128.0.0.1") # no yield
+      allow_any_instance_of(Resolv).to receive(:each_name).with("199.192.228.250").and_yield("carrera.databits.net")
     end
 
     describe "dns reverse lookup, replace (on a field)" do
@@ -305,7 +308,7 @@ describe LogStash::Filters::DNS do
       let(:event2) { LogStash::Event.new("message" => "unkownhost") }
 
       before(:each) do
-        allow(subject).to receive(:getaddress).and_raise Resolv::ResolvError
+        allow(subject).to receive(:getaddress).and_return(nil)
         subject.register
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-dns
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement