passivedns-client 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 68eeb76b624cb5975014a539228b3eb4dad48588611821ed7861302e0ffe1de5
-  data.tar.gz: 2ecfa66e3b572ce903be77ea6c60f023098dcfedfc38c3b865841d8a2cf5a0ce
+SHA1:
+  metadata.gz: 2b6b0dc4227f010b9fc53b01f2307f49b405db80
+  data.tar.gz: 1e3b0abb99ceddee325ee4245f9924500127089d
 SHA512:
-  metadata.gz: 654af7875209a8ef73cbbbb9502f12d08c27a03985fd3aca0a686fb09fb3db4fefa83b0011fdc2370564f651570ecd303bfe6f53391186d07bc946b6c3f4acd2
-  data.tar.gz: 5b9b8195c072651b8dcdc8dd2eb809fd3a5efda714aee5f03ed675ae5f81b014eb5dd5e84bd193f4acbc79b278afa2961eae7b41c6c40bc78cf788630ecc9cde
+  metadata.gz: d638e8dba5e9af5476c626dca055925c702bd41c3b836ba876d914d8d2e609a9ed042983da8987b0d1ae7af41316c1ad5d3a4f559f5db2bf694a96d2bae06547
+  data.tar.gz: 22b0c684739e932b646f2bd7a508f9e8a53c4c2ff8ba69c5623f36a51d7d4931f83d317dcc2fbab9df3b8944f84101c854596c32a6c07486adaaad445404c028

data/lib/passivedns/client.rb

@@ -12,7 +12,9 @@ provider_path = File.dirname(__FILE__)+"/client/provider/*.rb"
 Dir.glob(provider_path).each do |provider|
   name = File.basename(provider, '.rb')
   require "passivedns/client/provider/#{name}.rb"
-  $passivedns_providers << name
+  if name != 'bfk'
+    $passivedns_providers << name
+  end
 end
 
 require 'configparser'

data/lib/passivedns/client/cli.rb

@@ -58,7 +58,8 @@ module PassiveDNS # :nodoc:
         [ '--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 ],
+        [ '--config', GetoptLong::REQUIRED_ARGUMENT ]
       )
 
       letter_map = get_letter_map
@@ -121,6 +122,8 @@ module PassiveDNS # :nodoc:
           options[:sqlitedb] = arg
         when '--limit'
           options[:limit] = arg.to_i
+        when '--config'
+          options[:configfile] = arg
         else
           options[:help] = true
         end
@@ -158,7 +161,7 @@ module PassiveDNS # :nodoc:
     def self.usage(letter_map)
       databases = letter_map.keys.sort.join("")
       help_text = ""
-      help_text << "Usage: #{$0} [-d [#{databases}]] [-g|-v|-m|-c|-x|-y|-j|-t] [-os <sep>] [-f <file>] [-r#|-w#|-v] [-l <count>] <ip|domain|cidr>\n"
+      help_text << "Usage: #{$0} [-d [#{databases}]] [-g|-v|-m|-c|-x|-y|-j|-t] [-os <sep>] [-f <file>] [-r#|-w#|-v] [-l <count>] [--config <file>] <ip|domain|cidr>\n"
       help_text << "Passive DNS Providers\n"
       help_text << "  -d#{databases} uses all of the available passive dns database\n"
       letter_map.keys.sort.each do |l|
@@ -264,7 +267,7 @@ module PassiveDNS # :nodoc:
       state = create_state(options[:sqlitedb])
       state.debug = options[:debug]
 
-      pdnsclient = PassiveDNS::Client.new(options[:pdnsdbs])
+      pdnsclient = PassiveDNS::Client.new(options[:pdnsdbs], options[:configfile])
       pdnsclient.debug = options[:debug]
       
       if items.length > 0

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

@@ -37,6 +37,7 @@ module PassiveDNS #:nodoc: don't document this
       def initialize(options={})
         @debug = options[:debug] || false
         @base = options["URL"] || "http://www.bfk.de/bfk_dnslogger.html?query="
+        raise "Due to the EU GDPR policy, this service has been shut down until further notice."
       end
     
       # Takes a label (either a domain or an IP address) and returns

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

data/test/test_cli.rb

@@ -20,7 +20,7 @@ class TestCLI < Minitest::Test
     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 [3bcdmprtv]] [-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
@@ -202,4 +202,26 @@ Getting Help
     assert_equal(options_target, options)
     assert_equal(["8.8.8.8"], items)
   end
+  
+  def test_configuration_file
+    options_target = {
+      :pdnsdbs => ["bfk"],
+      :format => "text",
+      :sep => "\t",
+      :recursedepth => 1,
+      :wait => 0,
+      :res => nil,
+      :debug => false,
+      :sqlitedb => nil,
+      :limit => nil,
+      :help => false,
+      :configfile => ".passivedns-client"
+    }
+    
+    
+    options, items = PassiveDNS::CLI.parse_command_line(["--config", ".passivedns-client"])
+    assert_equal(options_target, options)
+    assert_equal([], items)
+    
+  end
 end

data/test/test_passivedns-client.rb

@@ -47,22 +47,28 @@ class TestPassiveDnsQuery < Minitest::Test
 	end
 	
 	def test_BFK
-    PassiveDNS::Client.new(['bfk'])
-    d = PassiveDNS::Provider::BFK.new(@cp['bfk'] || {})
-    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")
-    refute_nil(rows)
-    refute_nil(rows.to_s)
-    refute_nil(rows.to_xml)
-    refute_nil(rows.to_json)
-    refute_nil(rows.to_yaml)
+    assert_raises RuntimeError do
+      PassiveDNS::Client.new(['bfk'])
+    end
+    
+    assert_raises RuntimeError do
+      d = PassiveDNS::Provider::BFK.new(@cp['bfk'] || {})
+    end
+    
+    # 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")
+    # 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passivedns-client
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors:
 - chrislee35
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Query passive DNS databases