dap 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4980afacd4cce04c5936b8c973880dce051c5a7
-  data.tar.gz: a0519f28afc510bd44a3dd363ba99e2ef4c71b2a
+  metadata.gz: bc89b6c18e84edad0cd26e060a2f398dc2e92593
+  data.tar.gz: 870aa9dc76ace284294e5594d5c260722beed4d6
 SHA512:
-  metadata.gz: c786cef2af1b7ac4debdecbf19c211aba042e80802ce1384fd44d482785b16b6792d9747edd4bf0bfaf362a77bd247afa48930ff7c02b81e94306bea7c6e0346
-  data.tar.gz: db00b788cfdfc5fb979313df8fbfd0dbade60847fabad678712539c9dd008787da48d7659b98cd8913048583de9b0829deec14d490b2cc2b1f529532067f29ba
+  metadata.gz: 43e447d2885b368ecfe3e0c2a79591d7e24f6d35f4815ce560e1f4e25684aa99a63fb5d729bb60e3224d4ad31da43f027ee2e0fbe3c433cb88b09e6e4081cd13
+  data.tar.gz: ca4913ec986081556e90cbe9d330926da25cc00e5d0b4367285ca46ac31105f0da869181c4fe024bd20f40d3bd10ce8486a7f3b5f32924bb823b9b69430ea7b0

data/lib/dap/filter/geoip2.rb

@@ -33,6 +33,13 @@ module GeoIP2Library
     nil
   end
 
+  def get_maxmind_data(db, ip)
+    begin
+      db.get(ip)
+    rescue IPAddr::InvalidAddressError
+    end
+  end
+
   def remove_empties(hash)
     hash.each_pair do |k,v|
       if v.empty?
@@ -78,8 +85,10 @@ class FilterGeoIP2City
     unless @@geo_city
       raise "No MaxMind GeoIP2::City data found"
     end
-    return unless (geo_hash = @@geo_city.get(ip))
+
     ret = defaults
+    geo_hash = get_maxmind_data(@@geo_city, ip)
+    return unless geo_hash
 
     if geo_hash.include?("subdivisions")
       # handle countries that are divided into various subdivisions.  generally 1, sometimes 2
@@ -143,9 +152,9 @@ class FilterGeoIP2Asn
     unless @@geo_asn
       raise "No MaxMind GeoIP2::ASN data found"
     end
-    geo_hash = @@geo_asn.get(ip)
-    return unless geo_hash
 
+    geo_hash = get_maxmind_data(@@geo_asn, ip)
+    return unless geo_hash
     ret = {}
 
     if geo_hash.include?("autonomous_system_number")
@@ -174,9 +183,9 @@ class FilterGeoIP2Isp
     unless @@geo_isp
       raise "No MaxMind GeoIP2::ISP data found"
     end
-    geo_hash = @@geo_isp.get(ip)
-    return unless geo_hash
 
+    geo_hash = get_maxmind_data(@@geo_isp, ip)
+    return unless geo_hash
     ret = {}
 
     if geo_hash.include?("autonomous_system_number")

data/lib/dap/version.rb

@@ -1,3 +1,3 @@
 module Dap
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

data/test/filters.bats

@@ -160,6 +160,11 @@ load ./test_common
   run bash -c "echo 2a02:d9c0:: | GEOIP2_CITY_DATABASE_PATH=test/test_data/geoip2/GeoIP2-City-Test.mmdb $DAP_EXECUTABLE lines + geo_ip2_city line + json | jq -Sc -r ."
   assert_success
   assert_output '{"line":"2a02:d9c0::","line.geoip2.city.city.geoname_id":"0","line.geoip2.city.continent.code":"AS","line.geoip2.city.continent.geoname_id":"6255147","line.geoip2.city.continent.name":"Asia","line.geoip2.city.country.geoname_id":"298795","line.geoip2.city.country.is_in_european_union":"false","line.geoip2.city.country.iso_code":"TR","line.geoip2.city.country.name":"Turkey","line.geoip2.city.location.accuracy_radius":"100","line.geoip2.city.location.latitude":"39.05901","line.geoip2.city.location.longitude":"34.91155","line.geoip2.city.location.metro_code":"0","line.geoip2.city.location.time_zone":"Europe/Istanbul","line.geoip2.city.registered_country.geoname_id":"298795","line.geoip2.city.registered_country.is_in_european_union":"false","line.geoip2.city.registered_country.iso_code":"TR","line.geoip2.city.registered_country.name":"Turkey","line.geoip2.city.represented_country.geoname_id":"0","line.geoip2.city.represented_country.is_in_european_union":"false","line.geoip2.city.traits.is_anonymous_proxy":"false","line.geoip2.city.traits.is_satellite_provider":"false"}'
+
+  # test invalid IP
+  run bash -c "echo test | GEOIP2_CITY_DATABASE_PATH=test/test_data/geoip2/GeoIP2-City-Test.mmdb $DAP_EXECUTABLE lines + geo_ip2_city line + json | jq -Sc -r ."
+  assert_success
+  assert_output '{"line":"test"}'
 }
 
 @test "geo_ip2_asn" {
@@ -171,13 +176,20 @@ load ./test_common
   run bash -c "echo 2600:7000:: | GEOIP2_ASN_DATABASE_PATH=test/test_data/geoip2/GeoLite2-ASN-Test.mmdb $DAP_EXECUTABLE lines + geo_ip2_asn line + json | jq -Sc -r ."
   assert_success
   assert_output '{"line":"2600:7000::","line.geoip2.asn.asn":"AS6939","line.geoip2.asn.asn_org":"Hurricane Electric, Inc."}'
+
+  # test invalid IP
+  run bash -c "echo test | GEOIP2_ASN_DATABASE_PATH=test/test_data/geoip2/GeoLite2-ASN-Test.mmdb $DAP_EXECUTABLE lines + geo_ip2_asn line + json | jq -Sc -r ."
+  assert_success
+  assert_output '{"line":"test"}'
 }
 
 @test "geo_ip2_isp" {
-  run bash -c "echo -e '12.81.92.0\n2600:7000::' | GEOIP2_ISP_DATABASE_PATH=test/test_data/geoip2/GeoIP2-ISP-Test.mmdb $DAP_EXECUTABLE lines + geo_ip2_isp line + json | jq -Sc -r ."
+  run bash -c "echo -e '12.81.92.0\n2600:7000::\ntest' | GEOIP2_ISP_DATABASE_PATH=test/test_data/geoip2/GeoIP2-ISP-Test.mmdb $DAP_EXECUTABLE lines + geo_ip2_isp line + json | jq -Sc -r ."
   assert_line --index 0 '{"line":"12.81.92.0","line.geoip2.isp.asn":"AS7018","line.geoip2.isp.isp":"AT&T Services","line.geoip2.isp.org":"AT&T Services"}'
   # test IPv6
   assert_line --index 1 '{"line":"2600:7000::","line.geoip2.isp.asn":"AS6939","line.geoip2.isp.asn_org":"Hurricane Electric, Inc."}'
+  # test invalid IP
+  assert_line --index 2 '{"line":"test"}'
 }
 
 @test "geo_ip2_legacy_compat" {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dap
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec