passivedns-client 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f083bf7b1b864c041ef74ccd6efca87f3a21fb8
-  data.tar.gz: e6f27a043d5d736a86c73258bc3116d686224524
+  metadata.gz: 58add2933d802aa99d5d5869b7c77c27b3afc66c
+  data.tar.gz: 79241aee015fcc1efc1b86e2d12245b29986f83b
 SHA512:
-  metadata.gz: c229a32a9e7acedef70b22fef23d3864cbe03a797c3530674a9b4078ab0144f44225ea2dd8ed56357f91ee857a7635953f48d7f2f0357c6e502465b525e71ccd
-  data.tar.gz: 75bfba2c966b5315a6d6897771706decf2da68991057ee93b67b7ddb0bac471ca3e5c6895c60cd2438c75e8cbd6d077eefde6fc91e8eb01d95aa94f281a3e92e
+  metadata.gz: 2c2d5bff3b1ea9f5f21bc91f8352ce63d8172c74a4d22cf7e52952097ac5d7b528ea493b65a8487c48c0c6845992d2bbd9880c08b7c9f8232bc371af27aed1c1
+  data.tar.gz: 1848f7cac439362ba083693c5b382b7e89301634923e0d342c5c9eb7272b476e138cb1a4d75d78e147cb0d432646cd1492a60417e090a7374c36b7eae8d33ba2

data/lib/passivedns/client.rb

@@ -28,7 +28,12 @@ module PassiveDNS # :nodoc:
     # pdns        array of passivedns provider names, e.g., ["dnsdb","virustotal"]
     # configfile  filename of the passivedns-client configuration (this should probably be abstracted)
 		def initialize(pdns=$passivedns_providers, configfile="#{ENV['HOME']}/.passivedns-client")
-      cp = ConfigParser.new(configfile)
+      cp = {}
+      if File.exist?(configfile)
+        cp = ConfigParser.new(configfile)
+      else
+        $stderr.puts "Could not find config file at #{configfile}.  Using a blank configuration."
+      end
       # this creates a map of all the PassiveDNS provider names and their classes
       class_map = {}
       PassiveDNS::Provider.constants.each do |const|

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

@@ -3,6 +3,7 @@
 require 'net/http'
 require 'net/https'
 require 'openssl'
+require 'pp'
 
 module PassiveDNS #:nodoc: don't document this
   # The Provider module contains all the Passive DNS provider client code
@@ -27,22 +28,33 @@ module PassiveDNS #:nodoc: don't document this
       # === Options
       # * :debug       Sets the debug flag for the module
       # * "APIKEY"     REQUIRED: The API key associated with PassiveTotal
-      # * "URL"      Alternate url for testing.  Defaults to "https://www.passivetotal.org/api/passive"
+      # * "URL"      Alternate url for testing.  Defaults to "https://www.passivetotal.org/api/v1/passive"
       #
       # === Example Instantiation
       #
       #   options = {
       #     :debug => true,
       #     "APIKEY" => "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
-      #     "URL" => "https://www.passivetotal.org/api/passive"
+      #     "URL" => "https://www.passivetotal.org/api/v1/passive"
       #   }
+      
+      #   or
+      #
+      #   options = {
+      #     :debug => true,
+      #     "APIKEY" => "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
+      #     "API_VERSION" => "current"
+      #   }
+      #
+      #   then
       #
       #   PassiveDNS::Provider::PassiveTotal.new(options)
       #
   		def initialize(options={})
         @debug = options[:debug] || false
         @apikey = options["APIKEY"] || raise("#{self.class.name} requires an APIKEY")
-        @url = options["URL"] || "https://www.passivetotal.org/api/passive"
+        @version = options["API_VERSION"] || "v1"
+        @url = options["URL"] || "https://www.passivetotal.org/api/#{@version}/passive"
   		end
 
       # Takes a label (either a domain or an IP address) and returns
@@ -50,16 +62,16 @@ module PassiveDNS #:nodoc: don't document this
   		def lookup(label, limit=nil)
   			$stderr.puts "DEBUG: #{self.class.name}.lookup(#{label})" if @debug
   			Timeout::timeout(240) {
-  				url = @url
+  				url = @url+"?api_key=#{@apikey}&query=#{label}"
   				$stderr.puts "DEBUG: #{self.class.name} url = #{url}" if @debug
   				url = URI.parse url
   				http = Net::HTTP.new(url.host, url.port)
   				http.use_ssl = (url.scheme == 'https')
   				http.verify_mode = OpenSSL::SSL::VERIFY_NONE
   				http.verify_depth = 5
-  				request = Net::HTTP::Post.new(url.request_uri)
+  				request = Net::HTTP::Get.new(url.request_uri)
   				request.add_field("User-Agent", "Ruby/#{RUBY_VERSION} passivedns-client rubygem v#{PassiveDNS::Client::VERSION}")
-          request.set_form_data({"apikey" => @apikey, "value" => label})
+          #request.set_form_data({"api_key" => @apikey, "query" => label})
   				t1 = Time.now
   				response = http.request(request)
   				t2 = Time.now
@@ -79,13 +91,14 @@ module PassiveDNS #:nodoc: don't document this
       # parses the response of passivetotals's JSON reply to generate an array of PDNSResult
   		def parse_json(page,query,response_time=0)
    			res = []
+        puts page
   			data = JSON.parse(page)
+        query = data['raw_query']
   			if data['results']
-          query = data['results']['value']
-  				data['results']['resolutions'].each do |row|
+  				data['results']['records'].each do |row|
             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']
+            value = row['resolve']
             source = row['source'].join(",")
   					res << PDNSResult.new(self.class.name+"/"+source,response_time,
               query, value, "A", 0, first_seen, last_seen)

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.3"
+    VERSION = "2.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passivedns-client
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - chrislee35
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json