bin/RHPG in wmap-2.4.6 vs bin/RHPG in wmap-2.4.8

@@ -8,12 +8,14 @@
 
 def print_usage
 	puts "Program to lookup then merge the site details into RHPG asset spreadsheet. \nUsage: RHPG [RHPG.csv]"
 end
 
+# Lookup the site store for a domain; then return the fingger print info of the site
 def site_lookup(domain)
-  tracker=Wmap::SiteTracker.new(:verbose=>false)
+  tracker=Wmap::SiteTracker.instance
+	tracker.verbose=false
   #first order search
   tracker.known_sites.each do |key,val|
     if key.include?(domain.strip.downcase) && key.include?("https")
       tracker=nil
       return [key] + val.values
@@ -28,10 +30,11 @@
   end
   tracker=nil
   return [nil]*9
 end
 
+# look up the wp site data store for a domain; then return the wp finger print info: [is_wp?,wp_ver]
 def wp_site_lookup(domain)
   tracker=Wmap::WpTracker.new(:verbose=>false)
 	# first order
 	tracker.known_wp_sites.each do |key,val|
 		if key.include?(domain.strip.downcase) && val
@@ -40,11 +43,11 @@
 			return [val,ver]
 		end
 	end
   # second order
   tracker.known_wp_sites.each do |key,val|
-    if key.include?(domain.strip.downcase) && key.include?("https")
+    if key.include?(domain.strip.downcase) && key.include?("https") && val
       tracker=nil
       return [val,nil]
     end
   end
   # third order
@@ -56,10 +59,22 @@
   end
   tracker=nil
   return [nil,nil]
 end
 
+# perform the wpscan on a site
+def wpscan(domain)
+	url=site_lookup(domain)[0]
+	return nil if url.nil?
+	if url.include?("https")
+		command="wpscan --disable-tls-checks --ignore-main-redirect --url=" + url + " -o " + domain + ".wpscan"
+	else
+		command="wpscan --ignore-main-redirect --url=" + url + " -o " + domain + ".wpscan"
+	end
+	system(command)
+end
+
 puts Wmap.banner
 print_usage
 
 # open output file to write
 CSV.open("output.csv", "wb") do |csv|
@@ -69,9 +84,16 @@
     puts "Processing row #{cnt}"
     #puts row.inspect
     my_row=Array.new
     if cnt > 1
       if is_domain?(row[0])
+=begin
+				if row[3] =~ /Keep/i && row[3] != /Redirect/i
+					unless File.exist?(row[0]+".wpscan")
+						wpscan(row[0])
+					end
+				end
+=end
         my_row = row + site_lookup(row[0]) + wp_site_lookup(row[0])
       else
         my_row = row + [nil]*10
       end
     else