passivedns-client 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6916695e05fb5d4056da3c86b42126f646d8db0
-  data.tar.gz: 47ebd40317c9562e5cfb20a4daffc8c6b334429d
+  metadata.gz: d29ccf361ef159d087a669bcb1c079cdcc9cd9d1
+  data.tar.gz: b04ddd8e934977225087be6782540cf00b8a3e13
 SHA512:
-  metadata.gz: 857c98dcbae9642461142461f62bf6aaec40047a5aebb59fb05dac1cb59d08a0fc33e6c80d99be4f694b86c0c281d7bc7e8e96f00315655c07e1489cda847d94
-  data.tar.gz: 34af237f756637bdb6313b7476ae84d2c57b9bec641ee042ae6bcf889144389b89ee91da1206741338b961768b321650a8692e05e035f74737eea86fe708bf9b
+  metadata.gz: f45ae94c974ebedcb3a2b3d05da9f1ce69698f34f4b275a31137508ef680381116d35525836345a6b8c1a72a4d0359d0261a939b96d3c73f243f8a007f2b0ef6
+  data.tar.gz: aa2f36c8c9ded9632d07af3fbb4362212b6e461c0d63e60802404995ca2175f744134950470dac3802e30a4a61fab6bb7d7d57540c54e8fabe7416be505cd852

data/README.md

@@ -1,6 +1,6 @@
 # PassiveDNS::Client
 
-This rubygem queries 5 major Passive DNS databases: BFK, CERTEE, DNSParse, DNSDB, and VirusTotal.
+This rubygem queries 7 major Passive DNS databases: BFK, CERTEE, DNSParse, DNSDB, VirusTotal, PassiveDNS.cn, and Mnemonic.
 Passive DNS is a technique where IP to hostname mappings are made by recording the answers of other people's queries.  
 
 There is a tool included, pdnstool, that wraps a lot of the functionality that you would need.
@@ -25,63 +25,48 @@ Or install it yourself as:
 
 ## Configuration
 
-### DNSDB (Farsight Security)
-
-The DNSDB configuration file is located at $HOME/.dnsdb-query.conf by default. The format for its configuration file only requires one line in the following format:
-
-  APIKEY="0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
-
-To request an API Key, please read https://api.dnsdb.info/.
-
-### CERTEE
-
-CERT-EE does not require any configuration.
-BFK.de
-
-BFK.de does not require any configuration. However, please read and abide by their usage policy at BFK.de. Currently, it just says not to perform automated queries.
-
-### VirusTotal
-
-VirusTotal's  (https://www.virustotal.com) passive DNS database requires an apikey in $HOME/.virustotal.  It is a 64 character hexstring on a single line.
-
-  01234567890abcdef01234567890abcdef01234567890abcdef01234567890abcdef
-
-
-### TCPIPUtils
-
-TCPIPUtils's (http://www.tcpiputils.com/premium-access) passive DNS database requires and apikey in $HOME/.tcpiputils.  It is a 64 character hexstring on a single line.
-
-  01234567890abcdef01234567890abcdef01234567890abcdef01234567890abcdef
-
-
-### PassiveDNS.cn from 360.cn
-
-PassiveDNS.cn (http://www.passivedns.cn) requires an API ID and and API KEY, which is obtainable by creating an account and sending an email to request an API key.  
-
-The configuration file can be in /etc/flint.conf (flint is the name of their tool, which is available at <a href='https://github.com/360netlab/flint'>https://github.com/360netlab/flint</a>) or in $HOME/.flint.conf (which is my preference).
-
-The file must have three lines and looks like:
+From version 2.0.0 on, all configuration keys for passive DNS providers are in one configuration file.  By default the location of the file is $HOME/.passivedns-client .  The syntax of this file is as follows:
 
+	[dnsdb]
+	APIKEY = 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+	[cn360]
 	API = http://some.web.address.for.their.api
 	API_ID = a username that is given when you register
 	API_KEY = a long and random password of sorts that is used along with the page request to generate a per page API key
+	[tcpiputils]
+	APIKEY = 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+	[virustotal]
+	APIKEY = 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+	[mnemonic]
+	APIKEY = 01234567890abcdef01234567890abcdef012345
+
+## Getting Access
+* 360.cn : http://www.passivedns.cn
+* BFK.de : No registration required, but please, please ready their usage policy at http://bfk.de
+* CERT-EE : No registration required
+* DNSDB (Farsight Security) : https://api.dnsdb.info/
+* Mnemonic : mss .at. mnemonic.no
+* TCPIPUtils : http://www.tcpiputils.com/premium-access
+* VirusTotal : https://www.virustotal.com
 
 ## Usage
 
-	require 'passivedns-client'
+	require 'passivedns/client'
 	
-	c = PassiveDNS::Client.new(['bfk','dnsdb']) # providers: bfk, tcpiputils, certee, dnsdb, virustotal
+	c = PassiveDNS::Client.new(['bfk','dnsdb']) # providers: bfk, tcpiputils, certee, dnsdb, virustotal, passivedns.cn, mnemonic
 	results = c.query("example.com")
 	
 Or use the included tool!
 
-	Usage: bin/pdnstool [-d [bedvt]] [-g|-v|-m|-c|-x|-y|-j|-t] [-os <sep>] [-f <file>] [-r#|-w#|-v] [-l <count>] <ip|domain|cidr>
-	  -dbedvt uses all of the available passive dns databases
-	  -db only use BFK
-	  -de only use CERT-EE (default)
-	  -dd only use DNSDB (formerly ISC)
-	  -dv only use VirusTotal
-	  -dt only use TCPIPUtils
+	Usage: bin/pdnstool [-d [bedvt3m]] [-g|-v|-m|-c|-x|-y|-j|-t] [-os <sep>] [-f <file>] [-r#|-w#|-v] [-l <count>] <ip|domain|cidr>
+	  -dbedvt3m uses all of the available passive dns databases
+	  -db use BFK
+	  -de use CERT-EE (default)
+	  -dd use DNSDB (formerly ISC)
+	  -dv use VirusTotal
+	  -dt use TCPIPUtils
+	  -d3 use 360.cn (www.passivedns.cn)
+	  -dm uses Mnemonic (passivedns.mnemonic.no)
 	  -dvt uses VirusTotal and TCPIPUtils (for example)
 
 	  -g outputs a link-nodal GDF visualization definition
@@ -100,6 +85,58 @@ Or use the included tool!
 	  -v outputs debugging information
 	  -l <count> limits the number of records returned per passive dns database queried.
 
+## Writing Your Own Database Adaptor
+
+	module PassiveDNS
+		class MyDatabaseAdaptor < PassiveDB
+			# override
+		    def self.name
+		      "MyPerfectDNS" # short, proper label
+		    end
+		    #override
+		    def self.config_section_name
+		      "perfect" # very short label to use in the configuration file
+		    end
+		    #override
+		    def self.option_letter
+		      "p" # single letter to specify the option for the command line tool
+		    end
+    
+		    attr_accessor :debug
+			def initialize(options={})
+			  @debug = options[:debug] || false
+			  # please include a way to change the base URL, HOST, etc., so that people can test
+			  # against a test/alternate version of your service
+		      @base = options["URL"] || "http://myperfectdns.example.com/pdns.cgi?query="
+			  @apikey = options["APIKEY"] || raise("APIKEY option required for #{self.class}")
+			end
+			
+			# override
+			def lookup(label, limit=nil)
+				$stderr.puts "DEBUG: #{self.class.name}.lookup(#{label})" if @debug
+				recs = []
+				Timeout::timeout(240) {
+					t1 = Time.now
+					# TODO: your code goes here to fetch the data from your service
+					# TODO: don't forget to impose the limit either during the fetch or during the parse phase
+					response_time = Time.now - t1
+					# TODO: parse your data and add PDNSResult objects to recs array
+					recs << PDNSResult.new(self.class.name, response_time, rrname ,
+						rdata, rrtype, ttl, first_seen, last_seen, count )
+				}
+				recs
+			rescue Timeout::Error => e # using the implied "begin/try" from the beginning of the function
+				$stderr.puts "#{self.class.name} lookup timed out: #{label}"
+			end
+		end
+	end
+
+## Passive DNS - Common Output Format
+
+There is an RFC, <a href='http://tools.ietf.org/html/draft-dulaunoy-kaplan-passive-dns-cof-01'>Passive DNS - Common Output Format</a>, and a proof of concept implementation, <a href='https://github.com/adulau/pdns-qof-server'>pdns-qof-server</a>, that describes a recommened JSON format for passive DNS data.  passivedns-client is very close to supporting it, but since I've never enteracted with a true implementation of this RFC, I can't attest that I could correctly parse it.  I think they way that they can encode multiple results into one record would actually break what I have right now.
+
+Right now, I'm in a wait and see mode with how this progresses before I start supporting yet another format or request that other providers start to adhere to a common output format.  If you have thoughts on the matter, I would love to discuss.
+
 ## Contributing
 
 1. Fork it
@@ -107,3 +144,5 @@ Or use the included tool!
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+<a href='mailto:github@chrislee[dot]dhs[dot]org[stop here]xxx'><img src='http://chrisleephd.us/images/github-email.png?passivedns-client'></a>

data/bin/pdnstool

@@ -49,15 +49,20 @@ def printresults(state,format,sep="\t")
 end
 
 def usage
-	puts "Usage: #{$0} [-d [bedvt]] [-g|-v|-m|-c|-x|-y|-j|-t] [-os <sep>] [-f <file>] [-r#|-w#|-v] [-l <count>] <ip|domain|cidr>"
-	puts "  -dbedvt3 uses all of the available passive dns databases"
-	puts "  -db use BFK"
-	puts "  -de use CERT-EE (default)"
-	puts "  -dd use DNSDB (formerly ISC)"
-	puts "  -dv use VirusTotal"
-  puts "  -dt use TCPIPUtils"
-  puts "  -d3 use 360.cn (www.passivedns.cn)"
-  puts "  -dvt uses VirusTotal and TCPIPUtils (for example)"
+  letter_map = {}
+  PassiveDNS.constants.each do |const|
+    if PassiveDNS.const_get(const).is_a?(Class) and PassiveDNS.const_get(const).superclass == PassiveDNS::PassiveDB
+      letter_map[PassiveDNS.const_get(const).option_letter] = [PassiveDNS.const_get(const).name, PassiveDNS.const_get(const).config_section_name]
+    end
+  end
+  databases = letter_map.keys.sort.join("")
+
+	puts "Usage: #{$0} [-d [#{databases}]] [-g|-v|-m|-c|-x|-y|-j|-t] [-os <sep>] [-f <file>] [-r#|-w#|-v] [-l <count>] <ip|domain|cidr>"
+	puts "  -d#{databases} uses all of the available passive dns databases"
+  letter_map.keys.sort.each do |l|
+    puts "  -d#{l} use #{letter_map[l][0]}"
+  end
+	puts "  -dvt uses VirusTotal and TCPIPUtils (for example)"
 	puts ""
 	puts "  -g outputs a link-nodal GDF visualization definition"
 	puts "  -v outputs a link-nodal graphviz visualization definition"
@@ -73,14 +78,14 @@ def usage
 	puts "  -r# specifies the levels of recursion to pull. **WARNING** This is quite taxing on the pDNS servers, so use judiciously (never more than 3 or so) or find yourself blocked!"
 	puts "  -w# specifies the amount of time to wait, in seconds, between queries (Default: 0)"
 	puts "  -v outputs debugging information"
-  puts "  -l <count> limits the number of records returned per passive dns database queried."
+	puts "  -l <count> limits the number of records returned per passive dns database queried."
 	exit
 end
 
 opts = GetoptLong.new(
 	[ '--help', '-h', GetoptLong::NO_ARGUMENT ],
 	[ '--debug', '-z', GetoptLong::NO_ARGUMENT ],
-  [ '--database', '-d', GetoptLong::REQUIRED_ARGUMENT ],
+	[ '--database', '-d', GetoptLong::REQUIRED_ARGUMENT ],
 	
 	[ '--gdf', '-g', GetoptLong::NO_ARGUMENT ],
 	[ '--graphviz', '-v', GetoptLong::NO_ARGUMENT ],
@@ -95,7 +100,7 @@ opts = GetoptLong.new(
 	[ '--sqlite3', '-f', GetoptLong::REQUIRED_ARGUMENT ],
 	[ '--recurse', '-r', GetoptLong::REQUIRED_ARGUMENT ],
 	[ '--wait', '-w', GetoptLong::REQUIRED_ARGUMENT ],
-  [ '--limit', '-l', GetoptLong::REQUIRED_ARGUMENT ]
+	[ '--limit', '-l', GetoptLong::REQUIRED_ARGUMENT ]
 )
 
 # sets the default search methods
@@ -115,22 +120,12 @@ opts.each do |opt, arg|
 		usage
 	when '--debug'
 		debug = true
-  when '--database'
-    arg.split(//).each do |c|
-      case c
-      when ','
-      when 'b'
-    		pdnsdbs << "bfk"
-      when 'e'
-    		pdnsdbs << "certee"
-      when 'd'
-    		pdnsdbs << "dnsdb"
-      when 'v'
-    		pdnsdbs << "virustotal"
-      when 't'
-        pdnsdbs << "tcpiputils"
-      when '3'
-        pdnsdbs << "cn360"
+	when '--database'
+  	arg.split(//).each do |c|
+      if c == ','
+        next
+      elsif letter_map[c]
+        pdnsdbs = letter_map[c][1]
       else
         raise "Unknown passive DNS database identifier: #{c}"
       end
@@ -164,8 +159,8 @@ opts.each do |opt, arg|
 		wait = arg.to_i
 	when '--sqlite3'
 		sqlitedb = arg
-  when '--limit'
-    limit = arg.to_i
+	when '--limit'
+		limit = arg.to_i
 	else
 		usage
 	end
@@ -182,15 +177,15 @@ end
 
 if debug
 	$stderr.puts "Using the following databases: #{pdnsdbs.join(", ")}"
-  $stderr.puts "Recursions: #{recursedepth}, Wait time: #{wait}, Limit: #{limit or 'none'}"
-  if format == "text" or format == "csv"
-    $stderr.puts "Output format: #{format} (sep=\"#{sep}\")"
-  else
-    $stderr.puts "Output format: #{format}"
-  end
-  if ENV['http_proxy']
-    $stderr.puts "Using proxy settings: http_proxy=#{ENV['http_proxy']}, https_proxy=#{ENV['https_proxy']}"
-  end
+	$stderr.puts "Recursions: #{recursedepth}, Wait time: #{wait}, Limit: #{limit or 'none'}"
+	if format == "text" or format == "csv"
+    	$stderr.puts "Output format: #{format} (sep=\"#{sep}\")"
+	else
+    	$stderr.puts "Output format: #{format}"
+	end
+	if ENV['http_proxy']
+		$stderr.puts "Using proxy settings: http_proxy=#{ENV['http_proxy']}, https_proxy=#{ENV['https_proxy']}"
+	end
 end
 
 state = nil

data/lib/passivedns/client/bfk.rb

@@ -1,12 +1,27 @@
 require 'open-uri'
+require_relative 'passivedb'
 
 module PassiveDNS
-	class BFK
-		attr_accessor :debug
-		def initialize
-			@debug = false
+	class BFK < PassiveDB
+    # override
+    def self.name
+      "BFK.de"
+    end
+    #override
+    def self.config_section_name
+      "bfk"
+    end
+    #override
+    def self.option_letter
+      "b"
+    end
+    
+    attr_accessor :debug
+		def initialize(options={})
+			@debug = options[:debug] || false
+      @base = options["URL"] || "http://www.bfk.de/bfk_dnslogger.html?query="
 		end
-		@@base = "http://www.bfk.de/bfk_dnslogger.html?query="
+    
 		def parse(page,response_time)
 			line = page.unpack('C*').pack('U*').split(/<table/).grep(/ id=\"logger\"/)
 			return [] unless line.length > 0
@@ -29,23 +44,23 @@ module PassiveDNS
 							######### FIX BLANKS FOR MX
 							
 					end
-					res << PDNSResult.new('BFK',response_time,r[0],r[2],r[1])
+					res << PDNSResult.new(self.class.name,response_time,r[0],r[2],r[1])
 				end
 			end
 			res
 		rescue Exception => e
-			$stderr.puts "BFKClient Exception: #{e}"
+			$stderr.puts "#{self.class.name} Exception: #{e}"
 			raise e
 		end
 
+    # override
 		def lookup(label, limit=nil)	
-			$stderr.puts "DEBUG: BFKClient.lookup(#{label})" if @debug
+			$stderr.puts "DEBUG: #{self.class.name}.lookup(#{label})" if @debug
 			Timeout::timeout(240) {
 				t1 = Time.now
 				open(
-					@@base+label,
-					"User-Agent" => "Ruby/#{RUBY_VERSION} passivedns-client rubygem v#{PassiveDNS::Client::VERSION}",
-					:http_basic_authentication => [@user,@pass]
+					@base+label,
+					"User-Agent" => "Ruby/#{RUBY_VERSION} passivedns-client rubygem v#{PassiveDNS::Client::VERSION}"
 				) do |f|
 					t2 = Time.now
 					recs = parse(f.read,t2-t1)
@@ -57,7 +72,7 @@ module PassiveDNS
 				end
 			}
 		rescue Timeout::Error => e
-			$stderr.puts "BFK lookup timed out: #{label}"      
+			$stderr.puts "#{self.class.name} lookup timed out: #{label}"      
 		end
 	end
 end

data/lib/passivedns/client/certee.rb

@@ -1,22 +1,40 @@
 require 'socket'
+require_relative 'passivedb'
 
 module PassiveDNS
-	class CERTEE
-		@@host = "sim.cert.ee"
-		attr_accessor :debug
-		def initialize
+	class CERTEE < PassiveDB
+    # override
+    def self.name
+      "CERTEE"
+    end
+    #override
+    def self.config_section_name
+      "certee"
+    end
+    #override
+    def self.option_letter
+      "e"
+    end
+    
+    attr_accessor :debug
+		def initialize(options={})
+      @debug = options[:debug] || false
+      @host = options["HOST"] || "sim.cert.ee"
+      @port = options["PORT"].to_i || 43
 		end
+
+    # override
 		def lookup(label, limit=nil)
-			$stderr.puts "DEBUG: CERTEE.lookup(#{label})" if @debug
+			$stderr.puts "DEBUG: #{self.class.name}.lookup(#{label})" if @debug
 			recs = []
 			begin
 				t1 = Time.now
-				s = TCPSocket.new(@@host,43)
+				s = TCPSocket.new(@host,@port)
 				s.puts(label)
 				s.each_line do |l|
           if l =~ /Traceback \(most recent call last\):/
             # there is a bug in the CERTEE lookup tool
-            raise "CERTEE is currently offline"
+            raise "#{self.class.name} is currently offline"
           end
 					(lbl,ans,fs,ls) = l.chomp.split(/\t/)
 					rrtype = 'A'
@@ -28,7 +46,7 @@ module PassiveDNS
 						rrtype = 'CNAME'
 					end
 					t2 = Time.now
-					recs << PDNSResult.new('CERTEE',t2-t1,lbl,ans,rrtype,0,Time.parse(fs).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),Time.parse(ls).utc.strftime("%Y-%m-%dT%H:%M:%SZ"))
+					recs << PDNSResult.new(self.class.name,t2-t1,lbl,ans,rrtype,0,Time.parse(fs).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),Time.parse(ls).utc.strftime("%Y-%m-%dT%H:%M:%SZ"))
 				end
 			rescue SocketError => e
 				$stderr.puts e

data/lib/passivedns/client/cn360.rb

@@ -3,34 +3,32 @@ require 'net/https'
 require 'openssl'
 require 'json'
 require 'digest/md5'
-require 'configparser'
-require 'pp'
-
-# Please read http://www.tcpiputils.com/terms-of-service under automated requests
+require_relative 'passivedb'
 
 module PassiveDNS
-  class CN360
+  class CN360 < PassiveDB
+    # override
+    def self.name
+      "360.cn"
+    end
+    #override
+    def self.config_section_name
+      "cn360"
+    end
+    #override
+    def self.option_letter
+      "3"
+    end
+    
     attr_accessor :debug
-        
-    def initialize(configfile="#{ENV["HOME"]}/.flint.conf")
-      @debug = false
-      if not File.exist?(configfile)
-        if not File.exist?("/etc/flint.conf")
-          raise "Cannot find a configuration file at #{configfile} or /etc/flint.conf"
+    def initialize(options={})
+      @debug = options[:debug] || false
+      ["API", "API_ID", "API_KEY"].each do |opt|
+        if not options[opt]
+          raise "Field #{opt} is required.  See README.md"
         end
-        configfile = "/etc/flint.conf"
-      end
-      
-      @cp = ConfigParser.new(configfile)
-      if not @cp["API"]
-        raise "Field, API, is required in the configuration file.  It should specify the URL of the JSON Web API."
-      end
-      if not @cp["API_ID"]
-        raise "Field, API_ID, is required in the configuration file.  It should specify the user ID for the API key."
-      end
-      if not @cp["API_KEY"]
-        raise "Field, API_KEY, is required in the configuration file.  It should specify the API key."
       end
+      @cp = options
     end
     
     def parse_json(page,query,response_time=0)
@@ -41,11 +39,11 @@ module PassiveDNS
         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('cn360', response_time, row["rrname"], row["rdata"], row["rrtype"], time_first, time_last, count)
+        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 "360.cn Exception: #{e}"
+			$stderr.puts "#{self.class.name} Exception: #{e}"
 			raise e
     end
     
@@ -60,7 +58,7 @@ module PassiveDNS
 			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_mode = OpenSSL::SSL::VERIFY_NONE # I hate doing this
 			http.verify_depth = 5
 			request = Net::HTTP::Get.new(url.path)
 			request.add_field("User-Agent", "Ruby/#{RUBY_VERSION} passivedns-client rubygem v#{PassiveDNS::Client::VERSION}")

data/lib/passivedns/client/dnsdb.rb

@@ -3,26 +3,28 @@
 # to request an API key, please email dnsdb-api at farsightsecurity dot com.
 require 'net/http'
 require 'net/https'
+require_relative 'passivedb'
 
 module PassiveDNS
-	class DNSDB
-		attr_accessor :debug
-		@@base="https://api.dnsdb.info/lookup"
-		
-		def initialize(config="#{ENV['HOME']}/.dnsdb-query.conf")
-			@debug = false
-			if File.exist?(config)
-				@key = File.open(config).readline.chomp
-				if @key =~ /^[0-9a-f]{64}$/
-					# pass
-				elsif @key =~ /^APIKEY=\"([0-9a-f]{64})\"/
-					@key = $1
-				else
-					raise "Format of configuration file (default: #{ENV['HOME']}/.dnsdb-query.conf) is:\nAPIKEY=\"<key>\"\nE.g.,\nAPIKEY=\"d41d8cd98f00b204e9800998ecf8427ed41d8cd98f00b204e9800998ecf8427e\"\n"
-				end
-			else
-				raise "Configuration file for DNSDB is required for intialization\nFormat of configuration file (default: #{ENV['HOME']}/.dnsdb-query.conf) is:\nAPIKEY=\"<key>\"\nE.g.,\nAPIKEY=\"d41d8cd98f00b204e9800998ecf8427ed41d8cd98f00b204e9800998ecf8427e\"\n"
-			end
+	class DNSDB < PassiveDB
+    # override
+    def self.name
+      "DNSDB"
+    end
+    #override
+    def self.config_section_name
+      "dnsdb"
+    end
+    #override
+    def self.option_letter
+      "d"
+    end
+    
+    attr_accessor :debug
+		def initialize(options={})
+			@debug = options[:debug] || false
+      @key = options["APIKEY"] || raise("APIKEY option required for #{self.class}")
+      @base = options["URL"] || "https://api.dnsdb.info/lookup"
 		end
 
 		def parse_json(page,response_time)
@@ -35,28 +37,28 @@ module PassiveDNS
 				record['rdata'] = [record['rdata']] if record['rdata'].class == String
 				record['rdata'].each do |rdata|
 					if record['time_first']
-						res << PDNSResult.new('DNSDB',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,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'])
 					else
-						res << PDNSResult.new('DNSDB',response_time,record['rrname'],rdata,record['rrtype'])
+						res << PDNSResult.new(self.class.name,response_time,record['rrname'],rdata,record['rrtype'])
 					end
 				end
 			end
 			res
 		rescue Exception => e
-			$stderr.puts "DNSDB Exception: #{e}"
+			$stderr.puts "#{self.class.name} Exception: #{e}"
 			$stderr.puts page
 			raise e
 		end
 
 		def lookup(label, limit=nil)
-			$stderr.puts "DEBUG: DNSDB.lookup(#{label})" if @debug
+			$stderr.puts "DEBUG: #{self.class.name}.lookup(#{label})" if @debug
 			Timeout::timeout(240) {
 				url = nil
 				if label =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\/\d{1,2})?$/
 					label = label.gsub(/\//,',')
-					url = "#{@@base}/rdata/ip/#{label}"
+					url = "#{@base}/rdata/ip/#{label}"
 				else
-					url = "#{@@base}/rrset/name/#{label}"
+					url = "#{@base}/rrset/name/#{label}"
 				end
 				url = URI.parse url
 				http = Net::HTTP.new(url.host, url.port)
@@ -78,7 +80,7 @@ module PassiveDNS
 				parse_json(response.body,t2-t1)
 			}
 		rescue Timeout::Error => e
-			$stderr.puts "DNSDB lookup timed out: #{label}"
+			$stderr.puts "#{self.class.name} lookup timed out: #{label}"
 		end
 	end
 end

data/lib/passivedns/client/mnemonic.rb

@@ -0,0 +1,72 @@
+# DESCRIPTION: Module to query Mnemonic's passive DNS repository
+# CONTRIBUTOR: Drew Hunt (pinowudi@yahoo.com)
+require 'net/http'
+require 'net/https'
+require 'openssl'
+
+module PassiveDNS
+	class Mnemonic < PassiveDB
+    # override
+    def self.name
+      "Mnemonic"
+    end
+    #override
+    def self.config_section_name
+      "mnemonic"
+    end
+    #override
+    def self.option_letter
+      "m"
+    end
+    
+    attr_accessor :debug
+		def initialize(options={})
+      @debug = options[:debug] || false
+      @apikey = options["APIKEY"] || raise("#{self.class.name} requires an APIKEY")
+      @url = options["URL"] || "https://passivedns.mnemonic.no/api1/?apikey="
+		end
+
+		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)
+			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'])
+					end
+				end
+			end
+			res
+		rescue Exception => e
+			$stderr.puts "#{self.class.name} Exception: #{e}"
+			raise e
+		end
+
+		def lookup(label, limit=nil)
+			$stderr.puts "DEBUG: #{self.class.name}.lookup(#{label})" if @debug
+			Timeout::timeout(240) {
+				url = "#{@url}#{@apikey}&query=#{label}&method=exact"
+				$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::Get.new(url.path+"?"+url.query)
+				request.add_field("User-Agent", "Ruby/#{RUBY_VERSION} passivedns-client rubygem v#{PassiveDNS::Client::VERSION}")
+				t1 = Time.now
+				response = http.request(request)
+				t2 = Time.now
+				recs = parse_json(response.body, label, t2-t1)
+				if limit
+					recs[0,limit]
+				else
+					recs
+				end
+			}
+		rescue Timeout::Error => e
+			$stderr.puts "#{self.class.name} lookup timed out: #{label}"
+		end
+	end
+end

data/lib/passivedns/client/passivedb.rb

@@ -0,0 +1,19 @@
+module PassiveDNS
+  class PassiveDB
+    def self.name
+      raise "You should implement your own version of .name"
+    end
+    
+    def self.config_section_name
+      name
+    end
+    
+    def self.option_letter
+      raise "You should pick a unique letter to serve as your database option letter for the command line option -d"
+    end
+    
+    def lookup(label, limit=nil)
+      raise "You must implement the lookup function"
+    end
+  end
+end

data/lib/passivedns/client/tcpiputils.rb

@@ -6,18 +6,25 @@ require 'json'
 # Please read http://www.tcpiputils.com/terms-of-service under automated requests
 
 module PassiveDNS
-  class TCPIPUtils
+  class TCPIPUtils < PassiveDB
+    # override
+    def self.name
+      "TCPIPUtils"
+    end
+    #override
+    def self.config_section_name
+      "tcpiputils"
+    end
+    #override
+    def self.option_letter
+      "t"
+    end
+
     attr_accessor :debug
-    def initialize(config="#{ENV['HOME']}/.tcpiputils")
-      @debug = false
-			if File.exist?(config)
-				@apikey = File.open(config).read.split(/\n/)[0]
-				$stderr.puts "DEBUG: TCPIPUtils#initialize(#{@apikey})" if @debug
-			else
-				raise "Error: Configuration file for TCPIPUtils is required for intialization
-Format of configuration file (default: #{ENV['HOME']}/.tcpiputils) is the 64 hex character apikey on one line.
-To obtain an API Key, go to http://www.tcpiputils.com/premium-access and purchase premium API access."
-			end
+    def initialize(options={})
+      @debug = options[:debug] || false
+      @apikey = options["APIKEY"] || raise("#{self.class.name} requires an APIKEY.  See README.md")
+      @url = options["URL"] || "https://www.utlsapi.com/api.php?version=1.0&apikey="
     end
     
     def format_recs(reply_data, question, delta)
@@ -26,23 +33,23 @@ To obtain an API Key, go to http://www.tcpiputils.com/premium-access and purchas
         case key
         when "ipv4"
           data.each do |rec|
-            recs << PDNSResult.new("tcpiputils", delta, question, rec["ip"], "A", nil, nil, rec["updatedate"], nil)
+            recs << PDNSResult.new(self.class.name, delta, question, rec["ip"], "A", nil, nil, rec["updatedate"], nil)
           end
         when "ipv6"
           data.each do |rec|
-            recs << PDNSResult.new("tcpiputils", delta, question, rec["ip"], "AAAA", nil, nil, rec["updatedate"], nil)
+            recs << PDNSResult.new(self.class.name, delta, question, rec["ip"], "AAAA", nil, nil, rec["updatedate"], nil)
           end
         when "dns"
           data.each do |rec|
-            recs << PDNSResult.new("tcpiputils", delta, question, rec["dns"], "NS", nil, nil, rec["updatedate"], nil)
+            recs << PDNSResult.new(self.class.name, delta, question, rec["dns"], "NS", nil, nil, rec["updatedate"], nil)
           end
         when "mx"
           data.each do |rec|
-            recs << PDNSResult.new("tcpiputils", delta, question, rec["dns"], "MX", nil, nil, rec["updatedate"], nil)
+            recs << PDNSResult.new(self.class.name, delta, question, rec["dns"], "MX", nil, nil, rec["updatedate"], nil)
           end
         when "domains"
           data.each do |rec|
-            recs << PDNSResult.new("tcpiputils", delta, rec, question, "A", nil, nil, nil, nil)
+            recs << PDNSResult.new(self.class.name, delta, rec, question, "A", nil, nil, nil, nil)
           end
         end
       end
@@ -50,9 +57,9 @@ To obtain an API Key, go to http://www.tcpiputils.com/premium-access and purchas
     end
 
     def lookup(label, limit=nil)
-      $stderr.puts "DEBUG: TCPIPUtils.lookup(#{label})" if @debug
+      $stderr.puts "DEBUG: #{self.class.name}.lookup(#{label})" if @debug
       type = (label.match(/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/)) ? "domainneighbors" : "domainipdnshistory"
-      url = "https://www.utlsapi.com/api.php?version=1.0&apikey=#{@apikey}&type=#{type}&q=#{label}"
+      url = "#{@url}#{@apikey}&type=#{type}&q=#{label}"
       recs = []
       Timeout::timeout(240) {
 				url = URI.parse url
@@ -70,7 +77,7 @@ To obtain an API Key, go to http://www.tcpiputils.com/premium-access and purchas
           question = reply["data"]["question"]
           recs = format_recs(reply["data"], question, delta)
         elsif reply["status"] and reply["status"] == "error"
-          raise "TCPIPUtils: error from web API: #{reply["data"]}"
+          raise "#{self.class.name}: error from web API: #{reply["data"]}"
         end
         if limit
           recs[0,limit]
@@ -79,7 +86,7 @@ To obtain an API Key, go to http://www.tcpiputils.com/premium-access and purchas
         end
 			}
 		rescue Timeout::Error => e
-			$stderr.puts "TCPIPUtils lookup timed out: #{label}"
+			$stderr.puts "#{self.class.name} lookup timed out: #{label}"
 		end
   end
 end

data/lib/passivedns/client/version.rb

@@ -1,5 +1,5 @@
 module PassiveDNS
   class Client
-    VERSION = "1.4.1"
+    VERSION = "2.0.0"
   end
 end

data/lib/passivedns/client/virustotal.rb

@@ -4,16 +4,26 @@ require 'net/https'
 require 'openssl'
 
 module PassiveDNS
-	class VirusTotal
-		attr_accessor :debug
-		def initialize(config="#{ENV['HOME']}/.virustotal")
-			if File.exist?(config)
-				@apikey = File.open(config).read.split(/\n/)[0]
-				$stderr.puts "DEBUG: VirusTotal#initialize(#{@apikey})" if @debug
-			else
-				raise "Configuration file for VirusTotal is required for intialization\nFormat of configuration file (default: #{ENV['HOME']}/.virustotal) is the 64 hex character apikey on one line."
-			end
-		end
+	class VirusTotal < PassiveDB
+    # override
+    def self.name
+      "VirusTotal"
+    end
+    #override
+    def self.config_section_name
+      "virustotal"
+    end
+     #override
+    def self.option_letter
+      "v"
+    end
+    
+    attr_accessor :debug
+		def initialize(options={})
+      @debug = options[:debug] || false
+      @apikey = options["APIKEY"] || raise("#{self.class.name} requires an APIKEY.  See README.md")
+      @url = options["URL"] || "https://www.virustotal.com/vtapi/v2/"
+    end
 
 		def parse_json(page,query,response_time=0)
 			res = []
@@ -22,9 +32,9 @@ module PassiveDNS
 			if data['resolutions']
 				data['resolutions'].each do |row|
 					if row['ip_address']
-						res << PDNSResult.new('VirusTotal',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,row['last_resolved'])
 					elsif row['hostname']
-						res << PDNSResult.new('VirusTotal',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,row['last_resolved'])
 					end
 				end
 			end
@@ -35,15 +45,15 @@ module PassiveDNS
 		end
 
 		def lookup(label, limit=nil)
-			$stderr.puts "DEBUG: VirusTotal.lookup(#{label})" if @debug
+			$stderr.puts "DEBUG: #{self.class.name}.lookup(#{label})" if @debug
 			Timeout::timeout(240) {
 				url = nil
 				if label =~ /^[\d\.]+$/
-					url = "https://www.virustotal.com/vtapi/v2/ip-address/report?ip=#{label}&apikey=#{@apikey}"
+					url = "#{@url}ip-address/report?ip=#{label}&apikey=#{@apikey}"
 				else
-					url = "https://www.virustotal.com/vtapi/v2/domain/report?domain=#{label}&apikey=#{@apikey}"
+					url = "#{@url}domain/report?domain=#{label}&apikey=#{@apikey}"
 				end
-				$stderr.puts "DEBUG: VirusTotal url = #{url}" if @debug
+				$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')
@@ -62,7 +72,7 @@ module PassiveDNS
         end
 			}
 		rescue Timeout::Error => e
-			$stderr.puts "VirusTotal lookup timed out: #{label}"
+			$stderr.puts "#{self.class.name} lookup timed out: #{label}"
 		end
 	end
 end

data/lib/passivedns/client.rb

@@ -3,6 +3,7 @@ require "passivedns/client/version"
 # This code is released under the LGPL: http://www.gnu.org/licenses/lgpl-3.0.txt
 # Please note that use of any passive dns database is subject to the terms of use of that passive dns database.  Use of this script in violation of their terms is not encouraged in any way.  Also, please do not add any obfuscation to try to work around their terms of service.  If you need special services, ask the providers for help/permission.
 # Remember, these passive DNS operators are my friends.  I don't want to have a row with them because some asshat used this library to abuse them.
+require 'passivedns/client/passivedb.rb'
 require 'passivedns/client/bfk.rb'
 require 'passivedns/client/certee.rb'
 require 'passivedns/client/dnsdb.rb'
@@ -10,34 +11,34 @@ require 'passivedns/client/virustotal.rb'
 require 'passivedns/client/tcpiputils.rb'
 require 'passivedns/client/cn360.rb'
 require 'passivedns/client/state.rb'
+require 'passivedns/client/mnemonic.rb'
+require 'configparser'
+require 'pp'
 
 module PassiveDNS
 
 	class PDNSResult < Struct.new(:source, :response_time, :query, :answer, :rrtype, :ttl, :firstseen, :lastseen, :count); end
 
 	class Client
-		def initialize(pdns=['bfk','certee','dnsdb','virustotal','tcpiputils','cn360'])
+		def initialize(pdns=['bfk','certee','dnsdb','virustotal','tcpiputils','cn360','mnemonic'], configfile="#{ENV['HOME']}/.passivedns-client")
+      cp = ConfigParser.new(configfile)
+      # this creates a map of all the PassiveDNS provider names and their classes
+      class_map = {}
+      PassiveDNS.constants.each do |const|
+        if PassiveDNS.const_get(const).is_a?(Class) and PassiveDNS.const_get(const).superclass == PassiveDNS::PassiveDB
+          class_map[PassiveDNS.const_get(const).config_section_name] = PassiveDNS.const_get(const)
+        end
+      end
+      
 			@pdnsdbs = []
-			pdns.uniq.each do |pd|
-				case pd
-				when 'bfk'
-					@pdnsdbs << PassiveDNS::BFK.new
-				when 'certee'
-					@pdnsdbs << PassiveDNS::CERTEE.new
-				when 'dnsdb'
-					@pdnsdbs << PassiveDNS::DNSDB.new
-				when 'isc'
-					@pdnsdbs << PassiveDNS::DNSDB.new
-				when 'virustotal'
-					@pdnsdbs << PassiveDNS::VirusTotal.new
-        when 'tcpiputils'
-					@pdnsdbs << PassiveDNS::TCPIPUtils.new
-        when 'cn360'
-					@pdnsdbs << PassiveDNS::CN360.new
-				else
-					raise "Unknown Passive DNS provider: #{pd}"
-				end
-			end
+      pdns.uniq.each do |pd|
+        if class_map[pd]
+          @pdnsdbs << class_map[pd].new(cp[pd] || {})
+        else
+          raise "Unknown Passive DNS provider: #{pd}"
+        end
+      end
+
 		end #initialize
 		
 		def debug=(d)

data/test/test_passivedns-client.rb

@@ -7,8 +7,21 @@ unless Kernel.respond_to?(:require_relative)
 end
 
 require_relative 'helper'
+require 'configparser'
 
 class TestPassiveDnsQuery < Test::Unit::TestCase
+  
+  def setup
+    configfile="#{ENV['HOME']}/.passivedns-client"
+    @cp = ConfigParser.new(configfile)
+    @class_map = {}
+    PassiveDNS.constants.each do |const|
+      if PassiveDNS.const_get(const).is_a?(Class) and PassiveDNS.const_get(const).superclass == PassiveDNS::PassiveDB
+        @class_map[PassiveDNS.const_get(const).config_section_name] = PassiveDNS.const_get(const)
+      end
+    end
+  end
+    
 	def test_instantiate_Nonexisting_Client
 		assert_raise RuntimeError do
 			PassiveDNS::Client.new(['doesnotexist'])
@@ -36,18 +49,19 @@ class TestPassiveDnsQuery < Test::Unit::TestCase
 	end
 	
 	def test_BFK
-		assert_not_nil(PassiveDNS::BFK.new)
 		assert_nothing_raised do
 			PassiveDNS::Client.new(['bfk'])
 		end
-		rows = PassiveDNS::BFK.new.lookup("example.org",3)
+    d = PassiveDNS::BFK.new(@cp['bfk'] || {})
+    assert_not_nil(d)
+		rows = d.lookup("example.org",3)
 		assert_not_nil(rows)
 		assert_not_nil(rows.to_s)
 		assert_not_nil(rows.to_xml)
 		assert_not_nil(rows.to_json)
 		assert_not_nil(rows.to_yaml)
     assert_equal(3, rows.length)
-    rows = PassiveDNS::BFK.new.lookup("8.8.8.8")
+    rows = d.lookup("8.8.8.8")
     assert_not_nil(rows)
     assert_not_nil(rows.to_s)
     assert_not_nil(rows.to_xml)
@@ -57,18 +71,19 @@ class TestPassiveDnsQuery < Test::Unit::TestCase
 	
 	def test_CERTEE
     assert(false, "CERTEE is still offline")
-		assert_not_nil(PassiveDNS::CERTEE.new)
 		assert_nothing_raised do
 			PassiveDNS::Client.new(['certee'])
 		end
-		rows = PassiveDNS::CERTEE.new.lookup("sim.cert.ee",3)
+    d = PassiveDNS::CERTEE.new(@cp['certee'] || {})
+    assert_not_nil(d)
+		rows = d.lookup("sim.cert.ee",3)
 		assert_not_nil(rows)
 		assert_not_nil(rows.to_s)
 		assert_not_nil(rows.to_xml)
 		assert_not_nil(rows.to_json)
 		assert_not_nil(rows.to_yaml)
     assert_equal(3, rows.length)
-    rows = PassiveDNS::CERTEE.new.lookup("8.8.8.8")
+    rows = d.lookup("8.8.8.8")
     assert_not_nil(rows)
     assert_not_nil(rows.to_s)
     assert_not_nil(rows.to_xml)
@@ -77,18 +92,19 @@ class TestPassiveDnsQuery < Test::Unit::TestCase
 	end
 
 	def test_DNSDB
-		assert_not_nil(PassiveDNS::DNSDB.new)
 		assert_nothing_raised do
 			PassiveDNS::Client.new(['dnsdb'])
 		end
-		rows = PassiveDNS::DNSDB.new.lookup("example.org",3)
+    d = PassiveDNS::DNSDB.new(@cp['dnsdb'] || {})
+    assert_not_nil(d)
+		rows = d.lookup("example.org",3)
 		assert_not_nil(rows)
 		assert_not_nil(rows.to_s)
 		assert_not_nil(rows.to_xml)
 		assert_not_nil(rows.to_json)
 		assert_not_nil(rows.to_yaml)
     assert_equal(3, rows.length) # this will fail since DNSDB has an off by one error
-    rows = PassiveDNS::DNSDB.new.lookup("8.8.8.8")
+    rows = d.lookup("8.8.8.8")
     assert_not_nil(rows)
     assert_not_nil(rows.to_s)
     assert_not_nil(rows.to_xml)
@@ -97,18 +113,19 @@ class TestPassiveDnsQuery < Test::Unit::TestCase
 	end
 
 	def test_VirusTotal
-		assert_not_nil(PassiveDNS::VirusTotal.new)
 		assert_nothing_raised do
 			PassiveDNS::Client.new(['virustotal'])
 		end
-		rows = PassiveDNS::VirusTotal.new.lookup("google.com",3)
+    d = PassiveDNS::VirusTotal.new(@cp['virustotal'] || {})
+    assert_not_nil(d)
+		rows = d.lookup("google.com",3)
 		assert_not_nil(rows)
 		assert_not_nil(rows.to_s)
 		assert_not_nil(rows.to_xml)
 		assert_not_nil(rows.to_json)
 		assert_not_nil(rows.to_yaml)
     assert_equal(3, rows.length)
-    rows = PassiveDNS::VirusTotal.new.lookup("8.8.8.8")
+    rows = d.lookup("8.8.8.8")
     assert_not_nil(rows)
     assert_not_nil(rows.to_s)
     assert_not_nil(rows.to_xml)
@@ -117,24 +134,25 @@ class TestPassiveDnsQuery < Test::Unit::TestCase
 	end
   
   def test_TCPIPUtils
-    assert_not_nil(PassiveDNS::TCPIPUtils.new)
     assert_nothing_raised do
       PassiveDNS::Client.new(['tcpiputils'])
     end
-    rows = PassiveDNS::TCPIPUtils.new.lookup("example.org")
+    d = PassiveDNS::TCPIPUtils.new(@cp['tcpiputils'] || {})
+    assert_not_nil(d)
+    rows = d.lookup("example.org")
     assert_not_nil(rows)
     assert_not_nil(rows.to_s)
     assert_not_nil(rows.to_xml)
     assert_not_nil(rows.to_json)
     assert_not_nil(rows.to_yaml)
-    rows = PassiveDNS::TCPIPUtils.new.lookup("example.org",3)
+    rows = d.lookup("example.org",3)
     assert_not_nil(rows)
     assert_not_nil(rows.to_s)
     assert_not_nil(rows.to_xml)
     assert_not_nil(rows.to_json)
     assert_not_nil(rows.to_yaml)
     assert_equal(3, rows.length)
-    rows = PassiveDNS::TCPIPUtils.new.lookup("8.8.8.8")
+    rows = d.lookup("8.8.8.8")
     assert_not_nil(rows)
     assert_not_nil(rows.to_s)
     assert_not_nil(rows.to_xml)
@@ -143,28 +161,56 @@ class TestPassiveDnsQuery < Test::Unit::TestCase
   end
 
   def test_cn360
-    assert_not_nil(PassiveDNS::CN360.new)
     assert_nothing_raised do
       PassiveDNS::Client.new(['cn360'])
     end
-    rows = PassiveDNS::CN360.new.lookup("example.org")
+    d = PassiveDNS::CN360.new(@cp['cn360'] || {})
+    assert_not_nil(d)
+    rows = d.lookup("example.org")
     assert_not_nil(rows)
     assert_not_nil(rows.to_s)
     assert_not_nil(rows.to_xml)
     assert_not_nil(rows.to_json)
     assert_not_nil(rows.to_yaml)
-    rows = PassiveDNS::CN360.new.lookup("example.org",3)
+    rows = d.lookup("example.org",3)
     assert_not_nil(rows)
     assert_not_nil(rows.to_s)
     assert_not_nil(rows.to_xml)
     assert_not_nil(rows.to_json)
     assert_not_nil(rows.to_yaml)
     assert_equal(3, rows.length)
-    rows = PassiveDNS::CN360.new.lookup("8.8.8.8")
+    rows = d.lookup("8.8.8.8")
     assert_not_nil(rows)
     assert_not_nil(rows.to_s)
     assert_not_nil(rows.to_xml)
     assert_not_nil(rows.to_json)
     assert_not_nil(rows.to_yaml)
-  end
+	end
+  
+  def test_nmemonic
+		assert_nothing_raised do
+			PassiveDNS::Client.new(['mnemonic'])
+		end
+    d = PassiveDNS::Mnemonic.new(@cp['mnemonic'] || {})
+    assert_not_nil(d)
+		rows = d.lookup("example.org")
+		assert_not_nil(rows)
+		assert_not_nil(rows.to_s)
+		assert_not_nil(rows.to_xml)
+		assert_not_nil(rows.to_json)
+		assert_not_nil(rows.to_yaml)
+		rows = d.lookup("example.org",3)
+		assert_not_nil(rows)
+		assert_not_nil(rows.to_s)
+		assert_not_nil(rows.to_xml)
+		assert_not_nil(rows.to_json)
+		assert_not_nil(rows.to_yaml)
+		assert_equal(3, rows.length)
+		rows = d.lookup("8.8.8.8")
+		assert_not_nil(rows)
+		assert_not_nil(rows.to_s)
+		assert_not_nil(rows.to_xml)
+		assert_not_nil(rows.to_json)
+		assert_not_nil(rows.to_yaml)
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passivedns-client
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - chrislee35
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -115,6 +115,8 @@ files:
 - lib/passivedns/client/certee.rb
 - lib/passivedns/client/cn360.rb
 - lib/passivedns/client/dnsdb.rb
+- lib/passivedns/client/mnemonic.rb
+- lib/passivedns/client/passivedb.rb
 - lib/passivedns/client/state.rb
 - lib/passivedns/client/tcpiputils.rb
 - lib/passivedns/client/version.rb