risu 1.7.6 → 1.7.7

data/lib/risu/base/template_helper.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2014 Arxopia LLC.
+# Copyright (c) 2012-2016 Arxopia LLC.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -31,6 +31,7 @@ module Risu
 			include MalwareTemplateHelper
 			include GraphTemplateHelper
 			include SharesTemplateHelper
+			include ScanHelper
 
 			#
 			def report_classification classification=Report.classification.upcase, newline=true
@@ -139,7 +140,7 @@ module Risu
 			def item_count_by_plugin_name (plugin_name)
 				begin
 					return Item.where(:plugin_id => Plugin.where(:plugin_name => plugin_name).first.id).count
-				rescue => e
+				rescue # => e
 					return 0
 				end
 			end

data/lib/risu/base/template_manager.rb

@@ -43,7 +43,7 @@ module Risu
 
 				load_templates(base_dir + path)
 				load_templates(Dir.pwd, false)
-				load_templates(File.expand_path(USER_TEMPLATES_DIR)) if File.exists?(File.expand_path(USER_TEMPLATES_DIR)) && File.directory?(File.expand_path(USER_TEMPLATES_DIR))
+				load_templates(File.expand_path(USER_TEMPLATES_DIR)) if File.exist?(File.expand_path(USER_TEMPLATES_DIR)) && File.directory?(File.expand_path(USER_TEMPLATES_DIR))
 			end
 
 			# Loads templates from a specific path
@@ -57,7 +57,7 @@ module Risu
 					Dir[search_path].each do |x|
 						begin
 							require x
-						rescue => e
+						rescue
 							next
 						end
 					end
@@ -67,10 +67,8 @@ module Risu
 							@registered_templates << p if @registered_templates.include?(p) == false
 						end
 					end
-				rescue => e
+				rescue
 					puts "[!] Invalid template path"
-					#puts e.inspect
-					#puts e.backtrace
 				end
 			end
 

data/lib/risu/cli/application.rb

@@ -75,7 +75,7 @@ module Risu
 			# @param file Path to configuration file
 			# @param in_memory_config [Boolean] If the configuration is in memory
 			def load_config(file=CONFIG_FILE, in_memory_config=false)
-				if File.exists?(file) == true or in_memory_config == true
+				if File.exist?(file) == true or in_memory_config == true
 					begin
 						if in_memory_config
 							yaml = YAML::load(file)
@@ -452,7 +452,7 @@ module Risu
 					puts "[*] Parsing #{file}..."
 					tstart = Time.new
 
-					if File.exists?(file) == false
+					if File.exist?(file) == false
 						raise Risu::Exceptions::InvalidDocument, "[!] Document does not exist - #{file}"
 					end
 

data/lib/risu/cli/banner.rb

@@ -58,6 +58,24 @@ module Risu
 _/        _/  _/_/_/      _/_/_/
 
 
+',
+'
+                /|       |\
+                || ( * ) ||
+                \|       |/
+                 \\\\\\\|////
+                   |||||
+                   |||||
+                   |||||   The Eye of Sauron
+                   |||||    is on your network..
+                   |||||
+                   |||||
+                   |||||   You cannot hide...
+                   |||||    I see you....
+                   |||||
+                   |||||
+                  _|||||_
+                 ///|||\\\\\
 ',
 '
       o

data/lib/risu/models/host.rb

@@ -36,17 +36,6 @@ module Risu
 
 			class << self
 
-				#
-				#
-				#
-				#def hosts_with_blacklist blacklist_hosts_id
-				# if blacklist_host_id == nil
-				#		where("id != ?", blacklist_host_id).count
-				# else
-			 	#	count
-				# end
-				#end
-
 				# Sorts all of the hosts where the ip address is not null
 				#
 				# @return [Array] With all the Ip's in sorted order
@@ -437,7 +426,7 @@ module Risu
 
 					Item.risks_by_host(limit).to_a.each do |item|
 						ip = Host.find_by_id(item.host_id).name
-						count = Item.where(:host_id => item.host_id).where(:severity => 4).count
+						count = Item.where(:host_id => item.host_id).where(:severity => 4).size
 
 						if count > 0
 							g.data(ip, count)
@@ -513,15 +502,15 @@ module Risu
 						:background_colors => %w(white white)
 					}
 
-					linux = Host.os_linux.to_a.count
-					osx = Host.os_osx.to_a.count
-					freebsd = Host.os_freebsd.to_a.count
-					netbsd = Host.os_netbsd.to_a.count
-					cisco = Host.os_cisco.to_a.count
-					vxworks = Host.os_vxworks.to_a.count
-					esx = Host.os_vmware_esx.to_a.count
-					aix = Host.os_aix.to_a.count
-					other = Host.os_other.to_a.count
+					linux = Host.os_linux.to_a.size
+					osx = Host.os_osx.to_a.size
+					freebsd = Host.os_freebsd.to_a.size
+					netbsd = Host.os_netbsd.to_a.size
+					cisco = Host.os_cisco.to_a.size
+					vxworks = Host.os_vxworks.to_a.size
+					esx = Host.os_vmware_esx.to_a.size
+					aix = Host.os_aix.to_a.size
+					other = Host.os_other.to_a.size
 
 					g.data("Linux", linux) unless linux == 0
 					g.data("OSX", osx) unless osx == 0
@@ -535,7 +524,7 @@ module Risu
 
 					#Creates very odd graphs
 					#Host.os_other.each do |host|
-					# g.data(host.os, Host.where(:os => host.os).count) unless host.os == nil
+					# g.data(host.os, Host.where(:os => host.os).size) unless host.os == nil
 					#end
 
 					StringIO.new(g.to_blob)
@@ -555,16 +544,17 @@ module Risu
 						:background_colors => %w(white white)
 					}
 
-					nt = Host.os_windows_nt.to_a.count
-					w2k = Host.os_windows_2k.to_a.count
-					xp = Host.os_windows_xp.to_a.count
-					w2k3 = Host.os_windows_2k3.to_a.count
-					vista = Host.os_windows_vista.to_a.count
-					w2k8 = Host.os_windows_2k8.to_a.count
-					w2k12 = Host.os_windows_2k12.to_a.count
-					w7 = Host.os_windows_7.to_a.count
-					w8 = Host.os_windows_8.to_a.count
-					other = (Host.os_windows.os_windows_other).to_a.count
+					nt = Host.os_windows_nt.to_a.size
+					w2k = Host.os_windows_2k.to_a.size
+					xp = Host.os_windows_xp.to_a.size
+					w2k3 = Host.os_windows_2k3.to_a.size
+					vista = Host.os_windows_vista.to_a.size
+					w2k8 = Host.os_windows_2k8.to_a.size
+					w2k12 = Host.os_windows_2k12.to_a.size
+					w7 = Host.os_windows_7.to_a.size
+					w8 = Host.os_windows_8.to_a.size
+					w10 = Host.os_windows_10.to_a.size
+					other = (Host.os_windows.os_windows_other).to_a.size
 
 					g.data("NT", nt) if nt >= 1
 					g.data("2000", w2k) if w2k >= 1
@@ -575,6 +565,7 @@ module Risu
 					g.data("Server 2012", w2k12) if w2k12 >= 1
 					g.data("7", w7) if w7 >= 1
 					g.data("8", w8) if w8 >= 1
+					g.data("10", w10) if w10 >= 1
 					g.data("Other Windows", other) if other >= 1
 
 					StringIO.new(g.to_blob)
@@ -584,16 +575,17 @@ module Risu
 				#@TODO comment
 				#
 				def windows_os_graph_text
-					nt = Host.os_windows_nt.to_a.count
-					w2k = Host.os_windows_2k.to_a.count
-					xp = Host.os_windows_xp.to_a.count
-					w2k3 = Host.os_windows_2k3.to_a.count
-					vista = Host.os_windows_vista.to_a.count
-					w2k8 = Host.os_windows_2k8.to_a.count
-					w2k12 = Host.os_windows_2k12.to_a.count
-					w7 = Host.os_windows_7.to_a.count
-					w8 = Host.os_windows_8.to_a.count
-					other = (Host.os_windows.os_windows_other).to_a.count
+					nt = Host.os_windows_nt.to_a.size
+					w2k = Host.os_windows_2k.to_a.size
+					xp = Host.os_windows_xp.to_a.size
+					w2k3 = Host.os_windows_2k3.to_a.size
+					vista = Host.os_windows_vista.to_a.size
+					w2k8 = Host.os_windows_2k8.to_a.size
+					w2k12 = Host.os_windows_2k12.to_a.size
+					w7 = Host.os_windows_7.to_a.size
+					w8 = Host.os_windows_8.to_a.size
+					w10 = Host.os_windows_10.to_a.size
+					other = (Host.os_windows.os_windows_other).to_a.size
 
 					windows_os_count = nt + w2k + xp + w2k3 + vista + w7 + w8 + w2k8 + w2k12 + other
 
@@ -606,6 +598,7 @@ module Risu
 					w2k8_percent = (w2k8.to_f / windows_os_count.to_f) * 100
 					w7_percent = (w7.to_f / windows_os_count.to_f) * 100
 					w8_percent = (w8.to_f / windows_os_count.to_f) * 100
+					w10_percent = (w10.to_f / windows_os_count.to_f) * 100
 					w2k12_percent = (w2k12.to_f / windows_os_count.to_f) * 100
 
 					text = "This graph shows the percentage of the different Microsoft Windows based operating systems " +
@@ -620,6 +613,7 @@ module Risu
 					text << "#{w2k8_percent.round.to_i}% of the network is Windows Server 2008. " if w2k8_percent >= 1
 					text << "#{w7_percent.round.to_i}% of the network is Windows 7. " if w7_percent >= 1
 					text << "#{w8_percent.round.to_i}% of the network is Windows 8. " if w8_percent >= 1
+					text << "#{w10_percent.round.to_i}% of the network is Windows 10. " if w10_percent >= 1
 					text << "#{w2k12_percent.round.to_i}% of the network is Windows Server 20012. " if w2k12_percent >= 1
 
 					text << "\n\n" << unsupported_os_windows if nt > 0 or w2k > 0
@@ -688,25 +682,25 @@ module Risu
 					#Host.os_windows.not_os_windows_7.not_os_windows_2008.not_os_windows_vista.not_os_windows_2003.not_os_windows_xp
 
 					win_95_text = "Windows 95 is an unsupported operating system; Microsoft has stopped support as of December 2001. " +
-					"Please see http://en.wikipedia.org/wiki/Windows_95 for more information.\n\n" if win_95.count >= 1
+					"Please see http://en.wikipedia.org/wiki/Windows_95 for more information.\n\n" if win_95.size >= 1
 
 					win_98_text = "Windows 98 is an unsupported operating system; Microsoft has stopped support as of July 2006. " +
-					"Please see http://support.microsoft.com/gp/lifean18 for more information.\n\n" if win_98.count >= 1
+					"Please see http://support.microsoft.com/gp/lifean18 for more information.\n\n" if win_98.size >= 1
 
 					win_me_text = "Windows Millennium is an unsupported operating system; Microsoft has stopped support as of July 2006. " +
-					"Please see http://support.microsoft.com/gp/lifean18 for more information.\n\n" if win_me.count >= 1
+					"Please see http://support.microsoft.com/gp/lifean18 for more information.\n\n" if win_me.size >= 1
 
 					win_nt_text = "Windows NT is an unsupported operating system; Microsoft has stopped support as of December 2004. " +
-					"Please see http://windows.microsoft.com/en-us/windows/products/lifecycle for more information.\n\n" if win_nt.count >= 1
+					"Please see http://windows.microsoft.com/en-us/windows/products/lifecycle for more information.\n\n" if win_nt.size >= 1
 
 					win_2000_text = "Windows 2000 is an unsupported operating system; Microsoft has stopped support as of July 2010. " +
-					"Please see http://windows.microsoft.com/en-us/windows/products/lifecycle for more information.\n\n" if win_2000.count >= 1
+					"Please see http://windows.microsoft.com/en-us/windows/products/lifecycle for more information.\n\n" if win_2000.size >= 1
 
 					win_xp_text = "Windows XP is an unsupported operating system; Microsoft has stopped support as of April 2014. " +
-					"Please see http://windows.microsoft.com/en-us/windows/products/lifecycle for more information.\n\n" if win_xp.count >= 1
+					"Please see http://windows.microsoft.com/en-us/windows/products/lifecycle for more information.\n\n" if win_xp.size >= 1
 
 					win_2003_text = "Windows 2003 is an unsupported operating system; Microsoft has stopped support as of July 2015. " +
-					"Please see http://windows.microsoft.com/en-us/windows/products/lifecycle for more information.\n\n" if win_2003.count >= 1
+					"Please see http://windows.microsoft.com/en-us/windows/products/lifecycle for more information.\n\n" if win_2003.size >= 1
 
 					return "#{win_95_text}#{win_98_text}#{win_me_text}#{win_nt_text}#{win_2000_text}#{win_xp_text}#{win_2003_text}"
 				end
@@ -719,7 +713,7 @@ module Risu
 
 					text = "AIX 5.x is an unsupported operating system since IBM has stopped support as of April 2011. " +
 					"Please see http://www-03.ibm.com/systems/power/software/aix/ for more information " +
-					"about obtaining a newer supported version.\n\n" if aix.count >= 1
+					"about obtaining a newer supported version.\n\n" if aix.size >= 1
 
 					return text
 				end
@@ -731,7 +725,7 @@ module Risu
 					freebsd = Host.os_freebsd.where("OS LIKE 'FreeBSD 5.%'")
 
 					text = "FreeBSD 5 support ended on 2008-05-31. Upgrade to FreeBSD 8.2 or 7.4. For more information, " +
-					"see : http://www.freebsd.org/security/\n\n" if freebsd.count >= 1
+					"see : http://www.freebsd.org/security/\n\n" if freebsd.size >= 1
 
 					return text
 				end
@@ -743,15 +737,15 @@ module Risu
 					text = "This graph shows the percentage of the different Non-Windows based operating systems " +
 					"found on the #{Report.title} network.\n\n"
 
-					linux = Host.os_linux.to_a.count
-					osx = Host.os_osx.to_a.count
-					freebsd = Host.os_freebsd.to_a.count
-					netbsd = Host.os_netbsd.to_a.count
-					cisco = Host.os_cisco.to_a.count
-					vxworks = Host.os_vxworks.to_a.count
-					esx = Host.os_vmware_esx.to_a.count
-					aix = Host.os_aix.to_a.count
-					other = Host.os_other.to_a.count
+					linux = Host.os_linux.to_a.size
+					osx = Host.os_osx.to_a.size
+					freebsd = Host.os_freebsd.to_a.size
+					netbsd = Host.os_netbsd.to_a.size
+					cisco = Host.os_cisco.to_a.size
+					vxworks = Host.os_vxworks.to_a.size
+					esx = Host.os_vmware_esx.to_a.size
+					aix = Host.os_aix.to_a.size
+					other = Host.os_other.to_a.size
 
 					other_os_count = linux + osx + freebsd + netbsd + cisco + vxworks + esx + aix + other
 
@@ -777,7 +771,7 @@ module Risu
 				# @TODO comments
 				#
 				def top_n_vulnerable(n)
-					hosts = Item.risks_by_host(Host.count).count
+					hosts = Item.risks_by_host(Host.count).size
 					hosts = hosts.sort_by {|k, v| v}
 					hosts.reverse!
 
@@ -811,19 +805,19 @@ module Risu
 				# @TODO
 				def unique_hosts_with_critical_and_high_count
 					hosts = Array.new
-					crit = Item.critical_risks_by_host(Host.all.count)
+					crit = Item.critical_risks_by_host(Host.all.size)
 
 					crit.each do |item|
 						hosts.push(item.host_id)
 					end
 
-					high = Item.high_risks_by_host(Host.all.count)
+					high = Item.high_risks_by_host(Host.all.size)
 
 					high.each do |item|
 						hosts.push(item.host_id)
 					end
 
-					hosts.uniq.count
+					hosts.uniq.size
 				end
 			end
 		end

data/lib/risu/models/item.rb

@@ -494,6 +494,7 @@ module Risu
 					#return Item.joins(:plugin).where(:severity => 4).order("plugins.cvss_base_score").group(:plugin_id).distinct.count
 
 					critical = Item.joins(:plugin).where(:severity => 4).order("plugins.cvss_base_score").group(:plugin_id).distinct.count
+					#critical = Item.joins(:plugin).where(:severity => 4).group(:plugin_id).distinct.count
 
 					if critical.size < 10
 						high = Item.joins(:plugin).where(:severity => 3).order("plugins.cvss_base_score").group(:plugin_id).distinct.count

data/lib/risu/models/plugin.rb

@@ -87,6 +87,12 @@ module Risu
 					where(:risk_factor => "None")
 				end
 
+				# TODO doc
+				#
+				def in_the_news
+					where(:in_the_news => true)
+				end
+
 				# Creates a graph based on the top plugins sorted by count
 				#
 				# @return Filename of the created graph
@@ -140,7 +146,7 @@ module Risu
 					g.data('Vendor Support', Plugin.where(:root_cause => 'Vendor Support').count)
 					g.data('Configuration', Plugin.where(:root_cause => 'Configuration').count)
 
-					StringIO.new(g.to_blob)					
+					StringIO.new(g.to_blob)
 				end
 
 				def root_cause_graph_text

data/lib/risu/models/report.rb

@@ -44,10 +44,10 @@ module Risu
 				end
 
 				#
-				# @TODO comment this
+				# @TODO comment this / rewrite this
 				#
 				def scanner_nessus_ratings_text
-					text = "The vulnerability scanner used by #{Report.company} rates the findings as follows: Critical, High, Medium, Low and Informational. High findings represents a security hole, initially this is the highest rating a risk can get.  These generally represent vulnerabilities that can lead to full system compromise due to missing security patches. High findings should be re-mediated first as they generally leave the network wide open. Medium findings are considered a security warning; these are not as severe as high but should be evaluated on a risk-by-risk basis. These are typically configuration errors that can lead to information disclosures such as usernames, passwords, and configuration settings. Low findings are identified as security notes; these provide information the scanner discovered during the scanning process. The information includes items such as hostname, domain name, and MAC address. Open Port findings represent the open ports on each system that the scanner found during the scan process. These should be evaluated against firewall settings to test the firewall configurations.\n\n"
+					text = "The vulnerability scanner used by #{Report.company} rates the findings as follows: Critical, High, Medium, Low and Informational. Critical findings represent a security hole, this is the highest rating a risk can get.  These generally represent vulnerabilities that can lead to full system compromise due to missing security patches. Critical findings should be re-mediated first as they generally leave the network wide open. High findings are slightly less severe than Critical findings but the severity depends on the calculated CVSS base score. Medium findings are considered a security warning; these are not as severe as high but should be evaluated on a risk-by-risk basis. These are typically configuration errors that can lead to information disclosures such as usernames, passwords, and configuration settings. Low findings are identified as security notes; these provide information the scanner discovered during the scanning process. The information includes items such as hostname, domain name, and MAC address. Open Port findings represent the open ports on each system that the scanner found during the scan process. These should be evaluated against firewall settings to test the firewall configurations.\n\n"
 					text << "After the scanner is complete, the scanner evaluates each finding and bases it on the Common Vulnerability Scoring System (CVSS) score assigned to each finding. Any findings with a CVSS base score of 10 are upgraded to a Critical finding. These represent vulnerabilities that are trivial to gain administrator access to the system, with little to no effort. For more information on the CVSS scoring system please visit: http://nvd.nist.gov/cvss.cfm.\n\n"
 
 					return text

data/lib/risu/parsers/nessus/nessus_document.rb

@@ -88,7 +88,7 @@ module Risu
 								ip = IPAddr.new host.name
 								host.ip = ip.to_string
 								host.save
-							rescue ArgumentError => ae
+							rescue ArgumentError
 								next
 							end
 						end

data/lib/risu/parsers/nessus/nessus_sax_listener.rb

@@ -398,7 +398,7 @@ module Risu
 						:cvss_temporal_vector => @vals["cvss_temporal_vector"],
 						:exploitability_ease => @vals["exploitability_ease"],
 						:exploit_framework_core => @vals["exploit_framework_core"],
-						:exploit_available => @vals["exploit_available"],
+						:exploit_available => @vals["exploit_available"] == "true",
 						:exploit_framework_metasploit => @vals["exploit_framework_metasploit"],
 						:metasploit_name => @vals["metasploit_name"],
 						:exploit_framework_canvas => @vals["exploit_framework_canvas"],
@@ -411,7 +411,9 @@ module Risu
 						:script_version => @vals["script_version"],
 						:exploited_by_malware => @vals["exploited_by_malware"],
 						:compliance => @vals["compliance"],
-						:agent => @vals["agent"]
+						:agent => @vals["agent"],
+						:in_the_news => @vals["in_the_news"]
+
 					)
 				end
 

data/lib/risu/parsers/nessus/postprocess/adobe_acrobat.rb

@@ -73,6 +73,10 @@ module Risu
 								77711,
 								69845,
 								71946,
+								86402,
+								91096,
+								87917,
+								89830,
 								
 
 

data/lib/risu/parsers/nessus/postprocess/adobe_air.rb

@@ -87,7 +87,17 @@ module Risu
 								84158,
 								84641,
 								85325,
+								86059,
+								86368,
+								86850,
+								87243,
+								87656,
+								88638,
+								89868,
+								91162,
 								
+
+
 							]
 
 						}

data/lib/risu/parsers/nessus/postprocess/adobe_reader.rb

@@ -81,7 +81,12 @@ module Risu
 								83471,
 								40494,
 								27584,
-								
+								86403,
+								87918,
+								89831,
+								70343,
+								91097
+
 
 
 							]