passivedns-client 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bc0b0ff155e1b9570c05b45f22368b0cfa79a83
-  data.tar.gz: 4b2d805d77a29ef052c0003a116c21224166254f
+  metadata.gz: d8943fdb2df184fb90081be44049edc69a35ac80
+  data.tar.gz: 409d45d5b94c4ab0c1d3d3e7caa57d2e192add8d
 SHA512:
-  metadata.gz: 21dd2aefcc5074d626047c4cf4e798c33b9dc063199667b29a68614463b464e01f91fe72b285ecf2a3a752f8ef1f9a4082c1da797f6ed405950becefa32e5c55
-  data.tar.gz: 39c7c7ae6f931634c58c588a9ce7113bdcd776becc587036e6a51261ba7d67008619b9cdf9da478674ba34cc46d255a965a9dc6dbaec83c9092e59daa95a2b49
+  metadata.gz: 0b4d1bee2454906a09b5af88a48a3792ad0e9bdb032512362c7803f66ee12352bbe9ccf36e476fe5a406498d89e413588d2778650151480bb01d66a8e295dec3
+  data.tar.gz: 086a9fdf306f2c67c8ff7ace94fa36e14d07a1d8631931d8d22c32c5b9295bcb79d20b433e3e074de3d1a7ed2e2c13930ec8305104b90c23dd9b3c88b0bbb0f3

data/lib/passivedns/client/provider/bfk.rb

@@ -88,7 +88,10 @@ module PassiveDNS #:nodoc: don't document this
   							######### FIX BLANKS FOR MX
 						
   					end
-  					res << PDNSResult.new(self.class.name,response_time,r[0],r[2],r[1])
+            query = r[0]
+            answer = r[2]
+            rrtype = r[1]
+  					res << PDNSResult.new(self.class.name,response_time,query,answer,rrtype)
   				end
   			end
   			res

data/lib/passivedns/client/provider/circl.rb

@@ -95,9 +95,11 @@ module PassiveDNS #:nodoc: don't document this
   			# need to remove the json_class tag or the parser will crap itself trying to find a class to align it to
         page.split(/\n/).each do |line|
           row = JSON.parse(line)
+          firstseen = Time.at(row['time_first'].to_i)
+          lastseen = Time.at(row['time_last'].to_i)
   				res << PDNSResult.new(self.class.name,response_time,
             row['rrname'], row['rdata'], row['rrtype'], 0, 
-            row['time_first'], row['time_last'], row['count'])
+            firstseen, lastseen, row['count'])
         end
   			res
   		rescue Exception => e

data/lib/passivedns/client/provider/cn360.rb

@@ -82,27 +82,31 @@ module PassiveDNS #:nodoc: don't document this
         else
           recs
         end
+      end
       
-        private
+      private
       
-        # parses the response of 360.cn's JSON reply to generate an array of PDNSResult
-        def parse_json(page,query,response_time=0)
-    			res = []
-    			# need to remove the json_class tag or the parser will crap itself trying to find a class to align it to
-    			data = JSON.parse(page)
-          data.each do |row|
-            time_first = (row["time_first"]) ? Time.at(row["time_first"].to_i) : nil
-            time_last = (row["time_last"]) ? Time.at(row["time_last"].to_i) : nil
-            count = row["count"] || 0
-            res << PDNSResult.new(self.class.name, response_time, row["rrname"], row["rdata"], row["rrtype"], time_first, time_last, count)
-    			end
-    			res
-    		rescue Exception => e
-    			$stderr.puts "#{self.class.name} Exception: #{e}"
-    			raise e
-        end
-    
-      end      
+      # parses the response of 360.cn's JSON reply to generate an array of PDNSResult
+      def parse_json(page,query,response_time=0)
+  			res = []
+  			# need to remove the json_class tag or the parser will crap itself trying to find a class to align it to
+  			data = JSON.parse(page)
+        data.each do |row|
+          time_first = (row["time_first"]) ? Time.at(row["time_first"].to_i) : nil
+          time_last = (row["time_last"]) ? Time.at(row["time_last"].to_i) : nil
+          count = row["count"] || 0
+          query = row["rrname"]
+          answers = row["rdata"].gsub(/;$/,'').split(/;/)
+          rrtype = row["rrtype"]
+          answers.each do |answer|
+            res << PDNSResult.new(self.class.name, response_time, query, answer, rrtype, time_first, time_last, count)
+          end
+  			end
+  			res
+  		rescue Exception => e
+  			$stderr.puts "#{self.class.name} Exception: #{e}"
+  			raise e
+      end
     end
   end
 end

data/lib/passivedns/client/provider/dnsdb.rb

@@ -90,12 +90,21 @@ module PassiveDNS #:nodoc: don't document this
   			rows = page.split(/\n/)
   			rows.each do |row|
   				record = JSON.parse(row)
-  				record['rdata'] = [record['rdata']] if record['rdata'].class == String
-  				record['rdata'].each do |rdata|
+          answers = record['rdata']
+  				answers = [record['rdata']] if record['rdata'].class == String
+          query = record['rrname'].gsub!(/\.$/,'')
+          rrtype = record['rrtype']
+          firstseen = Time.at(record['time_first'].to_i)
+          lastseen = Time.at(record['time_last'].to_i)
+          count = record['count']
+          
+  				answers.each do |answer|
+            answer.gsub!(/\.$/,'')
   					if record['time_first']
-  						res << PDNSResult.new(self.class.name,response_time,record['rrname'],rdata,record['rrtype'],0,Time.at(record['time_first'].to_i).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),Time.at(record['time_last'].to_i).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),record['count'])
+  						res << PDNSResult.new(self.class.name,response_time,query,answer,rrtype,
+                0,firstseen,lastseen,count)
   					else
-  						res << PDNSResult.new(self.class.name,response_time,record['rrname'],rdata,record['rrtype'])
+  						res << PDNSResult.new(self.class.name,response_time,query,answer,rrtype)
   					end
   				end
   			end

data/lib/passivedns/client/provider/mnemonic.rb

@@ -83,7 +83,14 @@ module PassiveDNS #:nodoc: don't document this
   			if data['result']
   				data['result'].each do |row|
   					if row['query']
-  						res << PDNSResult.new(self.class.name,response_time,row['query'],row['answer'],row['type'].upcase,row['ttl'],row['first'],row['last'])
+              query = row['query']
+              answer = row['answer']
+              rrtype = row['type'].upcase
+              tty = row['ttl'].to_i
+              firstseen = row['first']
+              lastseen = row['last']
+  						res << PDNSResult.new(self.class.name,response_time,
+                query, answer, rrtype, ttl, firstseen, lastseen)
   					end
   				end
   			end

data/lib/passivedns/client/provider/passivetotal.rb

@@ -84,8 +84,10 @@ module PassiveDNS #:nodoc: don't document this
   			if data['results']
           query = data['results']['value']
   				data['results']['resolutions'].each do |row|
-            first_seen = row['firstSeen']
-            last_seen = row['lastSeen']
+            #p row['firstSeen']
+            #p row['lastSeen']
+            first_seen = (row['firstSeen'] == "None") ? nil : Time.parse(row['firstSeen']+" +0000")
+            last_seen = (row['lastSeen'] == "None") ? nil : Time.parse(row['lastSeen']+" +0000")
             value = row['value']
             source = row['source'].join(",")
   					res << PDNSResult.new(self.class.name+"/"+source,response_time,

data/lib/passivedns/client/provider/riskiq.rb

@@ -3,7 +3,7 @@
 require 'net/http'
 require 'net/https'
 require 'openssl'
-#require 'pp'
+require 'pp'
 
 module PassiveDNS #:nodoc: don't document this
   # The Provider module contains all the Passive DNS provider client code
@@ -103,19 +103,21 @@ module PassiveDNS #:nodoc: don't document this
     
       # parses the response of riskiq's JSON reply to generate an array of PDNSResult
   		def parse_json(page,query,response_time=0)
-        #pp page
    			res = []
   			# need to remove the json_class tag or the parser will crap itself trying to find a class to align it to
   			data = JSON.parse(page)
+        #pp data
   			if data['records']
           data['records'].each do |record|
-            name = record['name']
+            name = record['name'].gsub!(/\.$/,'')
             type = record['rrtype']
-            last_seen = record['lastSeen']
-            first_seen = record['firstSeen']
+            last_seen = Time.parse(record['lastSeen'])
+            first_seen = Time.parse(record['firstSeen'])
+            count = record['count']
             record['data'].each do |datum|
+              datum.gsub!(/\.$/,'')
     					res << PDNSResult.new(self.class.name,response_time,
-                name, datum, type, 0, first_seen, last_seen)
+                name, datum, type, 0, first_seen, last_seen, count)
             end
           end
         end

data/lib/passivedns/client/provider/tcpiputils.rb

@@ -86,29 +86,39 @@ module PassiveDNS #:nodoc: don't document this
       # translates the data structure derived from of tcpiputils's JSON reply
       def format_recs(reply_data, question, delta)
         recs = []
+        fieldname = nil
+        rrtype = nil
+        add_records = false
         reply_data.each do |key, data|
           case key
           when "ipv4"
-            data.each do |rec|
-              recs << PDNSResult.new(self.class.name, delta, question, rec["ip"], "A", nil, nil, rec["updatedate"], nil)
-            end
+            fieldname = "ip"
+            rrtype = "A"
+            add_records = true
           when "ipv6"
-            data.each do |rec|
-              recs << PDNSResult.new(self.class.name, delta, question, rec["ip"], "AAAA", nil, nil, rec["updatedate"], nil)
-            end
+            fieldname = "ip"
+            rrtype = "AAAA"
+            add_records = true
           when "dns"
-            data.each do |rec|
-              recs << PDNSResult.new(self.class.name, delta, question, rec["dns"], "NS", nil, nil, rec["updatedate"], nil)
-            end
+            fieldname = "dns"
+            rrtype = "NS"
+            add_records = true
           when "mx"
-            data.each do |rec|
-              recs << PDNSResult.new(self.class.name, delta, question, rec["dns"], "MX", nil, nil, rec["updatedate"], nil)
-            end
+            fieldname = "dns"
+            rrtype = "MX"
+            add_records = true
           when "domains"
             data.each do |rec|
+              lastseen = (rec["updatedate"]) ? Date.parse(rec["updatedate"]) : nil
               recs << PDNSResult.new(self.class.name, delta, rec, question, "A", nil, nil, nil, nil)
             end
           end
+          if add_records
+            data.each do |rec|
+              lastseen = (rec["updatedate"]) ? Date.parse(rec["updatedate"]) : nil
+              recs << PDNSResult.new(self.class.name, delta, question, rec[fieldname], rrtype, nil, nil, lastseen, nil)
+            end
+          end
         end
         recs
       end

data/lib/passivedns/client/provider/virustotal.rb

@@ -87,10 +87,11 @@ module PassiveDNS #:nodoc: don't document this
   			data = JSON.parse(page)
   			if data['resolutions']
   				data['resolutions'].each do |row|
+            lastseen = Time.parse(row['last_resolved']+" +0000")
   					if row['ip_address']
-  						res << PDNSResult.new(self.class.name,response_time,query,row['ip_address'],'A',nil,nil,row['last_resolved'])
+  						res << PDNSResult.new(self.class.name,response_time,query,row['ip_address'],'A',nil,nil,lastseen)
   					elsif row['hostname']
-  						res << PDNSResult.new(self.class.name,response_time,row['hostname'],query,'A',nil,nil,row['last_resolved'])
+  						res << PDNSResult.new(self.class.name,response_time,row['hostname'],query,'A',nil,nil,lastseen)
   					end
   				end
   			end

data/lib/passivedns/client/version.rb

@@ -2,6 +2,6 @@ module PassiveDNS # :nodoc:
   # coodinates the lookups accross all configured PassiveDNS providers
   class Client
     # version of PassiveDNS::Client
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passivedns-client
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - chrislee35
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json