wmap 2.5.4 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae590c812b4919eb1b66841f6eb873de93727cbf8847fe6392dc19c94e4ef158
-  data.tar.gz: 7530a5c491a7d87289e41c4ef4b0df6f201495c107270892e5e6d22f9584da9b
+  metadata.gz: 9b7418c10fec65599e729f381e47814776b8e9641a3e1d27d5b11084e2d87f3d
+  data.tar.gz: 8534aa535bbba34f58fab3edd1e73cad1b85d2c95d294d2e6bbd894960c1f885
 SHA512:
-  metadata.gz: fa9211e5e14e74a24266677b8993071f9be1e75b9387d35a36233192c885521abbb8ecd31b0b0dc2d65db4de50cb0513e0a4cd214bed18672a1cf3b1b9cd52f6
-  data.tar.gz: 70d6dc893be0273b16b4f8dd78d9fe4f3ec7bf5310ea0c8b299100535300053a19f8d936ac6422cffd5251d0dc2fae991eeaa41ac31f0a639d52994bf9a5d645
+  metadata.gz: 8992d8b673bf2fddfb5a1097b26a947fb109fb68bccf677310fee4b7e4530358ef48da75eb128f70c0f8e609914c91f3c5f0348de9417d38683db1ed1de1fd3e
+  data.tar.gz: c8664f0216f971f48f454bdced1a5566cb0feaa699c2a366fd34e72f84b6744e54e623d3c959e1369d2aea751eb5cbbd92e2d3bf78dc621821d5f5b953e2dd7f

data/bin/wmap

@@ -11,12 +11,12 @@ end
 
 # preparing - spit out the program banner
 puts Wmap.banner
-if ARGV.length == 1
-	# Log the command entry
-	Log_dir=File.dirname(__FILE__)+'/../logs/'
-elsif ARGV.length == 2
+if ARGV.length == 2
 	# Log to the instance running directory
 	Log_dir=File.dirname(__FILE__)+'/../logs/'+ARGV[1]
+else
+	# Log the command entry
+	Log_dir=File.dirname(__FILE__)+'/../logs/'
 end
 Dir.mkdir(Log_dir) unless Dir.exist?(Log_dir)
 

data/lib/wmap/wp_tracker.rb

@@ -50,6 +50,7 @@ class Wmap::WpTracker
 			line=line.downcase if lc==true
 			entry=line.split(',')
 			site = entry[0].strip()
+			next if site.nil?
 			if known_wp_sites.key?(site)
 				next
 			else
@@ -74,7 +75,7 @@ class Wmap::WpTracker
 		f=File.open(file_wps, 'w')
 		f.write "# Local wps file created by class #{self.class} method #{__method__} at: #{timestamp}\n"
 		f.write "# WP Site URL, WP Version, Redirection \n"
-		wps.keys.sort.map do |key|
+		(wps.keys - [nil,'']).sort.map do |key|
 			f.write "#{key}, #{wps[key]['version']}, #{wps[key]['redirection']}\n"
 		end
 		f.close
@@ -84,7 +85,7 @@ class Wmap::WpTracker
 	end
 	alias_method :save!, :save_to_file!
 
-  # 'setter' to add wordpress entry to the cache one at a time
+  # Add wordpress entry to the cache one at a time
 	def add(url, use_cache=true)
 	  puts "Add entry to the local cache table: #{url}" if @verbose
     site=url_2_site(url)
@@ -93,13 +94,23 @@ class Wmap::WpTracker
 		else
 			record=Hash.new
 			redirection = landing_location(site)
-			if is_wp?(redirection)
-				version = wp_ver(site)
-        record['site'] = site
-				record['version'] = version
-				record['redirection'] = redirection
-				@known_wp_sites[site]=record
-				puts "Entry loaded: #{record}"
+			if not [nil, ''].include?(redirection)
+				if is_wp?(redirection)
+					version = wp_ver(redirection)
+	        record['site'] = site
+					record['version'] = version
+					record['redirection'] = redirection
+					@known_wp_sites[site]=record
+					puts "Entry added: #{record}"
+				end
+			else
+				if is_wp?(site)
+					version = wp_ver(site)
+					record['version'] = version
+					record['redirection'] = redirection
+					@known_wp_sites[site]=record
+					puts "Entry added: #{record}"
+				end
 			end
 		end
     return record
@@ -272,15 +283,20 @@ class Wmap::WpTracker
 	# Extract the WordPress version
 	def wp_ver(url)
 		if !wp_ver_readme(url).nil?
+			puts "WordPress version found by wp_ver_readme method. " if @verbose
 			return wp_ver_readme(url)
-		elsif !wp_ver_meta(url).nil?
-			return wp_ver_meta(url)
 		elsif !wp_ver_login(url,"login.min.css").nil?
+			puts "WordPress version found by login.min.css file. " if @verbose
 			return wp_ver_login(url,"login.min.css")
 		elsif !wp_ver_login(url,"buttons.min.css").nil?
+			puts "WordPress version found by buttons.min.css file. " if @verbose
 			return wp_ver_login(url,"buttons.min.css")
 		elsif !wp_ver_login(url,"wp-admin.min.css").nil?
+			puts "WordPress version found by wp-admin.min.css file. " if @verbose
 			return wp_ver_login(url,"wp-admin.min.css")
+		elsif !wp_ver_meta(url).nil?
+			puts "WordPress version found by wp_ver_meta method. " if @verbose
+			return wp_ver_meta(url)
 		else
 			return nil
 		end
@@ -326,10 +342,10 @@ class Wmap::WpTracker
       meta=doc.css('meta')
 			#puts meta.inspect
 			meta.each do |tag|
-	      if tag.to_s =~ /wordpress/i
+	      if tag['content'].to_s =~ /wordpress/i
 					#puts tag.to_s
 					k=nil
-	        return tag.to_s.scan(/[\d+\.]+\d+/).first
+	        return tag['content'].to_s.scan(/[\d+\.]+\d+/).first
 	      end
 			end
     end

data/logs/wmap.log

@@ -14,3 +14,4 @@ A test
 2019-04-13 11:45:43 -0400: trust: Execute the command: trust /tmp/test
 2019-04-13 11:46:54 -0400: trust: Execute the command: trust /tmp/test
 2019-04-13 12:03:24 -0400: wmap: Execute the command: wmap www.lcbhome.com
+2019-08-15 09:39:36 -0400: wmap: Execute the command: wmap 

data/version.txt

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