wmap 2.6.8 → 2.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cbae048aecd25ee91bdbbf75657d8f4329e9abd2c65cd90cedd65b553659ed4
-  data.tar.gz: 1043ec8e2dd15287c6d11b3a0094ca4b65c4684aec96cdea03085cfea431ceb8
+  metadata.gz: c1fcf909fd9549bdc0c1339d986ec7812563474ef4c9e6b1aa76ca3790b038a5
+  data.tar.gz: 2098e60fc667bf8ba02fa852242ffb2a515ebe04374177f4bf1a50bdb69a05ef
 SHA512:
-  metadata.gz: b89c65b1ec441b0307ef85a322f8ced64e9443694a021301989a52761cc62496e3c2552fb21c709a01f1bf8e7834634f8d2e4d9ce6432521c6a197e02a9f7290
-  data.tar.gz: 71b0beedf0e8c9f75172cde52c6f40b9620a96de5ecfc69c031908e6c86534818ca1f5208711a3eb9c5852a09c1b2beda864d25c620399737442e65016bcbf98
+  metadata.gz: ea7e49f2b0913ad1159226268355ea9e339468929b614fff99e24b4e1b43fc4225560466930023f2691deb5b3547eaf9a41ada8cdc9128401389e96a5ef2865a
+  data.tar.gz: ba6d2efe7f4ebf1b9bd761b5d4235744ddbdde8a398cefc07af7465a2c5c974e0f6c91c3dbf573659a6de2eca1b01af8434439e63c3a1b125de7b241e7d0feab

data/lib/wmap.rb

@@ -67,9 +67,17 @@ module Wmap
 		string = "-"*80 + "\n" + art + "\n" + "Version: " + ver["version"] + "\tRelease Date: " + ver["date"] + "\nDesigned and developed by: " + ver["author"] + "\nEmail: " + ver["email"] + "\tLinkedIn: " + ver["linkedin"] + "\n" + "-"*80
 	end
 
+  def data_dir(data_path)
+    @data_dir=data_path.to_s
+  end
+
 	# Explorer to discover and inventory web application / service automatically
 	def wmap(seed)
-		cmd="bin/wmap" + " " + seed
+    if @data_dir
+      cmd = "bin/wmap" + " -d " + @data_dir + " -t " + seed
+    else
+		    cmd="bin/wmap" + " -t " + seed
+    end
 		system(cmd)
 	end
 
@@ -118,6 +126,11 @@ module Wmap
 	# Check if the IP is within the range of the known CIDR blocks
 	def ip_trusted?(ip)
 		tracker=Wmap::CidrTracker.new
+    if @data_dir
+      tracker.data_dir=@data_dir
+      tracker.cidr_seeds=tracker.data_dir + "/" + "cidrs"
+      tracker.load_cidr_blks_from_file(tracker.cidr_seeds)
+    end
 		tracker.ip_trusted?(ip)
 	end
 
@@ -125,24 +138,47 @@ module Wmap
 	# NOT to confuse with the Internet 'whois' lookup
 	def domain_known?(domain)
 		tracker=Wmap::DomainTracker.instance
+    if @data_dir
+      tracker.data_dir=@data_dir
+      tracker.domains_file=tracker.data_dir + "/" + "domains"
+      tracker.load_domains_from_file(tracker.domains_file)
+    end
 		tracker.domain_known?(domain)
 	end
 
 	# Host Tracking - check local hosts file to see if this is a hostname known from the host seed file
 	# NOT to confuse with a regular DNS lookup over the internet
 	def host_known?(host)
-		tracker=Wmap::HostTracker.instance.host_known?(host)
+		tracker=Wmap::HostTracker.instance
+    if @data_dir
+      tracker.data_dir = data_dir
+      tracker.hosts_file = tracker.data_dir + "/" + "hosts"
+      tracker.load_known_hosts_from_file(tracker.hosts_file)
+    end
+    tracker.host_known?(host)
 	end
 
 	# Sub-domain tracking - check local hosts file to see if the sub-domain is already known
 	def sub_domain_known?(host)
-		tracker=Wmap::HostTracker.instance.sub_domain_known?(host)
+		tracker=Wmap::HostTracker.instance
+    if @data_dir
+      tracker.data_dir = data_dir
+      tracker.hosts_file = tracker.data_dir + "/" + "hosts"
+      tracker.load_known_hosts_from_file(tracker.hosts_file)
+    end
+    tracker.sub_domain_known?(host)
 	end
 
 	# IP Tracking - check local hosts file to see if this is an IP known from the seed file
 	# NOT to confuse with a regular reverse DNS lookup over the internet
 	def ip_known?(ip)
-		tracker=Wmap::HostTracker.instance.ip_known?(ip)
+		tracker=Wmap::HostTracker.instance
+    if @data_dir
+      tracker.data_dir = data_dir
+      tracker.hosts_file = tracker.data_dir + "/" + "hosts"
+      tracker.load_known_hosts_from_file(tracker.hosts_file)
+    end
+    tracker.ip_known?(ip)
 	end
 
 	# DNS Brute Forcer
@@ -175,25 +211,44 @@ module Wmap
 	# Search the site repository for all entries that match the pattern
 	def search(pattern)
 		searcher=Wmap::SiteTracker.instance
+    if @data_dir
+      searcher.data_dir = @data_dir
+      searcher.sites_file = searcher.data_dir + "/" + "sites"
+      searcher.load_site_stores_from_file(searcher.sites_file)
+    end
 		searcher.search(pattern)
 	end
 
 	# Dump out the unique sites into a plain file
 	def dump(file)
 			store=Wmap::SiteTracker.instance
-      store.verbose=false
+      if @data_dir
+        store.data_dir = @data_dir
+        store.sites_file = searcher.data_dir + "/" + "sites"
+        store.load_site_stores_from_file(searcher.sites_file)
+      end
 			store.save_uniq_sites(file)
 	end
 
 	# Dump out the unique sites into a XML file
 	def dump_xml(file)
 			store=Wmap::SiteTracker.instance
-			store.save_uniq_sites_xml(file)
+      if @data_dir
+        store.data_dir = @data_dir
+        store.sites_file = searcher.data_dir + "/" + "sites"
+        store.load_site_stores_from_file(searcher.sites_file)
+      end
+      store.save_uniq_sites_xml(file)
 	end
 
 	# Refresh the site information in the local data repository
 	def refresh(site)
 			store=Wmap::SiteTracker.instance
+      if @data_dir
+        store.data_dir = @data_dir
+        store.sites_file = searcher.data_dir + "/" + "sites"
+        store.load_site_stores_from_file(searcher.sites_file)
+      end
 			store.refresh(site)
 			store.save!
 	end
@@ -201,6 +256,11 @@ module Wmap
 	# Refresh the site information in the local data repository
 	def refresh_all
 			store=Wmap::SiteTracker.instance
+      if @data_dir
+        store.data_dir = @data_dir
+        store.sites_file = searcher.data_dir + "/" + "sites"
+        store.load_site_stores_from_file(searcher.sites_file)
+      end
 			store.refresh_all
 			store.save!
 	end
@@ -219,7 +279,12 @@ module Wmap
 	# Print a site's full information from the repository
 	def print_all
 		searcher=Wmap::SiteTracker.instance
-		searcher.print_all_sites
+    if @data_dir
+      searcher.data_dir = @data_dir
+      searcher.sites_file = searcher.data_dir + "/" + "sites"
+      searcher.load_site_stores_from_file(searcher.sites_file)
+    end
+    searcher.print_all_sites
 	end
 
   private

data/lib/wmap/site_tracker.rb

@@ -554,7 +554,8 @@ class Wmap::SiteTracker
 		sites=Hash.new
 		#uniqueness=Hash.new
 		host_tracker=Wmap::HostTracker.instance
-		host_tracker.hosts_file=@data_dir + 'hosts'
+		host_tracker.data_dir=@data_dir
+		host_tracker.hosts_file=host_tracker.data_dir + '/' + 'hosts'
 		host_tracker.load_known_hosts_from_file
 		@known_sites.keys.map do |key|
 			port=url_2_port(key).to_s
@@ -649,6 +650,8 @@ class Wmap::SiteTracker
 		sites=get_ip_sites
 		host_tracker=Wmap::HostTracker.instance
 		host_tracker.data_dir=@data_dir
+		host_tracker.hosts_file = host_tracker.data_dir + "/" + "hosts"
+		host_tracker.load_known_hosts_from_file
 		sites.map do |site|
 			puts "Work on resolve the IP site: #{site}" if @verbose
 			ip=url_2_host(site)
@@ -804,6 +807,8 @@ class Wmap::SiteTracker
 		host_tracker.data_dir=@data_dir
 		primary_host_tracker=Wmap::HostTracker::PrimaryHost.instance
 		primary_host_tracker.data_dir=@data_dir
+		primary_host_tracker.hosts_file = primary_host_tracker.data_dir + "/" + "prime_hosts"
+		primary_host_tracker.known_hosts=primary_host_tracker.load_known_hosts_from_file(@hosts_file)
 		# Step 1. Retrieve the unique site list first
 		sites=get_uniq_sites
 		prim_uniq_sites=Array.new

data/version.txt

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