wmap 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbbbf1b71d804f4682d5827d07aa6079a27953b04643a7479db78b2a8c68f865
-  data.tar.gz: 471585e726794ca17d72ec92d8f9963d8c10433f5df2fb941b0ad930880f9bcb
+  metadata.gz: ede228cdbc1b9ce2e12369c1d5c61fba8549f8c8dc67c35ee009020cfc32c014
+  data.tar.gz: 06ea77a19cbbc5b2bc72aea90fefaff6c336ee1b75a8eba765730e660751426f
 SHA512:
-  metadata.gz: 222487917ebee32bf3f1ebed8356fcd12b2c21fead45f6ade6e95e1cc714a9bff2a70bd7fea4ce70551fdc6589cc8b92b8625e45919b18a02ff972f2e43c65d4
-  data.tar.gz: a96bec97937ec3ff93e6f65081e54608f80dd78916a7fb600fe82f7b41e0458f66890c551eb9f2987dc35e4f09d75cdeeb4068e91ce01139b73f3f4cdf7c11e3
+  metadata.gz: 22ce85d7d400650fb8427518c9ce79568db1143178dc60dcedbaa8683f5f4f58a461ebd4065fc078e3ff05e7cb80c7a016b08638dc793dc1150dfcce101de4fb
+  data.tar.gz: 3b51d6bda550f065a675409334b519be76521ab3014956b8f017e07d0be4fc33ab41d2b7ddb2e6dcc552fe9d36ce68cb8a887b0895b28470c7b553b18620a1e3

data/bin/trust

@@ -1,38 +1,75 @@
 #!/usr/bin/env ruby
 require "wmap"
-# Executable to add seed entry into ring of the trust. I.E. the trusted domain or CIDR
+require "optparse"
 
-def print_usage
-	puts "Program to add trust authority entry. Usage: trust [domain|CIDR]"
+# program command line options
+options = {:data_dir => nil, :target => nil, :verbose => false}
+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("-v", "--[no-]verbose", "Run verbosely") do |v|
+		options[:verbose] = v;
+	end
+	opts.on('-h', '--help', 'Displays Help') do
+		puts opts
+		exit 0
+	end
 end
+parser.parse!
 
+# print program banner
 puts Wmap.banner
-print_usage
-Log_dir=File.dirname(__FILE__)+'/../logs/'
-Wmap.wlog("Execute the command: trust #{ARGV[0]}","trust",Log_dir+"wmap.log")
+# print_usage unless options[:target]
+
+# 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')
+else
+	# Log the command entry
+	Log_dir=Pathname.new(Gem.loaded_specs['wmap'].full_gem_path).join('logs')
+end
+Dir.mkdir(Log_dir) unless Dir.exist?(Log_dir)
+Wmap.wlog("Execute the command: trust #{options[:target]}","trust",Log_dir+"wmap.log")
 
 dt=Wmap::DomainTracker.instance
-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]))
+ct=Wmap::CidrTracker.new
+if options[:data_dir]
+	dt.verbose=options[:verbose]
+	dt.data_dir = options[:data_dir]
+	dt.domains_file = dt.data_dir + "/" + "domains"
+	dt.load_domains_from_file(dt.domains_file)
+	ct.verbose=options[:verbose]
+	ct.data_dir = options[:data_dir]
+	ct.cidr_seeds = ct.data_dir + "/" + "cidrs"
+	ct.load_cidr_blks_from_file(ct.cidr_seeds)
+end
+
+abort "Incorrect program argument! Proper usage: trust [domain | netblock]" unless (dt.is_fqdn?(options[:target]) || ct.is_cidr?(options[:target]))
 
 puts "Start the baptizing process ..."
 
 # Add entry into the local repository
 
-if dt.is_domain?(ARGV[0])
-	result=dt.add(ARGV[0])
+if dt.is_domain?(options[:target])
+	result=dt.add(options[:target])
 	unless result.nil?
 		dt.save!
-		abort "Domain #{ARGV[0]} is successfully baptized!"
+		abort "Domain #{options[:target]} is successfully baptized!"
 	end
 end
 dt=nil
 
-if ct.is_cidr?(ARGV[0])
-	result=ct.add(ARGV[0])
+if ct.is_cidr?(options[:target])
+	result=ct.add(options[:target])
 	unless result.nil?
 		ct.save!
-		abort "Net block #{ARGV[0]} is successfully baptized!"
+		abort "Net block #{options[:target]} is successfully baptized!"
 	end
 end
 ct=nil

data/bin/trusts

@@ -1,35 +1,71 @@
 #!/usr/bin/env ruby
 # Executable to add seed entries into ring of the trust. I.E. the trusted domain or CIDR
 require "wmap"
-include Wmap::Utils
-def print_usage
-	puts "Program to add trust authority entries. Usage: trust [domain|CIDR list in a file]"
+require "optparse"
+
+# program command line options
+options = {:data_dir => nil, :target => nil, :verbose => false}
+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 file', 'Web Mapper target file') do |target|
+		options[:target] = target;
+	end
+	opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+		options[:verbose] = v;
+	end
+	opts.on('-h', '--help', 'Displays Help') do
+		puts opts
+		exit 0
+	end
 end
+parser.parse!
 
+# print program banner
 puts Wmap.banner
-print_usage
-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=>false)
-abort "Incorrect program argument! Proper usage: trust [domain | netblock]" unless ARGV.length==1 && (File.exist?(ARGV[0]))
+# 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')
+else
+	# Log the command entry
+	Log_dir=Pathname.new(Gem.loaded_specs['wmap'].full_gem_path).join('logs')
+end
+Dir.mkdir(Log_dir) unless Dir.exist?(Log_dir)
+Wmap.wlog("Execute the command: trust #{options[:target]}","trust",Log_dir+"wmap.log")
 
-puts "Start the baptizing process ..."
+dt=Wmap::DomainTracker.instance
+ct=Wmap::CidrTracker.new
+if options[:data_dir]
+	dt.verbose=options[:verbose]
+	dt.data_dir = options[:data_dir]
+	dt.domains_file = dt.data_dir + "/" + "domains"
+	dt.load_domains_from_file(dt.domains_file)
+	ct.verbose=options[:verbose]
+	ct.data_dir = options[:data_dir]
+	ct.cidr_seeds = ct.data_dir + "/" + "cidrs"
+	ct.load_cidr_blks_from_file(ct.cidr_seeds)
+end
 
-file_2_list(ARGV[0]).map do |target|
-	# Add entry into the local repository
-	if dt.is_domain?(target)
-		result=dt.add(target)
-		unless result.nil?
-			dt.save!
-			puts "Domain #{target} is successfully baptized!"
-		end
-	elsif ct.is_cidr?(target)
-		result=ct.add(target)
-		unless result.nil?
-			ct.save!
-			puts "Net block #{target} is successfully baptized!"
+if options[:target]
+	puts "Start the baptizing process ..."
+	dt.file_2_list(options[:target]).map do |target|
+		# Add entry into the local repository
+		if dt.is_domain?(target)
+			result=dt.add(target)
+			unless result.nil?
+				dt.save!
+				puts "Domain #{target} is successfully baptized!"
+			end
+		elsif ct.is_cidr?(target)
+			result=ct.add(target)
+			unless result.nil?
+				ct.save!
+				puts "Net block #{target} is successfully baptized!"
+			end
 		end
 	end
 end

data/version.txt

@@ -3,7 +3,7 @@
 ###############################################################################
 package = wmap
 # wmap version 2.0 == web_discovery version 1.5.3
-version = 2.7.1
+version = 2.7.2
 date = 2020-03-09
 
 author = Sam (Yang) Li

metadata

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