passivedns-client 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99f46038dc124731029b866ca3169f389b797d18
-  data.tar.gz: 62750bf6fb8dbca75a730969870a08506ea06839
+  metadata.gz: c9428d4dc084c7a7f0e734e9902791b469e6bd49
+  data.tar.gz: ddd6535a823edbf3e3a89bdd388782405fc6b52a
 SHA512:
-  metadata.gz: 13266b09a81762ccb954862a46b0b9b72827d437b10c3c622d993a99aa19a191e5998c805be436f3d07a2d1729e262f7620237ca5563c83fc0b63ce523ae0dd5
-  data.tar.gz: 42ad695d9b218d8bf56f1a52ecf97ac17d51a8b36891f5711a465183f3c0a47237b3d6e556dc89e1905cf92415d8efeab999bd655e18f0877f9097ca36e7f5bf
+  metadata.gz: 6b0ca82916628a13baad54ce8c5ba263f33f8a661b43d659442656b5fe822914341b601b0203ecd8815898b096a4cb1d3c111c40a23032ec2ab7cc2d8b76713c
+  data.tar.gz: dcf33265380dedd7ad11f7d185036b7336dea02c7a89510d2d0cae4fac7ca3fafb945b965c616c658b1775c19a9252abe3a963e83feec2faff0b8b020c032900

data/README.md

@@ -51,6 +51,7 @@ From version 2.0.0 on, all configuration keys for passive DNS providers are in o
 	[mnemonic]
 	APIKEY = 01234567890abcdef01234567890abcdef012345
 	[passivetotal]
+	USERNAME = tom@example.com
 	APIKEY = 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
 	[circl]
 	USERNAME = circl_user

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

@@ -27,23 +27,25 @@ module PassiveDNS #:nodoc: don't document this
       attr_accessor :debug
       # === Options
       # * :debug       Sets the debug flag for the module
+      # * "USERNAME"   REQUIRED: The username for the associated API key
       # * "APIKEY"     REQUIRED: The API key associated with PassiveTotal
-      # * "URL"      Alternate url for testing.  Defaults to "https://www.passivetotal.org/api/v1/passive"
+      # * "URL"      Alternate url for testing.  Defaults to "https://api.passivetotal.org/v2/dns/passive"
       #
       # === Example Instantiation
       #
       #   options = {
       #     :debug => true,
+      #     "USERNAME" => "tom@example.com",
       #     "APIKEY" => "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
-      #     "URL" => "https://www.passivetotal.org/api/v1/passive"
+      #     "URL" => "https://api.passivetotal.org/v2/dns/passive"
       #   }
       
       #   or
       #
       #   options = {
       #     :debug => true,
+      #     "USERNAME" => "tom@example.com"
       #     "APIKEY" => "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
-      #     "API_VERSION" => "current"
       #   }
       #
       #   then
@@ -52,9 +54,9 @@ module PassiveDNS #:nodoc: don't document this
       #
   		def initialize(options={})
         @debug = options[:debug] || false
+        @username = options["USERNAME"] || raise("#{self.class.name} requires a USERNAME")
         @apikey = options["APIKEY"] || raise("#{self.class.name} requires an APIKEY")
-        @version = options["API_VERSION"] || "v1"
-        @url = options["URL"] || "https://www.passivetotal.org/api/#{@version}/passive"
+        @url = options["URL"] || "https://api.passivetotal.org/v2/dns/passive"
   		end
 
       # Takes a label (either a domain or an IP address) and returns
@@ -62,7 +64,7 @@ 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+"?api_key=#{@apikey}&query=#{label}"
+  				url = @url+"?query=#{label}"
   				$stderr.puts "DEBUG: #{self.class.name} url = #{url}" if @debug
   				url = URI.parse url
   				http = Net::HTTP.new(url.host, url.port)
@@ -70,6 +72,7 @@ module PassiveDNS #:nodoc: don't document this
   				http.verify_mode = OpenSSL::SSL::VERIFY_NONE
   				http.verify_depth = 5
   				request = Net::HTTP::Get.new(url.request_uri)
+          request.basic_auth(@username, @apikey)
   				request.add_field("User-Agent", "Ruby/#{RUBY_VERSION} passivedns-client rubygem v#{PassiveDNS::Client::VERSION}")
           #request.set_form_data({"api_key" => @apikey, "query" => label})
   				t1 = Time.now
@@ -92,9 +95,9 @@ module PassiveDNS #:nodoc: don't document this
   		def parse_json(page,query,response_time=0)
    			res = []
   			data = JSON.parse(page)
-        query = data['raw_query']
+        query = data['queryValue']
   			if data['results']
-  				data['results']['records'].each do |row|
+  				data['results'].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['resolve']
@@ -108,7 +111,6 @@ module PassiveDNS #:nodoc: don't document this
   			$stderr.puts "#{self.class.name} Exception: #{e}"
   			raise e
   		end
-
   	end
   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.5"
+    VERSION = "2.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passivedns-client
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - chrislee35
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json