risu 1.5.3 → 1.6.0

data/lib/risu/templates/cover_sheet.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 Arxopia LLC.
+# Copyright (c) 2010-2013 Arxopia LLC.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -27,66 +27,62 @@
 module Risu
 	module Templates
 		class CoverSheet < Risu::Base::TemplateBase
+			include TemplateHelper
 
-			#
-			#
 			def initialize ()
 				@template_info =
 				{
 					:name => "cover_sheet",
 					:author => "hammackj",
-					:version => "0.0.2",
+					:version => "0.0.3",
 					:description => "Generates a coversheet with a logo (Example Template)"
 				}
 			end
 
-			#
-			#
 			def render(output)
 				output.image "#{File.expand_path(File.dirname(__FILE__))}/data/nessuslogo.jpg", :scale => 0.2, :position => :left, :vposition => :top
 
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
 
-				output.font_size(24) do
-					output.text Report.title, :align => :center
-				end
+				text Report.classification.upcase, :align => :center
+				text "\n"
 
-				output.font_size(18) do
-				    output.text "Coversheet Example", :align => :center
-				    output.text "\n"
-				    output.text "This report was prepared by\n#{Report.author}", :align => :center
-				end
+				report_title Report.title
+				report_subtitle "Coversheet Example"
+				report_author "This report was prepared by\n#{Report.author}"
 
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
-				output.text "\n"
+				text "\n\n\n"
 
-				output.text "Nessus is a Registered Trademark of Tenable Network Security, Inc."
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+				text "\n"
+
+				text "Nessus is a Registered Trademark of Tenable Network Security, Inc."
 			end
 		end
 	end

data/lib/risu/templates/exec_summary.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 Arxopia LLC.
+# Copyright (c) 2010-2013 Arxopia LLC.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -27,6 +27,7 @@
 module Risu
 	module Templates
 		class ExecSummary < Risu::Base::TemplateBase
+			include TemplateHelper
 
 			#
 			#
@@ -35,7 +36,7 @@ module Risu
 				{
 					:name => "exec_summary",
 					:author => "hammackj",
-					:version => "0.0.3",
+					:version => "0.0.5",
 					:description => "Generates a simple executive summary."
 				}
 			end
@@ -46,15 +47,9 @@ module Risu
 				output.text Report.classification.upcase, :align => :center
 				output.text "\n"
 
-				output.font_size(22) do
-					output.text Report.title, :align => :center
-				end
-
-				output.font_size(18) do
-				    output.text "Executive Summary", :align => :center
-				    output.text "\n"
-				    output.text "This report was prepared by\n#{Report.author}", :align => :center
-				end
+				report_title Report.title
+				report_subtitle "Executive Summary"
+				report_author "This report was prepared by\n#{Report.author}"
 
 				output.text "\n\n\n"
 
@@ -97,20 +92,16 @@ module Risu
 				output.image Item.risks_by_severity_graph, :width => 250, :at => [output.bounds.left, cury]
 				output.image Host.top_vuln_graph(10), :width => 250, :at => [output.bounds.right - 250, cury]
 				output.move_down 50
-				if (output.y <= 300)
-				    output.start_new_page
-						output.move_down 75
-				end
+
+				output.start_new_page
+				
 				cury = output.y
 				output.image Item.risks_by_service_graph(10), :width => 250, :at => [output.bounds.left, cury]
 				output.image Host.other_os_graph, :width => 250, :at => [output.bounds.right - 250, cury]
 				output.move_down 250
-				#if (y <= 300)
-				#    output.start_new_page
-				#		cury = y
-				#end
+
 				cury = output.y
-				#move_down 550
+
 				output.image Host.windows_os_graph, :width => 250, :at => [output.bounds.left, cury]
 				output.image Item.stigs_severity_graph, :width => 250, :at => [output.bounds.right - 250, cury]
 			end

data/lib/risu/templates/{executive_summary.rb → executive_summary_detailed.rb}

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 Arxopia LLC.
+# Copyright (c) 2010-2013 Arxopia LLC.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -220,22 +220,13 @@ module Risu
 				output.image Item.risks_by_severity_graph, :width => 250, :at => [output.bounds.left, cury]
 				output.image Host.top_vuln_graph(10), :width => 250, :at => [output.bounds.right - 250, cury]
 
-				output.move_down 225
-				if (output.y <= 300)
-						output.start_new_page
-						output.move_down 50
-				end
 				cury = output.y
 				output.image Item.risks_by_service_graph(10), :width => 250, :at => [output.bounds.left, cury]
 				output.image Host.other_os_graph, :width => 250, :at => [output.bounds.right - 250, cury]
 				output.move_down 225
-				if (output.y <= 300)
-						output.start_new_page
-						output.move_down 50
-				end
+
 				cury = output.y
 				output.image Host.windows_os_graph, :width => 250, :at => [output.bounds.left, cury]
-
 				output.number_pages "<page> of <total>", :at => [output.bounds.right - 50, 0], :width => 150, :page_filter => :all
 			end
 		end

data/lib/risu/templates/finding_statistics.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 Arxopia LLC.
+# Copyright (c) 2010-2013 Arxopia LLC.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

data/lib/risu/templates/findings_host.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 Arxopia LLC.
+# Copyright (c) 2010-2013 Arxopia LLC.
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without

data/lib/risu/templates/findings_summary.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 Arxopia LLC.
+# Copyright (c) 2010-2013 Arxopia LLC.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -27,107 +27,46 @@
 module Risu
 	module Templates
 		class FindingsSummary < Risu::Base::TemplateBase
+			include TemplateHelper
 
-			#
-			#
 			def initialize ()
 				@template_info =
 				{
 					:name => "findings_summary",
 					:author => "hammackj",
-					:version => "0.0.1",
+					:version => "0.0.2",
 					:description => "Generates a findings summary report"
 				}
 			end
 
-			#
-			#
-			def render(output)
-				output.text Report.classification.upcase, :align => :center
-				output.text "\n"
-
-				output.font_size(22) do
-					output.text Report.title, :align => :center
-				end
-
-				output.font_size(18) do
-					output.text "Findings Summary Report", :align => :center
-					output.text "\n"
-					output.text "This report was prepared by\n#{Report.author}", :align => :center
-				end
-
-				output.text "\n\n\n"
-
-				output.font_size(20) do
-					output.fill_color "551A8B"
-					output.text "Critical Findings", :style => :bold
-					output.fill_color "000000"
-				end
-
-				Item.critical_risks_unique_sorted.each do |item|
-					name = Plugin.find_by_id(item.plugin_id).plugin_name
-					count = Item.where(:plugin_id => item.plugin_id).count
-
-					output.text "#{count} - #{name}"
-				end
-
-				output.font_size(20) do
-					output.fill_color "FF0000"
-					output.text "High Findings", :style => :bold
-					output.fill_color "000000"
-				end
-
-				Item.high_risks_unique_sorted.each do |item|
-					name = Plugin.find_by_id(item.plugin_id).plugin_name
-					count = Item.where(:plugin_id => item.plugin_id).count
-
-					output.text "#{count} - #{name}"
-				end
-
-				output.start_new_page
-
-				output.font_size(20) do
-					output.fill_color "FF8040"
-					output.text "Medium Findings", :style => :bold
-					output.fill_color "000000"
+			def print_risk_summary(risks, text, color)
+				@output.font_size(20) do
+					@output.fill_color color
+					@output.text text, :style => :bold
+					@output.fill_color "000000"
 				end
 
-				Item.medium_risks_unique_sorted.each do |item|
+				risks.each do |item|
 					name = Plugin.find_by_id(item.plugin_id).plugin_name
 					count = Item.where(:plugin_id => item.plugin_id).count
 
-					output.text "#{count} - #{name}"
-				end
-
-				output.start_new_page
-
-				output.font_size(20) {
-					output.fill_color "0000FF"
-					output.text "Low Findings", :style => :bold
-					output.fill_color "000000"
-				}
-
-				Item.low_risks_unique_sorted.each do |item|
-					name = Plugin.find_by_id(item.plugin_id).plugin_name
-					count = Item.where(:plugin_id => item.plugin_id).count
-
-					output.text "#{count} - #{name}"
-				end
-
-				#Provides nothing
-				#output.font_size(20) {
-				#	output.fill_color "008000"
-				#	output.text "Low Findings", :style => :bold
-				#	output.fill_color "000000"
-				#}
-				#
-				#Item.low_risks_unique_sorted.each do |item|
-				#	name = Plugin.find_by_id(item.plugin_id).plugin_name
-				#	count = Item.where(:plugin_id => item.plugin_id).count
-				#
-				#	output.text "#{count} - #{name}"
-				#end
+					text "#{count} - #{name}"
+				end				
+			end
 
+			def render(output)
+				text Report.classification.upcase, :align => :center
+				text "\n"
+
+				report_title Report.title
+				report_subtitle "Findings Summary Report"
+				report_author "This report was prepared by\n#{Report.author}"
+				text "\n\n\n"
+
+				print_risk_summary(Item.critical_risks_unique_sorted, "Critical Findings", "551A8B")
+				print_risk_summary(Item.high_risks_unique_sorted, "High Findings", "FF0000")
+				print_risk_summary(Item.medium_risks_unique_sorted, "Medium Findings", "FF8040")
+				print_risk_summary(Item.low_risks_unique_sorted, "Low Findings", "0000FF")
 			end
 		end
 	end

data/lib/risu/templates/findings_summary_with_pluginid.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 Arxopia LLC.
+# Copyright (c) 2010-2013 Arxopia LLC.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

data/lib/risu/templates/graphs.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 Arxopia LLC.
+# Copyright (c) 2010-2013 Arxopia LLC.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

data/lib/risu/templates/host_summary.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 Arxopia LLC.
+# Copyright (c) 2010-2013 Arxopia LLC.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -27,15 +27,15 @@
 module Risu
 	module Templates
 		class HostSummary < Risu::Base::TemplateBase
+			include TemplateHelper
 
-			#
 			#
 			def initialize ()
 				@template_info =
 				{
 					:name => "host_summary",
 					:author => "hammackj",
-					:version => "0.0.2",
+					:version => "0.0.3",
 					:description => "Generates a Host Summary Report"
 				}
 			end
@@ -43,22 +43,23 @@ module Risu
 			#
 			#
 			def render(output)
-				output.text Report.classification.upcase, :align => :center
-				output.text "\n"
+				@output.text Report.classification.upcase, :align => :center
+				@output.text "\n"
 
-				output.font_size(22) { output.text Report.title, :align => :center }
-				output.font_size(18) {
-					output.text "Host Summary Report", :align => :center
-					output.text "\n"
-					output.text "This report was prepared by\n#{Report.author}", :align => :center
-				}
+				report_title Report.title
+				report_subtitle "Host Summary Report"
+				report_author "This report was prepared by\n#{Report.author}"
 
-				output.text "\n\n\n"
+				@output.text "\n\n\n"
+
+				@output.text "Scan Date:", :style => :bold
+				@output.text "#{Report.scan_date}"
+				@output.text "\n"
 
 				results = Array.new
 
 				headers = ["Hostname", "Total", "Critical", "High", "Medium", "Low", "Info"]
-				header_widths = {0 => 140, 1 => 62, 2 => 62, 3 => 62, 4 => 62, 5 => 62, 6 => 62}
+				header_widths = {0 => 230, 1 => 46, 2 => 46, 3 => 46, 4 => 47, 5 => 46, 6 => 46}
 
 				Host.sorted.each do |host|
 					row = Array.new
@@ -70,7 +71,10 @@ module Risu
 					low = Item.low_risks.where(:host_id => host.id).count
 					info = Item.info_risks.where(:host_id => host.id).count
 
-					row.push(host.name)
+					host_name = host.name
+					host_name = "#{host.name} (#{host.netbios})" if host.netbios != nil
+
+					row.push(host_name)
 					row.push(total)
 					row.push(crit)
 					row.push(high)

data/lib/risu/templates/ms_patch_summary.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2012 Arxopia LLC.
+# Copyright (c) 2010-2013 Arxopia LLC.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -27,9 +27,8 @@
 module Risu
 	module Templates
 		class MSPatchSummary < Risu::Base::TemplateBase
+			include TemplateHelper
 
-			#
-			#
 			def initialize ()
 				@template_info =
 				{
@@ -40,20 +39,15 @@ module Risu
 				}
 			end
 
-			#
-			#
 			def render(output)
-				output.text Report.classification.upcase, :align => :center
-				output.text "\n"
+				text Report.classification.upcase, :align => :center
+				text "\n"
 
-				output.font_size(22) { output.text Report.title, :align => :center }
-				output.font_size(18) {
-					output.text "Missing Microsoft Patch Summary", :align => :center
-					output.text "\n"
-					output.text "This report was prepared by\n#{Report.author}", :align => :center
-				}
+				report_title Report.title
+				report_subtitle "Missing Microsoft Patch Summary"
+				report_author "This report was prepared by\n#{Report.author}"
 
-				output.text "\n\n\n"
+				text "\n\n\n"
 
 				Item.ms_patches.each do |item|
 					host = Host.find_by_id(item.host_id)
@@ -61,24 +55,23 @@ module Risu
 					next if host == nil
 
 					if host.name != nil
-						output.text "Host:", :style => :bold
-						output.text host.name
+						text "Host:", :style => :bold
+						text host.name
 					end
 
 					if host.os != nil
-						output.text "OS:", :style => :bold
-						output.text host.os
+						text "OS:", :style => :bold
+						text host.os
 					end
 
 					if host.mac != nil
-						output.text "Mac:", :style => :bold
-						output.text host.mac
+						text "Mac:", :style => :bold
+						text host.mac
 					end
-					output.text "\n"
-					output.text item.plugin_output
-					output.text "\n"
+					text "\n"
+					text item.plugin_output
+					text "\n"
 				end
-
 			end
 		end
 	end