dap 0.1.18 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 663523feb89fe2398a95fe119a2325a52400175b
-  data.tar.gz: 672a9e854a7f3a9e8d3ee477d0e3b6e077111c62
+  metadata.gz: 8311c0f9e900cf884eff13a597b955673735c23e
+  data.tar.gz: d4431561b2ac5576b8ee42c1b794ede5839b5d84
 SHA512:
-  metadata.gz: e8d53e2fe84af682bffe4474a8bf61e8d72adecdcd8c18dca0e76560d8467295cc85af2b1e0b9f0ce0e6d7f884d2d10de8741512d6a2a262706ebe5f97aa9e57
-  data.tar.gz: 547b613736c776d94dbcc87abb467e62df5c6e246a0896d475a07ab0e6d98f6a3374b51455c2d8e985acb60134ea0d712c0cdf00453051bc969f70e1bc7f4a81
+  metadata.gz: 0b0191b8e6c69c47288c192a112ac7b0abe530dd8934b02a40b71c89e9e37c38db81650048e0ed8fb56006f3793ee86ebff7fbb3cbb9a2b5f913a9ecef26eddc
+  data.tar.gz: 1e9e2c7dcba583ef779cf882d25b6c5314be9b2a7d05a5d58ed55b3b4e26fb48567efbdfb424371d189231ff5cc0324c1974a334efefed35028d870f1205bdd8

data/README.md

@@ -54,7 +54,7 @@ Uage: dap  [input] + [filter] + [output]
 
 To see which input/output formats are supported and what filters are available, run `dap --inputs`,`dap --outputs` or `dap --filters`, respectively.
 
-This example reads as input a single IP address from `STDIN` in line form, applies geo-ip transofmrations as a filter on that line, and then returns the output as JSON:
+This example reads as input a single IP address from `STDIN` in line form, applies geo-ip transformations as a filter on that line, and then returns the output as JSON:
 
 ```
 $  echo 8.8.8.8 | bin/dap + lines + geo_ip line + json

data/lib/dap/filter/udp.rb

@@ -83,7 +83,17 @@ class FilterDecodeUPNP_SSDP_Reply
   include BaseDecoder
   def decode(data)
     head = { }
-    data.split(/\n/).each do |line|
+    lines = data.split(/\r?\n/)
+    return if lines.empty?
+    if /^HTTP\/\d+\.\d+\s+(?<http_code>\d+)(?:\s+(?<http_message>.*))?/ =~ lines.first
+      head["upnp_http_code"] = http_code
+      head["upnp_http_message"] = http_message
+    else
+      return
+    end
+
+    lines.shift
+    lines.each do |line|
       k,v = line.strip.split(':', 2)
       next if not k
       head["upnp_#{k.downcase}"] = (v.to_s.strip)

data/lib/dap/input.rb

@@ -64,8 +64,7 @@ module Input
       begin
         json = Oj.load(line.strip, mode: :strict)
       rescue
-        $stderr.puts "\nRecord is not valid JSON and will be skipped."
-        $stderr.puts line
+        $stderr.puts "Record is not valid JSON and will be skipped: '#{line}'"
         return Error::InvalidFormat
       end
       return Error::Empty unless json
@@ -78,4 +77,4 @@ end
 end
 
 require 'dap/input/warc'
-require 'dap/input/csv'
+require 'dap/input/csv'

data/lib/dap/version.rb

@@ -1,3 +1,3 @@
 module Dap
-  VERSION = "0.1.18"
+  VERSION = "0.1.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dap
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.20
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: 'DAP: The Data Analysis Pipeline'