wmap 2.4.9 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7df3c5698974ccb73832bafefc264aebf82addba523ce2b5a2804684977bc558
-  data.tar.gz: 16546e8b0daf8b16dd0bb4a89815569a3dbf058bd9ec6cddc3341a1c33640e91
+  metadata.gz: 8d240d91e365ae3d5d0e43cf0cc9921f334d309c963c95da7599bf2a64743142
+  data.tar.gz: a64728d73c6e6a07772edd42fd1c46cb3748feb6f67705691e6c20dc6962bd2b
 SHA512:
-  metadata.gz: f089db7404c7bb058aedf90ae195cf37768482ba1d08f099a1b3cc85c7e0d0510552adce9546c597053aa6440f378fecc561e034a352914780d04408be5eb04b
-  data.tar.gz: a7a74b5527d09296de0c33864dc680a10b8454d7b7545b3f1f803b3245c321cc708e384197cc469dabf5d4007fea3cb0bdfd11274ab13188853b66f053817a97
+  metadata.gz: 889518a8645797863f7c9b879b46802566a8c05c9f1f18dfc26326380bb387ad7905ab0daa48fda6981c5e52d21efab6c64abb327117c0cbb5661d490947cd0b
+  data.tar.gz: a2928c8147507c19571ce4294d981525848d6767696a63a58d1db016a5a81a4ec3ee9da07a3ccea927ae7a12259731730abaa66474e35b69f480cb3a05a7afd7

data/bin/updateAll

@@ -9,7 +9,7 @@ Log_dir=File.dirname(__FILE__)+'/../logs/'
 Wmap.wlog("Execute the command: updateAll","updateAll",Log_dir+"wmap.log")
 
 abort "Incorrect program argument - no argument needed! Proper Usage: updateAll" unless ARGV.length==0
-
+=begin
 puts "You're about to update Wmap data repository. It'll take a long time. And the Internet connection must be un-interrupted during the process. You're also expected to backup the data folder before proceeding. Are you ready? (Yes/No)"
 STDOUT.flush
 answer=gets.chomp
@@ -18,6 +18,7 @@ if answer =~ /yes/i
 else
 	abort "You got it. Mission is successfully aborted. "
 end
+=end
 # Update sub-domain table
 sd=Wmap::DomainTracker::SubDomain.instance
 sd.update_from_host_store!

data/lib/wmap/domain_tracker.rb

@@ -108,8 +108,8 @@ class Wmap::DomainTracker
 
 	# 'setter' to add domain entry to the cache one at a time
 	def add(host)
-		puts "Add entry to the local domains cache table: #{host}" if @verbose
-		#begin
+		begin
+			puts "Add entry to the local domains cache table: #{host}" if @verbose
 			return nil if host.nil? or host.empty?
 			host=host.strip.downcase
 			if @known_internet_domains.key?(host)
@@ -146,9 +146,9 @@ class Wmap::DomainTracker
 					puts "Problem add domain #{host} - please use legal root domain or sub domain only."
 				end
 			end
-		#rescue => ee
-			#puts "Exception on method #{__method__}: #{ee}" if @verbose
-		#end
+		rescue => ee
+			puts "Exception on method #{__method__}: #{ee}" if @verbose
+		end
 	end
 
 	# 'setter' to add domain entry to the cache in batch (from a file)

data/lib/wmap/host_tracker.rb

@@ -104,8 +104,8 @@ class Wmap::HostTracker
 
 	# Setter to add host entry to the cache once at a time
 	def add(host)
-		puts "Add entry to the local host repository: #{host}"
-		#begin
+		begin
+			puts "Add entry to the local host repository: #{host}"
 			host=host.strip.downcase unless host.nil?
 			unless @known_hosts.key?(host)
 				ip=host_2_ip(host)
@@ -145,14 +145,14 @@ class Wmap::HostTracker
 			else
 				puts "Host is already exist. Skip: #{host}"
 			end
-		#rescue => ee
-		#	puts "Exception on method #{__method__}: #{ee}" if @verbose
-		#end
+		rescue => ee
+			puts "Exception on method #{__method__}: #{ee}" if @verbose
+		end
 	end
 
 	# Setter to add host entry to the local hosts in batch (from an array)
 	def bulk_add(list, num=@max_parallel)
-		#begin
+		begin
 			puts "Add entries to the local host repository: #{list}"
 			results=Hash.new
 			if list.size > 0
@@ -175,9 +175,9 @@ class Wmap::HostTracker
 				puts "Error: empty list - no entry is loaded. Please check your input list and try again."
 			end
 			return results
-#		rescue => ee
-#			puts "Exception on method #{__method__}: #{ee}"
-#		end
+		rescue => ee
+			puts "Exception on method #{__method__}: #{ee}"
+		end
 	end
 	alias_method :adds, :bulk_add
 
@@ -249,7 +249,7 @@ class Wmap::HostTracker
 
 	# Setter to refresh the entry from the cache one at a time
 	def refresh(host)
-		#begin
+		begin
 			puts "Refresh the local host repository for host: #{host} "
 			host=host.strip.downcase
 			if @known_hosts.key?(host)
@@ -273,15 +273,15 @@ class Wmap::HostTracker
 			else
 				puts "Error entry non exist: #{host}"
 			end
-		#rescue => ee
-		#	puts "Exception on method #{__method__}: #{ee}"
-		#end
+		rescue => ee
+			puts "Exception on method #{__method__}: #{ee}"
+		end
 	end
 
 	#	Refresh all the entries in the local hosts by querying the Internet
 	def refresh_all
-		puts "Refresh all the entries in the local host repository in one shot."
-		#begin
+		begin
+			puts "Refresh all the entries in the local host repository in one shot."
 			changes=Hash.new
 			hosts=@known_hosts.keys
 			@known_hosts=Hash.new
@@ -297,15 +297,15 @@ class Wmap::HostTracker
 			#changes.map { |x| puts x }
 			puts "Done refreshing the local hosts."
 			return changes
-		#rescue => ee
-		#	puts "Exception on method #{__method__}: #{ee}"
-		#end
+		rescue => ee
+			puts "Exception on method #{__method__}: #{ee}"
+		end
 	end
 
 	# Extract known root domains from the local host repository @known_hosts
 	def get_root_domains
-		puts "Dump out all active root domains from the cache."
 		begin
+			puts "Dump out all active root domains from the cache."
 			zones=Array.new
 			(@known_hosts.keys-["",nil]).map do |hostname|
 				next if is_ip?(hostname)

data/lib/wmap/site_tracker.rb

@@ -103,7 +103,7 @@ class Wmap::SiteTracker
 
 	# Setter to add site entry to the cache one at a time
 	def add(site)
-		#begin
+		begin
 			puts "Add entry to the site store: #{site}"
 			# Preliminary sanity check
 			site=site.strip.downcase unless site.nil?
@@ -229,18 +229,22 @@ class Wmap::SiteTracker
 				end
 				deact=nil
 				my_tracker=nil
+				host_tracker=nil
 				return checker
 			else
 				puts "Problem found: untrusted Internet domain or IP. Skip #{site}"
 				deact=nil
 				my_tracker=nil
+				host_tracker=nil
 				return nil
 			end
-		#rescue => ee
-		#	puts "Exception on method #{__method__}: #{ee}"
-		#	deact=nil
-		#	return nil
-		#end
+		rescue => ee
+			puts "Exception on method #{__method__}: #{ee}"
+			checker=nil
+			deact=nil
+			host_tracker=nil 
+			return nil
+		end
 	end
 
 	# Setter to add site entry to the cache table in batch (from a file)

data/version.txt

@@ -3,8 +3,8 @@
 ###############################################################################
 package = wmap
 # wmap version 2.0 == web_discovery version 1.5.3
-version = 2.4.9
-date = 2019-02-20
+version = 2.5.0
+date = 2019-02-21
 
 author = Sam (Yang) Li
 email = yang.li@owasp.org

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wmap
 version: !ruby/object:Gem::Version
-  version: 2.4.9
+  version: 2.5.0
 platform: ruby
 authors:
 - Sam (Yang) Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-20 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnsruby