dap 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5216e88424416f1b06fb328a2a3b4b28a5c93c44
-  data.tar.gz: 3b21dab02840393f8d6d580448e4dcbf61803d7b
+  metadata.gz: e4980afacd4cce04c5936b8c973880dce051c5a7
+  data.tar.gz: a0519f28afc510bd44a3dd363ba99e2ef4c71b2a
 SHA512:
-  metadata.gz: 34bbffa7bb37066f54f37bbb8e26e54e8a7659253136be275faf97576276891cd26846925ff658e70c606a62f9aab526a9d7e0e8f85b6d60328dae2591517e98
-  data.tar.gz: db81593c49caeb605f777a91fa511170367569bb3a958bb9f6aaeaafd85e94abd08ae478ec22947b308c02991efbd36ec1f537cf79c4fc43ff60e73897c6b06e
+  metadata.gz: c786cef2af1b7ac4debdecbf19c211aba042e80802ce1384fd44d482785b16b6792d9747edd4bf0bfaf362a77bd247afa48930ff7c02b81e94306bea7c6e0346
+  data.tar.gz: db00b788cfdfc5fb979313df8fbfd0dbade60847fabad678712539c9dd008787da48d7659b98cd8913048583de9b0829deec14d490b2cc2b1f529532067f29ba

data/lib/dap/filter/geoip2.rb

@@ -238,10 +238,11 @@ class FilterGeoIP2LegacyCompat
       "isp.asn": "asn",
     }
 
+    ret = {}
     remap.each_pair do |geoip2,geoip|
       geoip2_key = "#{self.base_field}.geoip2.#{geoip2}"
       if doc.include?(geoip2_key)
-        doc["#{self.base_field}.#{geoip}"] = doc[geoip2_key]
+        ret["#{self.base_field}.#{geoip}"] = doc[geoip2_key]
       end
     end
 
@@ -256,7 +257,7 @@ class FilterGeoIP2LegacyCompat
     if doc.include?(anon_key)
       anon_value = doc[anon_key]
       if anon_value == "true"
-        doc["#{self.base_field}.country_code"] = "A1"
+        ret["#{self.base_field}.country_code"] = "A1"
       end
     end
 
@@ -264,7 +265,7 @@ class FilterGeoIP2LegacyCompat
     if doc.include?(satellite_key)
       satellite_value = doc[satellite_key]
       if satellite_value == "true"
-        doc["#{self.base_field}.country_code"] = "A1"
+        ret["#{self.base_field}.country_code"] = "A1"
       end
     end
 
@@ -273,7 +274,7 @@ class FilterGeoIP2LegacyCompat
     if doc.include?(metro_key)
       metro_value = doc[metro_key]
       if !metro_value.empty? && metro_value != "0"
-        doc["#{self.base_field}.dma_code"] = metro_value
+        ret["#{self.base_field}.dma_code"] = metro_value
       end
     end
 
@@ -284,12 +285,12 @@ class FilterGeoIP2LegacyCompat
     [ isp_org_key, isp_asn_org_key, asn_org_key ].each do |k|
       v = doc[k]
       if v && !v.empty?
-        doc["#{self.base_field}.org"] = v
+        ret["#{self.base_field}.org"] = v
         break
       end
     end
 
-    [ remove_empties(doc) ]
+    [ doc.merge(remove_empties(ret)) ]
   end
 end
 

data/lib/dap/version.rb

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

data/test/filters.bats

@@ -191,4 +191,8 @@ load ./test_common
   assert_line --index 2 '{"line":"2a02:d9c0::","line.country_code":"TR","line.country_name":"Turkey","line.latitude":"39.05901","line.longitude":"34.91155"}'
   # exists in ISP
   assert_line --index 3 '{"line":"2a01:1000::","line.asn":"AS5617","line.org":"Telekomunikacja Polska S.A."}'
+
+  run bash -c "echo '{\"ip\": \"4.2.2.1\", \"something_empty\": \"\", \"some_int\": 80}' | GEOIP2_CITY_DATABASE_PATH=test/test_data/geoip2/GeoIP2-City-Test.mmdb dap json + geo_ip2_city ip + geo_ip2_legacy_compat ip + match_remove ip. + json"
+  assert_success
+  assert_output '{"ip":"4.2.2.1","something_empty":"","some_int":80}'
 }

metadata

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