wmap 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f0b51534ef91a271a2093c903cc362c1a571120f0bf39a8f0086d9adece61a6
-  data.tar.gz: ed707fab95be7457f1bf230a7162a0e9f361f020e7248cbecb7845012e347020
+  metadata.gz: bdb13c32f4c0c74ad2ab753782620391476e8f8f92e035a2fd1566e57077c91f
+  data.tar.gz: 7ba530bf91fe8f47f527133e1095b9ed0e87f806f206c7a34e4c696cb9299ac8
 SHA512:
-  metadata.gz: a821623ebd0bae444537ded05b711ca2a034d41f460bdb62694cf2eec1b95ac5343e0ff1a57c1f37c3c2f9a1e93db7b27120b4d64b6ca7085e44e0113da919fd
-  data.tar.gz: e48b6a67397653d3832dcd0bc090f82f8ee5ecc2961600e2434d8a4439786862a6aae91665f8cac12379317c2b9b8b261b4012323e0f66cd547d2f626faa6cf4
+  metadata.gz: 58f0db14b993f33cd25cc34d8b6de7f03b1b9103c4434c145025f869d213fc29a5828d9f026f3f709d454af79a8421a2aa3aaf72963bea5f06387098b32fb86b
+  data.tar.gz: cbd700d85a1be4761c9398ea0ba09ecf1e3a1bfb0b8bb69fee139c13ba827b226b9dc04730d54519ce4213bf49dd236ef18b5cf0c7ddaec666cd57589fdd5ffe

data/bin/refresh

@@ -3,24 +3,70 @@
 # This is useful as site information may change over the time
 ## Usage: refresh [a site|all]
 require "wmap"
+require "optparse"
 
+# program helper
 def print_usage
-	puts "Program to refresh the website entry in the local data repository. Usage: refresh [a site|all]"
+	puts "Program to refresh the website entry in the local data repository. Usage: refresh --target [a site|all] --data_dir [path ]"
+end
+
+# program command line options
+options = {:data_dir => nil, :target => nil}
+parser = OptionParser.new do|opts|
+	opts.banner = Wmap.banner
+	opts.on('-d', '--data_dir data_dir', 'Web Mapper local cache data directory') do |data_dir|
+		options[:data_dir] = data_dir;
+	end
+	opts.on('-t', '--target target', 'Web Mapper target') do |target|
+		options[:target] = target;
+	end
+	opts.on('-h', '--help', 'Displays Help') do
+		print Wmap.banner,"\n"
+		print_usage
+		exit 0
+	end
+end
+parser.parse!
+
+# print program banner
+puts Wmap.banner
+print_usage unless options[:target]
+store=Wmap::SiteTracker.instance
+store.verbose = true
+
+# Preparing - check out the working logs directory
+if options[:data_dir]
+	# Log to the instance running directory
+	Log_dir = Pathname.new(options[:data_dir]).join('logs')
+	store.data_dir = options[:data_dir]
+	sites_file = options[:data_dir] + '/' + 'sites'
+	#puts "sites_file: #{sites_file}"
+	store.load_site_stores_from_file(sites_file)
+else
+	# Log the command entry
+	Log_dir=Pathname.new(Gem.loaded_specs['wmap'].full_gem_path).join('logs')
 end
 
 puts Wmap.banner
 print_usage
-Log_dir=File.dirname(__FILE__)+'/../logs/'
+# Log_dir=File.dirname(__FILE__)+'/../logs/'
 Wmap.wlog("Execute the command: refresh #{ARGV[0]}","refresh",Log_dir+"wmap.log")
 
-abort "Incorrect program argument! Proper Usage: refresh [site]" unless ARGV.length==1
+#puts "Captured command argument"
+if options[:target]
+	if options[:target]=="all"
+		# magic token 'all' to refresh all sites in the store
+		# puts "Refresh all sites: #{store.known_sites.keys}"
+		store.refresh_all
+	else
+		# abort "Error: incorrect site syntax! It must be in http(s):://xxx.xxx/ format." unless Wmap::SiteTracker.instance.is_site?(ARGV[0])
+		store.refresh(options[:target])
+	end
+end
 
-#puts "Captured command argument: #{ARGV[0]}"
-if ARGV[0]=="all"
-	# magic token 'all' to refresh all sites in the store
-	Wmap.refresh_all
+# please
+if options[:data_dir]
+	store.save!(sites_file)
 else
-	abort "Error: incorrect site syntax! It must be in http(s):://xxx.xxx/ format." unless Wmap::SiteTracker.instance.is_site?(ARGV[0])
-st=nil
-	Wmap.refresh(ARGV[0])
+	store.save!
 end

data/bin/wmap

@@ -10,24 +10,23 @@ require "optparse"
 def print_usage
 	abort "Program to perform website asset discovery and tracking. \nUsage: wmap -t <Target Host | URL | IP | CIDR | or a seed file with any of the above combo> -d <Optional Discovery Result Directory>"
 end
-options = {:data_dir => nil, :target => nil}
 
+# program command line options
+options = {:data_dir => nil, :target => nil}
 parser = OptionParser.new do|opts|
 	opts.banner = Wmap.banner
 	opts.on('-d', '--data_dir data_dir', 'Web Mapper local cache data directory') do |data_dir|
 		options[:data_dir] = data_dir;
 	end
-
 	opts.on('-t', '--target target', 'Web Mapper target') do |target|
 		options[:target] = target;
 	end
-
 	opts.on('-h', '--help', 'Displays Help') do
-		Wmap.banner
+		print Wmap.banner,"\n"
 		print_usage
+		exit 0
 	end
 end
-
 parser.parse!
 
 # print program banner

data/lib/wmap/site_tracker.rb

@@ -343,8 +343,8 @@ class Wmap::SiteTracker
 		else
 			puts "Error: no entry is loaded. Please check your list and try again."
 		end
-	rescue => ee
-		puts "Exception on method #{__method__}: #{ee}" if @verbose
+	#rescue => ee
+	#	puts "Exception on method #{__method__}: #{ee}" if @verbose
 	end
 	alias_method :dels, :bulk_delete
 

data/version.txt

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