wmap 2.5.8 → 2.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 206a57aad53184de5f3d18db83f17b80aa5632c473830f287ba010dfec4a2523
-  data.tar.gz: 1ef57c9b72338a911731a456abe9ae15f2f9dbbc16a67c541da030b747966cd4
+  metadata.gz: 940635362c6d612134a052e37c5bbcd49ad7a8bb801b5a767ea4a59d141740ee
+  data.tar.gz: 3538d199e5fe4c9fad108a87a96d002ca76e290a42bda9714e0d655ac7d9ef80
 SHA512:
-  metadata.gz: 4144ba6f0955f87ed5979c0b2069caa78ca77512214ac10d71a806c44d7c50f100e53d555a16f1a58a0304559db370edb2ffa0b946ea900d237afcf541ad3787
-  data.tar.gz: 1d43596929956315a79d5fd09fa453e241be7f7b5de0c6cdc87efe93422faf7f5bd5ffff94fe478d03e1c9ad494653319d50ccb949874e008e7fbf71744d2557
+  metadata.gz: c458e2c002a4aea5552cb2698c6776adab599aca664aa8f750b9fd42a9920634489e138c589dd58d9cb2924b2920cd5c0daf0731285ecb58fcb0bae45dfae8aa
+  data.tar.gz: c07aa8ccd2f405535eeb48f675b76690bba42d3c5f2d7649b7170df873ab421f38532651c45bc09967bd3a761a87639cc5f1fb64cd189afead956f946376c27e

data/lib/wmap/cidr_tracker.rb

@@ -18,195 +18,173 @@ class Wmap::CidrTracker
 		@verbose=params.fetch(:verbose, false)
 		@data_dir=params.fetch(:data_dir, File.dirname(__FILE__)+'/../../data/')
 		Dir.mkdir(@data_dir) unless Dir.exist?(@data_dir)
-		@file_cidr_seeds=params.fetch(:cidr_seeds, @data_dir + 'cidrs')
-		@known_cidr_blks={}
-		@known_cidr_blks_desc_index=[]
-		@known_cidr_blks_asce_index=[]
-		File.write(@file_cidr_seeds, "") unless File.exist?(@file_cidr_seeds)
-		load_cidr_blks_from_file(@file_cidr_seeds)
+		@cidr_seeds=params.fetch(:cidr_seeds, @data_dir + 'cidrs')
+		File.write(@cidr_seeds, "") unless File.exist?(@cidr_seeds)
+		load_cidr_blks_from_file(@cidr_seeds)
 	end
 
 	# Main worker method to retrieve known network information for a host / ip
 	def cidr_worker (host)
 		puts "Starting tracking of known CIDR information for host: #{host}" if @verbose
-		begin
-			host=host.strip.downcase
-			ip=host_2_ip(host)
-			cidr=cidr_lookup(ip)
-			ref=get_cidr_ref(cidr)
-			netname=get_cidr_netname(cidr)
-			# save the data
-			tracker=Hash.new
-			tracker['host']=host
-			tracker['ip']=ip
-			tracker['cidr']=cidr
-			tracker['ref']=ref
-			tracker['netname']=netname
-			return tracker
-		rescue => ee
-			puts "Exception on method #{__method__} for host #{host}: #{ee}" # if @verbose
-			return nil
-		end
+		host=host.strip.downcase
+		ip=host_2_ip(host)
+		cidr=cidr_lookup(ip)
+		ref=get_cidr_ref(cidr)
+		netname=get_cidr_netname(cidr)
+		# save the data
+		tracker=Hash.new
+		tracker['host']=host
+		tracker['ip']=ip
+		tracker['cidr']=cidr
+		tracker['ref']=ref
+		tracker['netname']=netname
+		return tracker
+	rescue => ee
+		puts "Exception on method #{__method__} for host #{host}: #{ee}" # if @verbose
+		return nil
 	end
 	alias_method :track, :cidr_worker
 
 	# 'setter' to load the known CIDR blocks into an instance variable @known_cidr_blks
-	def load_cidr_blks_from_file (file_cidrs=@file_cidr_seeds)
+	def load_cidr_blks_from_file(file_cidrs=@cidr_seeds)
 		puts "Load the known CIDR seed file: #{file_cidrs}" if @verbose
-		begin
-			f=File.open(file_cidrs, 'r')
-			f.each do |line|
-				entry=line.chomp.split(',')
-				next unless is_cidr?(entry[0])
-				puts "Loading: #{entry[0]}" if @verbose
-				key=entry[0].strip
-				@known_cidr_blks[key] = Hash.new if not @known_cidr_blks.key?(key)
-				@known_cidr_blks[key]['ref']=entry[1].nil? ? nil : entry[1].strip
-				@known_cidr_blks[key]['netname']=entry[2].nil? ? nil : entry[2].strip
-			end
-			f.close
-			# Sort the blocks in order once for better performance. Update 10/29/2018 to support Netaddr 2.x syntax
-			#@known_cidr_blks_desc_index=NetAddr.sort(@known_cidr_blks.keys, :Desc=>true)
-			#@known_cidr_blks_asce_index=NetAddr.sort(@known_cidr_blks.keys, :Desc=>false)
-			@known_cidr_blks_asce_index=@known_cidr_blks.keys.sort
-			@known_cidr_blks_desc_index=@known_cidr_blks_asce_index.reverse
-		rescue => ee
-			puts "Exception on method #{__method__}: #{ee}" # if @verbose
+		f=File.open(file_cidrs, 'r')
+		f.each do |line|
+			entry=line.chomp.split(',')
+			next unless is_cidr?(entry[0])
+			puts "Loading: #{entry[0]}" if @verbose
+			key=entry[0].strip
+			@known_cidr_blks = Hash.new unless @known_cidr_blks
+			@known_cidr_blks[key] = Hash.new if not @known_cidr_blks.key?(key)
+			@known_cidr_blks[key]['ref']=entry[1].nil? ? nil : entry[1].strip
+			@known_cidr_blks[key]['netname']=entry[2].nil? ? nil : entry[2].strip
 		end
+		f.close
+		# Sort the blocks in order once for better performance. Update 10/29/2018 to support Netaddr 2.x syntax
+		#@known_cidr_blks_desc_index=NetAddr.sort(@known_cidr_blks.keys, :Desc=>true)
+		#@known_cidr_blks_asce_index=NetAddr.sort(@known_cidr_blks.keys, :Desc=>false)
+		@known_cidr_blks_asce_index=@known_cidr_blks.keys.sort
+		@known_cidr_blks_desc_index=@known_cidr_blks_asce_index.reverse
+	#rescue => ee
+	#	puts "Exception on method #{__method__}: #{ee}" # if @verbose
 	end
 
 	# 'setter' to add an entry to CIDR store @known_cidr_blks
 	def add (cidr,ref=nil,netname=nil)
 		puts "Load the entry into the CIDR store: #{cidr}"
-		#begin
-			raise "Unknown CIDR format: #{cidr}" unless is_cidr?(cidr)
-			# Obtain the 'ref' and 'netname' value automatically in case not passed as method parameters
-			if ref.nil? or netname.nil?
-				whois = Wmap::Whois.new
-				# Note 11/1/2014: Use IP instead of the CIDR to perform the query, as the current ruby-whois query does not support CIDR as query input
-				ip=cidr.split("/")[0]
-				ref=whois.get_net_desc(ip)
-				netname=whois.get_netname(ip)
-				whois=nil
-			end
-			if @known_cidr_blks.key?(cidr)
-				puts "Skip! Entry is already exist: #{cidr}"
-				return nil
-			else
-				@known_cidr_blks[cidr] = Hash.new
-				@known_cidr_blks[cidr]['ref']=ref
-				@known_cidr_blks[cidr]['netname']=netname
-				puts "Entry loaded!"
-			end
-			# Re-sort the blocks in order for better performance
-			#@known_cidr_blks_desc_index=NetAddr.sort(@known_cidr_blks.keys, :Desc=>true)
-			#@known_cidr_blks_asce_index=NetAddr.sort(@known_cidr_blks.keys, :Desc=>false)
-			@known_cidr_blks_asce_index=@known_cidr_blks.keys.sort
-			@known_cidr_blks_desc_index=@known_cidr_blks_asce_index.reverse
-		#rescue => ee
-		#	puts "Exception on method #{__method__}: #{ee}" # if @verbose
-		#end
+		raise "Unknown CIDR format: #{cidr}" unless is_cidr?(cidr)
+		# Obtain the 'ref' and 'netname' value automatically in case not passed as method parameters
+		if ref.nil? or netname.nil?
+			whois = Wmap::Whois.new
+			# Note 11/1/2014: Use IP instead of the CIDR to perform the query, as the current ruby-whois query does not support CIDR as query input
+			ip=cidr.split("/")[0]
+			ref=whois.get_net_desc(ip)
+			netname=whois.get_netname(ip)
+			whois=nil
+		end
+		if @known_cidr_blks.key?(cidr)
+			puts "Skip! Entry is already exist: #{cidr}"
+			return nil
+		else
+			@known_cidr_blks[cidr] = Hash.new
+			@known_cidr_blks[cidr]['ref']=ref
+			@known_cidr_blks[cidr]['netname']=netname
+			puts "Entry loaded!"
+		end
+		# Re-sort the blocks in order for better performance
+		#@known_cidr_blks_desc_index=NetAddr.sort(@known_cidr_blks.keys, :Desc=>true)
+		#@known_cidr_blks_asce_index=NetAddr.sort(@known_cidr_blks.keys, :Desc=>false)
+		@known_cidr_blks_asce_index=@known_cidr_blks.keys.sort
+		@known_cidr_blks_desc_index=@known_cidr_blks_asce_index.reverse
+	#rescue => ee
+	#	puts "Exception on method #{__method__}: #{ee}" # if @verbose
 	end
 
 	# 'setter' to remove an entry to CIDR store @known_cidr_blks
 	def delete (cidr,ref=nil,netname=nil)
 		puts "Remove the entry from the CIDR store: #{cidr}"
-		begin
-			#cidr.strip!
-			raise "Unknown CIDR format: #{cidr}" unless is_cidr?(cidr)
-			if @known_cidr_blks.key?(cidr)
-				puts "Deleting ..."
-				@known_cidr_blks.delete(cidr)
-				puts "Entry cleared!"
-			else
-				raise "Unknown CIDR entry: #{cidr}"
-			end
-			# Re-sort the blocks in order for better performance
-			#@known_cidr_blks_desc_index=NetAddr.sort(@known_cidr_blks.keys, :Desc=>true)
-			#@known_cidr_blks_asce_index=NetAddr.sort(@known_cidr_blks.keys, :Desc=>false)
-			@known_cidr_blks_asce_index=@known_cidr_blks.keys.sort
-			@known_cidr_blks_desc_index=@known_cidr_blks_asce_index.reverse
-		rescue => ee
-			puts "Exception on method #{__method__}: #{ee}" # if @verbose
+		#cidr.strip!
+		raise "Unknown CIDR format: #{cidr}" unless is_cidr?(cidr)
+		if @known_cidr_blks.key?(cidr)
+			puts "Deleting ..."
+			@known_cidr_blks.delete(cidr)
+			puts "Entry cleared!"
+		else
+			raise "Unknown CIDR entry: #{cidr}"
 		end
+		# Re-sort the blocks in order for better performance
+		#@known_cidr_blks_desc_index=NetAddr.sort(@known_cidr_blks.keys, :Desc=>true)
+		#@known_cidr_blks_asce_index=NetAddr.sort(@known_cidr_blks.keys, :Desc=>false)
+		@known_cidr_blks_asce_index=@known_cidr_blks.keys.sort
+		@known_cidr_blks_desc_index=@known_cidr_blks_asce_index.reverse
+	rescue => ee
+		puts "Exception on method #{__method__}: #{ee}" # if @verbose
 	end
 	alias_method :del, :delete
 
 	# Count numbers of CIDR object entries in the CIDR cache table
 	def count
 		puts "Counting number of entries in the CIDR cache table ..." if @verbose
-		begin
-			cnt=0
-			@known_cidr_blks.keys.map do |key|
-				if is_cidr?(key)
-					cnt=cnt+1
-				end
+		cnt=0
+		@known_cidr_blks.keys.map do |key|
+			if is_cidr?(key)
+				cnt=cnt+1
 			end
-			puts "Current number of CIDR object entries: #{cnt}" if @verbose
-			return cnt
-		rescue => ee
-			puts "Exception on method #{__method__}: #{ee}" if @verbose
 		end
+		puts "Current number of CIDR object entries: #{cnt}" if @verbose
+		return cnt
+	rescue => ee
+		puts "Exception on method #{__method__}: #{ee}" if @verbose
 	end
 
 	# Count numbers of IPs within the trusted CIDR objects
 	def counts
 		puts "Counting number of IPs within the CIDR store:" if @verbose
-		begin
-			cnt=0
-			@known_cidr_blks.keys.map do |key|
-				cnt=cnt+size(key)
-			end
-			puts "Total number of trusted IPs: #{cnt}" if @verbose
-			return cnt
-		rescue => ee
-			puts "Exception on method #{__method__}: #{ee}" if @verbose
+		cnt=0
+		@known_cidr_blks.keys.map do |key|
+			cnt=cnt+size(key)
 		end
+		puts "Total number of trusted IPs: #{cnt}" if @verbose
+		return cnt
+	rescue => ee
+		puts "Exception on method #{__method__}: #{ee}" if @verbose
 	end
 
 	# Check if the specific IP within the range of a list of known CIDR blocks
 	def ip_trusted? (ip)
 		puts "Check if the IP within the range of the known CIDR blocks: #{ip}" if @verbose
 		known = false
-		begin
-			return false if @known_cidr_blks==nil
-			first_octet_ip = ip.split('.').first.to_i
-			@known_cidr_blks_desc_index.each do |line|
-				first_octet_blk = line.split('.').first.to_i
-				next if first_octet_blk > first_octet_ip
-				puts "line: #{line}" if @verbose
-				cidr4 = NetAddr::CIDR.create(line)
-				known = cidr4.contains?(ip+'/32')
-				break if known
-			end
-		rescue => ee
-			if @verbose
-				puts "Exception on method #{__method__}: #{ee}"
-			end
-			return false
+		return false if @known_cidr_blks==nil
+		first_octet_ip = ip.split('.').first.to_i
+		@known_cidr_blks_desc_index.each do |line|
+			first_octet_blk = line.split('.').first.to_i
+			next if first_octet_blk > first_octet_ip
+			puts "line: #{line}" if @verbose
+			cidr4 = NetAddr::CIDR.create(line)
+			known = cidr4.contains?(ip+'/32')
+			break if known
 		end
-		return known
+	rescue => ee
+		puts "Exception on method #{__method__}: #{ee}" if @verbose
+		return false
 	end
 	alias_method :is_trusted?, :ip_trusted?
 
 	# Return the matching CIDR block for a ip
 	def cidr_lookup (ip)
 		puts "Lookup the CIDR name from the known CIDR list for the IP: #{ip}" if @verbose
-		begin
-			return nil if @known_cidr_blks==nil
-			puts "CIDR Lookup: #{ip} ..." if @verbose
-			@known_cidr_blks_desc_index.each do |line|
-				first_octet_ip = ip.split('.').first.to_i
-				first_octet_blk = line.split('.').first.to_i
-				next if first_octet_blk > first_octet_ip
-				cidr4 = NetAddr::CIDR.create(line)
-				known = cidr4.contains?(ip+'/32')
-				return line if known
-			end
-		rescue => ee
-			puts "Exception on method #{__method__}: #{ee}" if @verbose
-			return nil
+		return nil if @known_cidr_blks==nil
+		puts "CIDR Lookup: #{ip} ..." if @verbose
+		@known_cidr_blks_desc_index.each do |line|
+			first_octet_ip = ip.split('.').first.to_i
+			first_octet_blk = line.split('.').first.to_i
+			next if first_octet_blk > first_octet_ip
+			cidr4 = NetAddr::CIDR.create(line)
+			known = cidr4.contains?(ip+'/32')
+			return line if known
 		end
+	rescue => ee
+		puts "Exception on method #{__method__}: #{ee}" if @verbose
 		return nil
 	end
 	alias_method :lookup, :cidr_lookup
@@ -218,15 +196,12 @@ class Wmap::CidrTracker
 		known=false
 		cidr=cidr.strip unless cidr.nil?
 		cidr=cidr+"/32" if is_ip?(cidr)
-		begin
-			raise "Invalid CIDR format: #{cidr}" unless is_cidr?(cidr)
-			return false if @known_cidr_blks==nil
-			return true if @known_cidr_blks.key?(cidr)
-		rescue => ee
-			puts "Exception on method #{__method__}: #{ee}" if @verbose
-			return false
-		end
-		return known
+		raise "Invalid CIDR format: #{cidr}" unless is_cidr?(cidr)
+		return false if @known_cidr_blks==nil
+		return true if @known_cidr_blks.key?(cidr)
+	rescue => ee
+		puts "Exception on method #{__method__}: #{ee}" if @verbose
+		return false
 	end
 	alias_method :is_known?, :cidr_known?
 
@@ -236,33 +211,28 @@ class Wmap::CidrTracker
 		trusted=false
 		cidr=cidr.strip unless cidr.nil?
 		cidr=cidr+"/32" if is_ip?(cidr)
-		begin
-			raise "Invalid CIDR format: #{cidr}" unless is_cidr?(cidr)
-			return false if @known_cidr_blks==nil
-			return true if @known_cidr_blks.key?(cidr)
-			@known_cidr_blks_asce_index.each do |line|
-				cidr4 = NetAddr::CIDR.create(line)
-				return true if cidr4.contains?(cidr)
-			end
-		rescue => ee
-			puts "Exception on method #{__method__}: #{ee}" if @verbose
-			return false
+		raise "Invalid CIDR format: #{cidr}" unless is_cidr?(cidr)
+		return false if @known_cidr_blks==nil
+		return true if @known_cidr_blks.key?(cidr)
+		@known_cidr_blks_asce_index.each do |line|
+			cidr4 = NetAddr::CIDR.create(line)
+			return true if cidr4.contains?(cidr)
 		end
-		return trusted
+	rescue => ee
+		puts "Exception on method #{__method__}: #{ee}" if @verbose
+		return false
 	end
 	alias_method :is_trusted?, :cidr_trusted?
 
 	# NetAddr wrapper to determine number of IPs within the CIDR object.
 	def size (cidr)
 		puts "Determine the size of CIDR object: #{cidr}" if @verbose
-		begin
-			raise "Invalid CIDR format: #{cidr}" unless is_cidr?(cidr)
-			obj = NetAddr::CIDR.create(cidr)
-			return obj.size.to_i
-		rescue => ee
-			puts "Exception on method #{__method__}: #{ee}" if @verbose
-			return nil
-		end
+		raise "Invalid CIDR format: #{cidr}" unless is_cidr?(cidr)
+		obj = NetAddr::CIDR.create(cidr)
+		return obj.size.to_i
+	rescue => ee
+		puts "Exception on method #{__method__}: #{ee}" if @verbose
+		return nil
 	end
 
 	# Retrieve the CIDR reference text for tracking purpose, if it's a known CIDR entry
@@ -282,23 +252,21 @@ class Wmap::CidrTracker
 	end
 
 	# Save the current cidr hash table into a file
-	def save_cidrs_to_file!(file_cidrs=@file_cidr_seeds)
+	def save_cidrs_to_file!(file_cidrs=@cidr_seeds)
 		puts "Saving the current cidrs cache table from memory to file: #{file_cidrs} ..." if @verbose
-		#begin
-			timestamp=Time.now
-			f=File.open(file_cidrs, 'w')
-			f.write "# Local cidrs file created by Wmap::CidrTracker.save method at: #{timestamp}\n"
-			f.write "Network CIDR, CIDR RIPE Reference Text, CIDR NETNAME\n"
-			@known_cidr_blks_asce_index.map do |key|
-				ref=get_cidr_ref(key)
-				netname=get_cidr_netname(key)
-				f.write "#{key},#{ref},#{netname}\n"
-			end
-			f.close
-			puts "CIDR cache table is successfully saved: #{file_cidrs}"
-		#rescue => ee
-		#	puts "Exception on method #{__method__}: #{ee}" if @verbose
-		#end
+		timestamp=Time.now
+		f=File.open(file_cidrs, 'w')
+		f.write "# Local cidrs file created by Wmap::CidrTracker.save method at: #{timestamp}\n"
+		f.write "Network CIDR, CIDR RIPE Reference Text, CIDR NETNAME\n"
+		@known_cidr_blks_asce_index.map do |key|
+			ref=get_cidr_ref(key)
+			netname=get_cidr_netname(key)
+			f.write "#{key},#{ref},#{netname}\n"
+		end
+		f.close
+		puts "CIDR cache table is successfully saved: #{file_cidrs}"
+	#rescue => ee
+	#	puts "Exception on method #{__method__}: #{ee}" if @verbose
 	end
 	alias_method :save!, :save_cidrs_to_file!
 
@@ -330,6 +298,5 @@ class Wmap::CidrTracker
 	end
 	alias_method :print, :print_known_cidr_blks_asce
 
-	private :load_cidr_blks_from_file
 
 end

data/version.txt

@@ -3,7 +3,7 @@
 ###############################################################################
 package = wmap
 # wmap version 2.0 == web_discovery version 1.5.3
-version = 2.5.8
+version = 2.5.9
 date = 2019-09-22
 
 author = Sam (Yang) Li

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wmap
 version: !ruby/object:Gem::Version
-  version: 2.5.8
+  version: 2.5.9
 platform: ruby
 authors:
 - Sam (Yang) Li