passivedns-client 2.1.7 → 2.1.13

data/lib/passivedns/client/state.rb

@@ -205,11 +205,12 @@ module PassiveDNS # :nodoc:
     # creates an SQLite3-based Passive DNS Client state
     # only argument is the filename of the sqlite3 database
     def initialize(sqlitedb=nil)
+      @debug = false
       puts "PDNSToolState  initialize  #{sqlitedb}" if @debug
       @level = 0
       @sqlitedb = sqlitedb
       raise "Cannot use this class without a database file" unless @sqlitedb
-      unless File.exists?(@sqlitedb)
+      unless File.exist?(@sqlitedb)
         newdb = true
       end
       @sqlitedbh = SQLite3::Database.new(@sqlitedb)

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

data/passivedns-client.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
 
-	spec.add_runtime_dependency 'json', '>= 1.4.3'
-	spec.add_runtime_dependency 'sqlite3', '>= 1.3.3'
-	spec.add_runtime_dependency 'structformatter', '~> 0.0.1'
-  spec.add_runtime_dependency 'configparser', '~> 0.1.3'
-  spec.add_development_dependency "minitest", "~> 5.5"
-	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_runtime_dependency 'json'
+	spec.add_runtime_dependency 'sqlite3'
+	spec.add_runtime_dependency 'structformatter'
+  spec.add_runtime_dependency 'configparser'
+  spec.add_development_dependency "minitest"
+	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rake"
 
 	#spec.signing_key   = "#{File.dirname(__FILE__)}/../gem-private_key.pem"

data/test/test_cli.rb

@@ -13,26 +13,22 @@ require_relative '../lib/passivedns/client/cli.rb'
 class TestCLI < Minitest::Test
   def test_letter_map
     letter_map = PassiveDNS::CLI.get_letter_map
-    assert_equal("3bcdmprtv", letter_map.keys.sort.join(""))
+    assert_equal("cdprv", letter_map.keys.sort.join(""))
   end
   
   def test_help_text
     helptext = PassiveDNS::CLI.run(["--help"])
     helptext.gsub!(/Usage: .*?\[/, "Usage: [")
     assert_equal(
-"Usage: [-d [3bcdmprtv]] [-g|-v|-m|-c|-x|-y|-j|-t] [-os <sep>] [-f <file>] [-r#|-w#|-v] [-l <count>] <ip|domain|cidr>
+"Usage: [-d [cdprv]] [-g|-v|-m|-c|-x|-y|-j|-t] [-os <sep>] [-f <file>] [-r#|-w#|-v] [-l <count>] [--config <file>] <ip|domain|cidr>
 Passive DNS Providers
-  -d3bcdmprtv uses all of the available passive dns database
-  -d3 use 360.cn
-  -db use BFK.de
+  -dcdprv uses all of the available passive dns database
   -dc use CIRCL
   -dd use DNSDB
-  -dm use Mnemonic
   -dp use PassiveTotal
   -dr use RiskIQ
-  -dt use TCPIPUtils
   -dv use VirusTotal
-  -dvt uses VirusTotal and TCPIPUtils (for example)
+  -dvr uses VirusTotal and RiskIQ (for example)
 
 Output Formatting
   -g link-nodal GDF visualization definition
@@ -51,6 +47,9 @@ State and Recursion
   -w# specifies the amount of time to wait, in seconds, between queries (Default: 0)
   -l <count> limits the number of records returned per passive dns database queried.
 
+Specifying a Configuration File
+  --config <file> specifies a config file. default: #{ENV['HOME']}/.passivedns-client
+
 Getting Help
   -h hello there.  This option produces this helpful help information on how to access help.
   -v debugging information
@@ -59,7 +58,7 @@ Getting Help
   
   def test_provider_parsing
     options_target = {
-      :pdnsdbs => ["bfk"],
+      :pdnsdbs => ["virustotal"],
       :format => "text",
       :sep => "\t",
       :recursedepth => 1,
@@ -68,30 +67,21 @@ Getting Help
       :debug => false,
       :sqlitedb => nil,
       :limit => nil,
-      :help => false
+      :help => false,
+      :configfile => "#{ENV['HOME']}/.passivedns-client"
     }
     
     options, items = PassiveDNS::CLI.parse_command_line([])
     assert_equal(options_target, options)
     assert_equal([], items)
-    
-    options_target[:pdnsdbs] = ["cn360"]
-    options, items = PassiveDNS::CLI.parse_command_line(["-d3"])
-    assert_equal(options_target, options)
-    assert_equal([], items)
-
-    options_target[:pdnsdbs] = ["bfk"]
-    options, items = PassiveDNS::CLI.parse_command_line(["-db"])
-    assert_equal(options_target, options)
-    assert_equal([], items)
-   
-    options_target[:pdnsdbs] = ["circl", "dnsdb", "mnemonic", "riskiq"]
-    options, items = PassiveDNS::CLI.parse_command_line(["-dcdmr"])
+       
+    options_target[:pdnsdbs] = ["circl", "dnsdb", "riskiq"]
+    options, items = PassiveDNS::CLI.parse_command_line(["-dcdr"])
     assert_equal(options_target, options)
     assert_equal([], items)
     
-    options_target[:pdnsdbs] = ["passivetotal", "tcpiputils", "virustotal"]
-    options, items = PassiveDNS::CLI.parse_command_line(["-dptv"])
+    options_target[:pdnsdbs] = ["passivetotal", "virustotal"]
+    options, items = PassiveDNS::CLI.parse_command_line(["-dpv"])
     assert_equal(options_target, options)
     assert_equal([], items)
     
@@ -99,7 +89,7 @@ Getting Help
   
   def test_output_parsing
     options_target = {
-      :pdnsdbs => ["passivetotal", "tcpiputils", "virustotal"],
+      :pdnsdbs => ["passivetotal", "virustotal"],
       :format => "text",
       :sep => "\t",
       :recursedepth => 1,
@@ -108,52 +98,53 @@ Getting Help
       :debug => false,
       :sqlitedb => nil,
       :limit => nil,
-      :help => false
+      :help => false,
+      :configfile => "#{ENV['HOME']}/.passivedns-client"
     }
     
     options_target[:sep] = ","
-    options, items = PassiveDNS::CLI.parse_command_line(["-dptv", "-c", "8.8.8.8"])
+    options, items = PassiveDNS::CLI.parse_command_line(["-dpv", "-c", "8.8.8.8"])
     assert_equal(options_target, options)
     assert_equal(["8.8.8.8"], items)
     
     options_target[:sep] = "|"
-    options, items = PassiveDNS::CLI.parse_command_line(["-dptv", "-s", "|", "8.8.8.8"])
+    options, items = PassiveDNS::CLI.parse_command_line(["-dpv", "-s", "|", "8.8.8.8"])
     assert_equal(options_target, options)
     assert_equal(["8.8.8.8"], items)
     
     options_target[:sep] = "\t"
     
-    options, items = PassiveDNS::CLI.parse_command_line(["-dptv", "-t", "8.8.8.8"])
+    options, items = PassiveDNS::CLI.parse_command_line(["-dpv", "-t", "8.8.8.8"])
     assert_equal(options_target, options)
     assert_equal(["8.8.8.8"], items)
 
     options_target[:format] = "json"
-    options, items = PassiveDNS::CLI.parse_command_line(["-dptv", "-j", "8.8.8.8"])
+    options, items = PassiveDNS::CLI.parse_command_line(["-dpv", "-j", "8.8.8.8"])
     assert_equal(options_target, options)
     assert_equal(["8.8.8.8"], items)
     
     options_target[:format] = "xml"
-    options, items = PassiveDNS::CLI.parse_command_line(["-dptv", "-x", "8.8.8.8"])
+    options, items = PassiveDNS::CLI.parse_command_line(["-dpv", "-x", "8.8.8.8"])
     assert_equal(options_target, options)
     assert_equal(["8.8.8.8"], items)
     
     options_target[:format] = "yaml"
-    options, items = PassiveDNS::CLI.parse_command_line(["-dptv", "-y", "8.8.8.8"])
+    options, items = PassiveDNS::CLI.parse_command_line(["-dpv", "-y", "8.8.8.8"])
     assert_equal(options_target, options)
     assert_equal(["8.8.8.8"], items)
     
     options_target[:format] = "gdf"
-    options, items = PassiveDNS::CLI.parse_command_line(["-dptv", "-g", "8.8.8.8"])
+    options, items = PassiveDNS::CLI.parse_command_line(["-dpv", "-g", "8.8.8.8"])
     assert_equal(options_target, options)
     assert_equal(["8.8.8.8"], items)
     
     options_target[:format] = "graphviz"
-    options, items = PassiveDNS::CLI.parse_command_line(["-dptv", "-z", "8.8.8.8"])
+    options, items = PassiveDNS::CLI.parse_command_line(["-dpv", "-z", "8.8.8.8"])
     assert_equal(options_target, options)
     assert_equal(["8.8.8.8"], items)
     
     options_target[:format] = "graphml"
-    options, items = PassiveDNS::CLI.parse_command_line(["-dptv", "-m", "8.8.8.8"])
+    options, items = PassiveDNS::CLI.parse_command_line(["-dpv", "-m", "8.8.8.8"])
     assert_equal(options_target, options)
     assert_equal(["8.8.8.8"], items)
     
@@ -162,7 +153,7 @@ Getting Help
   
   def test_help_debug_parsing
     options_target = {
-      :pdnsdbs => ["passivetotal", "tcpiputils", "virustotal"],
+      :pdnsdbs => ["passivetotal", "virustotal"],
       :format => "text",
       :sep => "\t",
       :recursedepth => 1,
@@ -171,22 +162,23 @@ Getting Help
       :debug => false,
       :sqlitedb => nil,
       :limit => nil,
-      :help => true
+      :help => true,
+      :configfile => "#{ENV['HOME']}/.passivedns-client"
     }
 
-    options, items = PassiveDNS::CLI.parse_command_line(["-dptv", "-h", "8.8.8.8"])
+    options, items = PassiveDNS::CLI.parse_command_line(["-dpv", "-h", "8.8.8.8"])
     assert_equal(options_target, options)
     assert_equal(["8.8.8.8"], items)
     
     options_target[:debug] = true
-    options, items = PassiveDNS::CLI.parse_command_line(["-dptv", "-h", "-v", "8.8.8.8"])
+    options, items = PassiveDNS::CLI.parse_command_line(["-dpv", "-h", "-v", "8.8.8.8"])
     assert_equal(options_target, options)
     assert_equal(["8.8.8.8"], items)
   end
   
   def test_state_recursion_parsing
     options_target = {
-      :pdnsdbs => ["passivetotal", "tcpiputils", "virustotal"],
+      :pdnsdbs => ["passivetotal", "virustotal"],
       :format => "text",
       :sep => "\t",
       :recursedepth => 5,
@@ -195,11 +187,33 @@ Getting Help
       :debug => false,
       :sqlitedb => "test.db",
       :limit => 10,
-      :help => false
+      :help => false,
+      :configfile => "#{ENV['HOME']}/.passivedns-client"
     }
 
-    options, items = PassiveDNS::CLI.parse_command_line(["-dptv", "-f", "test.db", "-r", "5", "-w", "30", "-l", "10", "8.8.8.8"])
+    options, items = PassiveDNS::CLI.parse_command_line(["-dpv", "-f", "test.db", "-r", "5", "-w", "30", "-l", "10", "8.8.8.8"])
     assert_equal(options_target, options)
     assert_equal(["8.8.8.8"], items)
   end
+  
+  def test_configuration_file
+    options_target = {
+      :pdnsdbs => ["virustotal"],
+      :format => "text",
+      :sep => "\t",
+      :recursedepth => 1,
+      :wait => 0,
+      :res => nil,
+      :debug => false,
+      :sqlitedb => nil,
+      :limit => nil,
+      :help => false,
+      :configfile => "#{ENV['HOME']}/.passivedns-client"
+    }
+    
+    options, items = PassiveDNS::CLI.parse_command_line(["--config", "#{ENV['HOME']}/.passivedns-client"])
+    assert_equal(options_target, options)
+    assert_equal([], items)
+    
+  end
 end

data/test/test_passivedns-client.rb

@@ -1,9 +1,9 @@
 unless Kernel.respond_to?(:require_relative)
-	module Kernel
-		def require_relative(path)
-			require File.join(File.dirname(caller[0]), path.to_str)
-		end
-	end
+  module Kernel
+    def require_relative(path)
+      require File.join(File.dirname(caller[0]), path.to_str)
+    end
+  end
 end
 
 require_relative 'helper'
@@ -22,59 +22,40 @@ class TestPassiveDnsQuery < Minitest::Test
     end
   end
     
-	def test_instantiate_Nonexisting_Client
-		assert_raises RuntimeError do
-			PassiveDNS::Client.new(['doesnotexist'])
-		end
-	end
+  def test_instantiate_Nonexisting_Client
+    assert_raises RuntimeError do
+      PassiveDNS::Client.new(['doesnotexist'])
+    end
+  end
 
-	def test_instantiate_All_Clients
-		PassiveDNS::Client.new()
-	end
-	
-	def test_instantiate_Passive_DNS_State
-		refute_nil(PassiveDNS::PDNSToolState.new)
-	end
-	
-	def test_instantiate_Passive_DNS_State_database
-		if File.exists?("test/test.sqlite3")
-			File.unlink("test/test.sqlite3")
-		end
-		refute_nil(PassiveDNS::PDNSToolStateDB.new("test/test.sqlite3"))
-		if File.exists?("test/test.sqlite3")
-			File.unlink("test/test.sqlite3")
-		end
-	end
-	
-	def test_BFK
-    PassiveDNS::Client.new(['bfk'])
-    d = PassiveDNS::Provider::BFK.new(@cp['bfk'] || {})
+  def test_instantiate_All_Clients
+    PassiveDNS::Client.new()
+  end
+  
+  def test_instantiate_Passive_DNS_State
+    refute_nil(PassiveDNS::PDNSToolState.new)
+  end
+  
+  def test_instantiate_Passive_DNS_State_database
+    if File.exist?("test/test.sqlite3")
+      File.unlink("test/test.sqlite3")
+    end
+    refute_nil(PassiveDNS::PDNSToolStateDB.new("test/test.sqlite3"))
+    if File.exist?("test/test.sqlite3")
+      File.unlink("test/test.sqlite3")
+    end
+  end
+  
+  def test_DNSDB
+    PassiveDNS::Client.new(['dnsdb'])
+    d = PassiveDNS::Provider::DNSDB.new(@cp['dnsdb'] || {})
     refute_nil(d)
-		rows = d.lookup("example.org",3)
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
-    assert_equal(3, rows.length)
-    rows = d.lookup("8.8.8.8")
+    rows = d.lookup("example.org",3)
     refute_nil(rows)
     refute_nil(rows.to_s)
     refute_nil(rows.to_xml)
     refute_nil(rows.to_json)
     refute_nil(rows.to_yaml)
-	end
-	
-	def test_DNSDB
-		PassiveDNS::Client.new(['dnsdb'])
-    d = PassiveDNS::Provider::DNSDB.new(@cp['dnsdb'] || {})
-    refute_nil(d)
-		rows = d.lookup("example.org",3)
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
     assert_equal(3, rows.length) # this will fail since DNSDB has an off by one error
     rows = d.lookup("8.8.8.8")
     refute_nil(rows)
@@ -82,18 +63,18 @@ class TestPassiveDnsQuery < Minitest::Test
     refute_nil(rows.to_xml)
     refute_nil(rows.to_json)
     refute_nil(rows.to_yaml)
-	end
+  end
 
-	def test_VirusTotal
-		PassiveDNS::Client.new(['virustotal'])
+  def test_VirusTotal
+    PassiveDNS::Client.new(['virustotal'])
     d = PassiveDNS::Provider::VirusTotal.new(@cp['virustotal'] || {})
     refute_nil(d)
-		rows = d.lookup("google.com",3)
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
+    rows = d.lookup("google.com",3)
+    refute_nil(rows)
+    refute_nil(rows.to_s)
+    refute_nil(rows.to_xml)
+    refute_nil(rows.to_json)
+    refute_nil(rows.to_yaml)
     assert_equal(3, rows.length)
     rows = d.lookup("8.8.8.8")
     refute_nil(rows)
@@ -101,11 +82,11 @@ class TestPassiveDnsQuery < Minitest::Test
     refute_nil(rows.to_xml)
     refute_nil(rows.to_json)
     refute_nil(rows.to_yaml)
-	end
+  end
   
-  def test_TCPIPUtils
-    PassiveDNS::Client.new(['tcpiputils'])
-    d = PassiveDNS::Provider::TCPIPUtils.new(@cp['tcpiputils'] || {})
+  def test_passivetotal
+    PassiveDNS::Client.new(['passivetotal'])
+    d = PassiveDNS::Provider::PassiveTotal.new(@cp['passivetotal'] || {})
     refute_nil(d)
     rows = d.lookup("example.org")
     refute_nil(rows)
@@ -113,12 +94,13 @@ class TestPassiveDnsQuery < Minitest::Test
     refute_nil(rows.to_xml)
     refute_nil(rows.to_json)
     refute_nil(rows.to_yaml)
-    rows = d.lookup("example.org",3)
+    rows = d.lookup("example.org", 3)
     refute_nil(rows)
     refute_nil(rows.to_s)
     refute_nil(rows.to_xml)
     refute_nil(rows.to_json)
     refute_nil(rows.to_yaml)
+    puts(rows)
     assert_equal(3, rows.length)
     rows = d.lookup("8.8.8.8")
     refute_nil(rows)
@@ -127,10 +109,10 @@ class TestPassiveDnsQuery < Minitest::Test
     refute_nil(rows.to_json)
     refute_nil(rows.to_yaml)
   end
-
-  def test_cn360
-    PassiveDNS::Client.new(['cn360'])
-    d = PassiveDNS::Provider::CN360.new(@cp['cn360'] || {})
+    
+  def test_circl
+    PassiveDNS::Client.new(['circl'])
+    d = PassiveDNS::Provider::CIRCL.new(@cp['circl'] || {})
     refute_nil(d)
     rows = d.lookup("example.org")
     refute_nil(rows)
@@ -151,105 +133,30 @@ class TestPassiveDnsQuery < Minitest::Test
     refute_nil(rows.to_xml)
     refute_nil(rows.to_json)
     refute_nil(rows.to_yaml)
-	end
-  
-  def test_nmemonic
-		PassiveDNS::Client.new(['mnemonic'])
-    d = PassiveDNS::Provider::Mnemonic.new(@cp['mnemonic'] || {})
-    refute_nil(d)
-		rows = d.lookup("example.org")
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
-		rows = d.lookup("example.org",3)
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
-		assert_equal(3, rows.length)
-		rows = d.lookup("8.8.8.8")
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
-	end
-  
-  def test_passivetotal
-		PassiveDNS::Client.new(['passivetotal'])
-    d = PassiveDNS::Provider::PassiveTotal.new(@cp['passivetotal'] || {})
-    refute_nil(d)
-		rows = d.lookup("example.org")
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
-		rows = d.lookup("example.org",3)
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
-		assert_equal(3, rows.length)
-		rows = d.lookup("8.8.8.8")
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
-	end
-    
-  def test_circl
-		PassiveDNS::Client.new(['circl'])
-    d = PassiveDNS::Provider::CIRCL.new(@cp['circl'] || {})
-    refute_nil(d)
-		rows = d.lookup("example.org")
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
-		rows = d.lookup("example.org",3)
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
-		assert_equal(3, rows.length)
-		rows = d.lookup("8.8.8.8")
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
-	end
+  end
   
   def test_riskiq
-		PassiveDNS::Client.new(['riskiq'])
+    PassiveDNS::Client.new(['riskiq'])
     d = PassiveDNS::Provider::RiskIQ.new(@cp['riskiq'] || {})
     refute_nil(d)
-		rows = d.lookup("example.org")
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
-		rows = d.lookup("example.org",3)
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
-		assert_equal(3, rows.length)
-		rows = d.lookup("8.8.8.8")
-		refute_nil(rows)
-		refute_nil(rows.to_s)
-		refute_nil(rows.to_xml)
-		refute_nil(rows.to_json)
-		refute_nil(rows.to_yaml)
-	end
+    rows = d.lookup("example.org")
+    refute_nil(rows)
+    refute_nil(rows.to_s)
+    refute_nil(rows.to_xml)
+    refute_nil(rows.to_json)
+    refute_nil(rows.to_yaml)
+    rows = d.lookup("example.org",3)
+    refute_nil(rows)
+    refute_nil(rows.to_s)
+    refute_nil(rows.to_xml)
+    refute_nil(rows.to_json)
+    refute_nil(rows.to_yaml)
+    assert_equal(3, rows.length)
+    rows = d.lookup("8.8.8.8")
+    refute_nil(rows)
+    refute_nil(rows.to_s)
+    refute_nil(rows.to_xml)
+    refute_nil(rows.to_json)
+    refute_nil(rows.to_yaml)
+  end
 end