wmap 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d327a4a120e75079faa038125baf0f4e39ec784129cd4886a5a81672f0ecf8da
-  data.tar.gz: 8911764a184f1c0f73048433cae9c6848725f3fec470b5d37aab5ce83a0e2789
+  metadata.gz: 8f0b51534ef91a271a2093c903cc362c1a571120f0bf39a8f0086d9adece61a6
+  data.tar.gz: ed707fab95be7457f1bf230a7162a0e9f361f020e7248cbecb7845012e347020
 SHA512:
-  metadata.gz: 25beef23e9ce2771603b4915454e0c40ee6e5b28dc2897c583aecd9e7fbeba2dc07363209f84ec8e596eca36b06222591e197d4a35d187b8140dccee0e16c4c7
-  data.tar.gz: 1a223d84f04fcb1c77f8e2bbb72fa452fd1b3cef076ccce0e80dead367284ce65992125018cf87d9965893d8b418ef3b954898b1244a023305ce75639e447016
+  metadata.gz: a821623ebd0bae444537ded05b711ca2a034d41f460bdb62694cf2eec1b95ac5343e0ff1a57c1f37c3c2f9a1e93db7b27120b4d64b6ca7085e44e0113da919fd
+  data.tar.gz: e48b6a67397653d3832dcd0bc090f82f8ee5ecc2961600e2434d8a4439786862a6aae91665f8cac12379317c2b9b8b261b4012323e0f66cd547d2f626faa6cf4

data/bin/trust

@@ -12,7 +12,7 @@ Log_dir=File.dirname(__FILE__)+'/../logs/'
 Wmap.wlog("Execute the command: trust #{ARGV[0]}","trust",Log_dir+"wmap.log")
 
 dt=Wmap::DomainTracker.instance
-ct=Wmap::CidrTracker.new(:verbose=>true)
+ct=Wmap::CidrTracker.new(:verbose=>false)
 abort "Incorrect program argument! Proper usage: trust [domain | netblock]" unless ARGV.length==1 && (dt.is_fqdn?(ARGV[0]) || ct.is_cidr?(ARGV[0]))
 
 puts "Start the baptizing process ..."

data/bin/wmap

@@ -154,8 +154,12 @@ else
 	else
 		abort "Error firing up SiteTracker instance!"
 	end
-	new_sites=inventory.adds(dis_sites.keys)
-	inventory.save! if new_sites.size>0
+	new_sites=inventory.adds(dis_sites.keys-["",nil])
+	if new_sites.size>0 && options[:data_dir]
+		inventory.save!(inventory.sites_file)
+	elsif new_sites.size>0
+		inventory.save!
+	end
 	inventory=nil
 	puts "Done! New found sites are successfully saved. " if new_sites.size > 0
 end
@@ -183,8 +187,12 @@ if hosts.size > 0
 	hostnames=hosts.dup.delete_if { |h| host_tracker.is_ip?(h) }
 	if hostnames.size > 0
 		puts "Update the local hosts data repository with: #{hostnames}"
-		new_hosts=host_tracker.adds(hostnames)
-		host_tracker.save! if new_hosts.size>0
+		new_hosts=host_tracker.adds(hostnames-["",nil])
+		if new_hosts.size>0 && options[:data_dir]
+			host_tracker.save!(host_tracker.hosts_file)
+		elsif new_hosts.size>0
+			host_tracker.save!
+		end
 	end
 end
 host_tracker=nil

data/lib/wmap/port_scanner.rb

@@ -81,46 +81,33 @@ class Wmap::PortScanner
 
 	# Parallel scanner - by utilizing fork manager 'parallel' to spawn numbers of child processes on multiple hosts/IPs simultaneously
 	def scans (targets,num=@max_parallel)
-		begin
-			urls=Array.new
-			# 10/5/2013 add additional logic to eliminate invalid /duplicate target(s)
-			targets -= ["", nil]
-			uniq_hosts=Hash.new
-			targets.dup.map do |target|
-				if is_fqdn?(target) or is_ip?(target)
-					ip=host_2_ip(target).to_s
-					if uniq_hosts.key?(ip)
-						targets.delete(target)
-					else
-						uniq_hosts[ip]=true
-					end
-				end
-			end
-			if targets.size > 0
-				puts "Start the parallel port scan on the target list:\n #{targets}"
-				Parallel.map(targets.shuffle, :in_processes => num) { |target|
-					scan(target)
-				}.each do |process|
-					if process.nil?
-						next
-					elsif process.empty?
-						#do nothing
-					else
-						process.map do |url|
-							unless @discovered_urls.key?(url)
-								@discovered_urls[url]=true
-							end
+		all_urls=Array.new
+		# 10/5/2013 add additional logic to eliminate invalid /duplicate target(s)
+		targets = targets - ["", nil]
+		if targets.size > 0
+			puts "Start the parallel port scan on the target list:\n #{targets}"
+			Parallel.map(targets.shuffle, :in_processes => num) { |target|
+				scan(target)
+			}.each do |process|
+				if process.nil?
+					next
+				elsif process.empty?
+					#do nothing
+				else
+					process.map do |url|
+						unless @discovered_urls.key?(url)
+							@discovered_urls[url]=true
 						end
-						urls+=process
 					end
+					all_urls+=process
 				end
 			end
-			puts "Port scanning done successfully with the found web services: #{urls}"
-			return urls
-		rescue Exception => ee
-			puts "Exception on method #{__method__}: #{ee}" if @verbose
-			return nil
 		end
+		puts "Port scanning done successfully with the found web services: #{all_urls}"
+		return all_urls
+	rescue Exception => ee
+		puts "Exception on method #{__method__}: #{ee}" if @verbose
+		return nil
 	end
 
 	# Parallel scans on a list of CIDRs from the input file, return the findings as the website construct within an array

data/lib/wmap/site_tracker.rb

@@ -231,12 +231,12 @@ class Wmap::SiteTracker
 			host_tracker=nil
 			return nil
 		end
-	#rescue => ee
-	#	puts "Exception on method #{__method__}: #{ee}"
-	#	checker=nil
-	#	deact=nil
-	#	host_tracker=nil
-	#	return nil
+	rescue => ee
+		puts "Exception on method #{__method__}: #{ee}"
+		checker=nil
+		deact=nil
+		host_tracker=nil
+		return nil
 	end
 
 	# Setter to add site entry to the cache table in batch (from a file)
@@ -256,6 +256,7 @@ class Wmap::SiteTracker
 	def bulk_add(list,num=@max_parallel)
 		puts "Add entries to the local site store from list:\n #{list}"
 		results=Hash.new
+		list = list - [nil,""]
 		if list.size > 0
 			puts "Start parallel adding on the sites:\n #{list}"
 			Parallel.map(list, :in_processes => num) { |target|

data/version.txt

@@ -3,8 +3,8 @@
 ###############################################################################
 package = wmap
 # wmap version 2.0 == web_discovery version 1.5.3
-version = 2.6.2
-date = 2019-11-05
+version = 2.6.3
+date = 2019-11-06
 
 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.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - Sam (Yang) Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnsruby