wmap 2.6.4 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdb13c32f4c0c74ad2ab753782620391476e8f8f92e035a2fd1566e57077c91f
-  data.tar.gz: 7ba530bf91fe8f47f527133e1095b9ed0e87f806f206c7a34e4c696cb9299ac8
+  metadata.gz: bbdb0202263c3525fce7e6c1f303d44e0c8310311e374c82392b7922df28292e
+  data.tar.gz: 8ab717ff6400d2936e288f5df870a4ca95a87dfd698e4f161d225aa340abe2d8
 SHA512:
-  metadata.gz: 58f0db14b993f33cd25cc34d8b6de7f03b1b9103c4434c145025f869d213fc29a5828d9f026f3f709d454af79a8421a2aa3aaf72963bea5f06387098b32fb86b
-  data.tar.gz: cbd700d85a1be4761c9398ea0ba09ecf1e3a1bfb0b8bb69fee139c13ba827b226b9dc04730d54519ce4213bf49dd236ef18b5cf0c7ddaec666cd57589fdd5ffe
+  metadata.gz: 7caff9a7eb4127880bb795421126bd5e8b27a4a73045856eb1972526e231a4c5e3cce3e29c2f20c10374976c130aac9e98c51f77ec62e1aa4c4c0a53ee15ce56
+  data.tar.gz: 608a63725be7551266f6f1b49259bc89e952a2553b4eb84c3c6b229a8d648fe35c77f69bfae2e90838a630a6d2c82dd37abefbe9bd02fac10df1792beca95d66

data/lib/wmap/url_crawler/adware_tag.rb

@@ -13,7 +13,7 @@ module Wmap
 	# Class to identify and track adware within the site store
 	include Wmap::Utils
 	attr_accessor :signature_file, :tag_file, :verbose, :data_dir, :data_store
-	attr_reader :tag_store, :tag_signatures
+	attr_reader :tag_signatures, :tag_store
 
 
   class AdwareTag < Wmap::UrlCrawler
@@ -22,15 +22,14 @@ module Wmap
 		def initialize (params = {})
 			@verbose=params.fetch(:verbose, false)
       @data_dir=params.fetch(:data_dir, File.dirname(__FILE__)+'/../../../data/')
-      @tag_file=@data_dir + 'tag_sites'
 			# Set default instance variables
 			@signature_file=File.dirname(__FILE__) + '/../../../settings/' + 'tag_signatures'
 			file=params.fetch(:signature_file, @signature_file)
 			@tag_signatures=load_from_file(file)
-      file2=params.fetch(:tag_file, @tag_file)
+      @tag_file=params.fetch(:tag_file, @data_dir + 'tag_sites')
       File.write(file2, "") unless File.exist?(@tag_file)
       # load the known tag store
-      @tag_store=load_tag_from_file(file2)
+      load_tag_from_file(@tag_file)
       @landings = Hash.new  # cache landing page to reduce redundant browsing
 		end
 
@@ -65,7 +64,7 @@ module Wmap
     # load the known tag store cache into an instance variable
   	def load_tag_from_file (file, lc=false)
       puts "Loading tag data file: #{file}"	if @verbose
-			data_store=Hash.new
+			@tag_store=Hash.new
 			f = File.open(file, 'r')
 			f.each_line do |line|
 				puts "Processing line: #{line}" if @verbose
@@ -75,14 +74,14 @@ module Wmap
 				next if line =~ /^\s*#/
 				line=line.downcase if lc==true
 				entry=line.split(',')
-				if data_store.key?(entry[0])
+				if @tag_store.key?(entry[0])
 					next
 				else
-					data_store[entry[0]]=[entry[1].strip, entry[2].strip, entry[3], entry[4]]
+					@tag_store[entry[0]]=[entry[1].strip, entry[2].strip, entry[3], entry[4]]
 				end
 			end
 			f.close
-			return data_store
+			return @tag_store
 		rescue => ee
 			puts "Exception on method #{__method__}: #{ee}" if @verbose
 			return nil

data/lib/wmap/wp_tracker.rb

@@ -26,20 +26,19 @@ class Wmap::WpTracker
 		@verbose=params.fetch(:verbose, false)
 		@data_dir=params.fetch(:data_dir, File.dirname(__FILE__)+'/../../data/')
 		Dir.mkdir(@data_dir) unless Dir.exist?(@data_dir)
-    wp_sites=@data_dir+'wp_sites'
-    @file_wps=params.fetch(:sites_wp, wp_sites)
+    @sites_wp=params.fetch(:sites_wp, @data_dir+"wp_sites")
 		@http_timeout=params.fetch(:http_timeout, 5000)
 		@max_parallel=params.fetch(:max_parallel, 40)
 		Dir.mkdir(@data_dir) unless Dir.exist?(@data_dir)
 		@log_file=@data_dir + "wp_checker.log"
-    @known_wp_sites=load_from_file(@file_wps)
+		File.write(@sites_wp, "") unless File.exist?(@sites_wp)
+    load_from_file(@sites_wp)
 	end
 
-
   # 'setter' to load the known wordpress sites into an instance variable
 	def load_from_file (file=@file_stores, lc=true)
 		puts "Loading trusted file: #{file}"	if @verbose
-		known_wp_sites=Hash.new
+		@known_wp_sites=Hash.new
 		f_wp_sites=File.open(file, 'r')
 		f_wp_sites.each_line do |line|
 			puts "Processing line: #{line}" if @verbose
@@ -51,25 +50,24 @@ class Wmap::WpTracker
 			entry=line.split(',')
 			site = entry[0].strip()
 			next if site.nil?
-			if known_wp_sites.key?(site)
+			if @known_wp_sites.key?(site)
 				next
 			else
-				known_wp_sites[site] = Hash.new
-				known_wp_sites[site]['site'] = site
-				known_wp_sites[site]['version'] = entry[1].strip()
-				known_wp_sites[site]['redirection'] = entry[2].strip()
+				@known_wp_sites[site] = Hash.new
+				@known_wp_sites[site]['site'] = site
+				@known_wp_sites[site]['version'] = entry[1].strip()
+				@known_wp_sites[site]['redirection'] = entry[2].strip()
 			end
-
 		end
 		f_wp_sites.close
-		return known_wp_sites
+		return @known_wp_sites
 	rescue => ee
 		puts "Exception on method #{__method__}: #{ee}" if @verbose
 		return Hash.new
 	end
 
 	# Save the current hash table into a file
-	def save_to_file!(file_wps=@file_wps, wps=@known_wp_sites)
+	def save_to_file!(file_wps=@sites_wp, wps=@known_wp_sites)
 		puts "Saving the current wordpress site table from memory to file: #{file_wps} ..." if @verbose
 		timestamp=Time.now
 		f=File.open(file_wps, 'w')
@@ -148,7 +146,7 @@ class Wmap::WpTracker
 	def refreshs (num=@max_parallel,use_cache=false)
 	  puts "Add entries to the local cache table from site tracker: " if @verbose
 		results=Hash.new
-		wps=Wmap::SiteTracker.instance.known_sites.keys
+		wps=@known_wp_sites.keys
 		if wps.size > 0
 			Parallel.map(wps, :in_processes => num) { |target|
 				refresh(target,use_cache)
@@ -170,9 +168,9 @@ class Wmap::WpTracker
 		end
 		wps=nil
 		return results
-	rescue => ee
-		puts "Exception on method #{__method__}: #{ee}" if @verbose
-		return Hash.new
+	#rescue => ee
+	#	puts "Exception on method #{__method__}: #{ee}" if @verbose
+	#	return Hash.new
 	end
 
   # Wordpress detection checkpoint - readme.html

data/version.txt

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