dnsbl-client 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4e20ce5cce11180724a890fa7ffd37a5d0010e7347d032387668cafc29d8ad8
-  data.tar.gz: 17b17dc71cf73c23cd68dd72fe268090e4ee67c933cf26783d91d82a51493a82
+  metadata.gz: 8782496924ce9d3fcf9231060e3182203a8e8886a7a4195d75eacb7abed9463c
+  data.tar.gz: 7c95c6bcd94468c2ac7a58c4db8d4c21c2bff33b8d5afff7d07c0bb2afb08f02
 SHA512:
-  metadata.gz: 89452e4db2cab30c21be082070df59cb7a43043332c7e5565c11b990453c977fda18c173434d1b1a3db9c06d4bf24152fe0602a2e0caf5c60f26bcf23a0a720a
-  data.tar.gz: bde3f216674c6fc7ed6432616b16157da78eeb18a2fcc5000229035268884ea0c0af2b5c4891bf5a4a2bfd8a423f8fb34eaacd85eb3bd0251a2d2e21d8e37dd4
+  metadata.gz: '0954fde62af63a2216af0e6107e2bb162604eeb703d70cc9b91f861373c101f35c95e350102343db62667efd000171bb680c0b9d73b538aee52e979b7dc343fa'
+  data.tar.gz: '01490c656455fd58c20f2e407f543c89cc2c7687d6581095b6bb0438e2e1c8ffa35535bd685a46277deeef3efb51bd4bc8f34885866cedcfa36b984caf797a6d'

data/bin/dnsbl-client

@@ -2,6 +2,7 @@
 require 'dnsbl/client'
 
 c = DNSBL::Client.new
+c.first_only = true
 
 if ARGV.length > 0
 	c.lookup(ARGV).each do |res|

data/lib/dnsbl/client.rb

@@ -5,12 +5,13 @@ require 'resolv'
 require 'socket'
 require 'thread'
 require 'yaml'
+require 'ipaddr'
 
 # This is a monkeypatch for the built-in Ruby DNS resolver to specify nameservers 
 class Resolv::DNS::Config
   # Monkeypatch the nameservers to set a default if there are no defined nameservers
 	def nameservers
-		return @nameservers if @nameservers
+		return @nameservers if defined?(@nameservers)
 		
 		lazy_initialize
 		if self.respond_to? :nameserver_port
@@ -41,6 +42,8 @@ module DNSBL # :nodoc:
 									 two_level_tldfile = File.expand_path('../../../data', __FILE__)+"/two-level-tlds",
 									 three_level_tldfile = File.expand_path('../../../data', __FILE__)+"/three-level-tlds")
 			@dnsbls = config
+      @timeout = 1.5
+      @first_only = false
 			@two_level_tld = []
 			@three_level_tld = []
 			File.open(two_level_tldfile).readlines.each do |l|
@@ -60,6 +63,14 @@ module DNSBL # :nodoc:
 			@socket_index = 0
 		end
     
+    def timeout=(timeout_seconds)
+      @timeout = timeout_seconds
+    end
+    
+    def first_only=(first_only_boolean)
+      @first_only = first_only_boolean
+    end
+    
 		# sets the nameservers used for performing DNS lookups in round-robin fashion
 		def nameservers=(ns=Resolv::DNS::Config.new.nameservers)
 			@sockets.each do |s|
@@ -108,7 +119,8 @@ module DNSBL # :nodoc:
 		def _encode_query(item,itemtype,domain,apikey=nil)
 			label = nil
 			if itemtype == 'ip'
-				label = item.split(/\./).reverse.join(".")
+        ip = IPAddr.new(item)
+        label = ip.reverse.gsub('.ip6.arpa', '').gsub('.in-addr.arpa', '')
 			elsif itemtype == 'domain'
 				label = normalize(item)
 			end
@@ -142,6 +154,8 @@ module DNSBL # :nodoc:
 				@starttime = Time.now.to_f
 				# determine the type of query
 				itemtype = (item =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) ? 'ip' : 'domain'
+        itemtype = (item =~ /^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/) ? 'ip' : itemtype
+
 				# for each dnsbl that supports our type, create the DNS query packet and send it
 				# rotate across our configured name servers and increment sent
 				@dnsbls.each do |name,config|
@@ -160,11 +174,12 @@ module DNSBL # :nodoc:
 				end
 				# while we still expect answers
 				while sent > 0
-					# wait on the socket for maximally 1.5 seconds
-					r,_,_ = IO.select(@sockets,nil,nil,1.5)
+					# wait on the socket for maximally @timeout seconds
+					r,_,_ = IO.select(@sockets,nil,nil,@timeout)
 					# if we time out, break out of the loop
 					break unless r
 					# for each reply, decode it and receive results, decrement the pending answers
+          first_only = false
 					r.each do |s|
 						begin
 							response = _decode_response(s.recv(4096))
@@ -174,7 +189,14 @@ module DNSBL # :nodoc:
 							puts e.backtrace.join("\n")
 						end
 						sent -= 1
+            if @first_only
+              first_only = true
+              break
+            end
 					end
+          if first_only
+            break
+          end
 				end
 			end
 			results

data/lib/dnsbl/client/version.rb

@@ -1,6 +1,6 @@
 module DNSBL # :nodoc:
   class Client
     # Current version of the dnsbl-client gem
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dnsbl-client
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - chrislee35
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler