prenus 0.0.10 → 0.0.11

data/README.rdoc

@@ -96,6 +96,8 @@ This will only work if you're in the Circos Tools tableviewer folder (in my inst
 This will dump the png into the img/ folder.
 
 == Changes
+* Version 0.0.11 - A bunch of cosmetic changes. PLUS, a new optional command line flag to add HTML content to the top of the index.html file.
+* Version 0.0.10 - Added new pie graph to HTML output, and updated pie graph generater to allow for setting of colours
 * Version 0.0.9 - Added Nokogiri gem dep
 * Version 0.0.8 - Default HTML output directory - plus - can filter out severity issues for HTML. Updated gemspec, removed internal gem
 * Version 0.0.7 - Included push update for XLS output - and updated version statements

data/bin/prenus

@@ -19,7 +19,7 @@ require 'lib/input'
 require 'lib/gemcache/ruby-nessus/ruby-nessus'
 
 #Versioning and .. those things
-$verstring = "Version 0.0.10 - 1st of October, 2013 - Created by Christian \"xntrik\" Frichot.\n\n"
+$verstring = "Version 0.0.11 - 7th of October, 2013 - Created by Christian \"xntrik\" Frichot.\n\n"
 $verstring += "Copyright 2013 Christian Frichot\n\n"
 $verstring += "See LICENSE.txt for more details\n"
 
@@ -71,6 +71,11 @@ class OptsConsole
 				end
 			end
 
+			# optional HTML content in a file to be inserted into the header
+			opts.on('--header-file FILE',"Optional HTML FILE to be inserted into the top of the index.html file when using HTML output") do |indexfile|
+				options[:indexfile] = indexfile
+			end
+
 			# level - how deep to go on some of the inputs
 			opts.on('-s', '--severity LEVEL', "Defaults to 3 for High -> Critical. For large datasets 4 is saner") do |sev|
 				case sev.to_i

data/lib/css/table.css

@@ -574,3 +574,14 @@ div.box {
 	border: 1px solid #8080FF;
 	background-color: #E5E5FF;
 }
+
+a:link,
+a:visited {
+	color: black;
+	text-decoration: underline;
+}
+a:hover,
+a:active {
+	color: red;
+	text-decoration: none;
+}

data/lib/output/htmlout.rb

@@ -88,10 +88,10 @@ class Htmlout < Baseout
 			end
 
 			pie_data = []
-			pie_data << ['Low',low_total.to_i,'green'] if @options[:severity] <= 1
-			pie_data << ['Medium',med_total.to_i,'orange'] if @options[:severity] <= 2
-			pie_data << ['High',high_total.to_i,'red'] if @options[:severity] <= 3
-			pie_data << ['Critical',crit_total.to_i,'purple'] if @options[:severity] <= 4
+			pie_data << ['Low',low_total.to_i,'green'] if @options[:severity] <= 1 and low_total.to_i > 0
+			pie_data << ['Medium',med_total.to_i,'orange'] if @options[:severity] <= 2 and med_total.to_i > 0
+			pie_data << ['High',high_total.to_i,'red'] if @options[:severity] <= 3 and high_total.to_i > 0
+			pie_data << ['Critical',crit_total.to_i,'purple'] if @options[:severity] <= 4 and crit_total.to_i > 0
 
 			pie_js(f,"pie_graph","Unique Vulnerability Breakdown","Unique Vuln Breakdown",pie_data,"document.location.href = 'vuln_overview.html';")
 
@@ -108,10 +108,10 @@ class Htmlout < Baseout
 			end
 
 			pie_data = []
-			pie_data << ['Low',low_total.to_i,'green'] if @options[:severity] <= 1
-			pie_data << ['Medium',med_total.to_i,'orange'] if @options[:severity] <= 2
-			pie_data << ['High',high_total.to_i,'red'] if @options[:severity] <= 3
-			pie_data << ['Critical',crit_total.to_i,'purple'] if @options[:severity] <= 4
+			pie_data << ['Low',low_total.to_i,'green'] if @options[:severity] <= 1 and low_total.to_i > 0
+			pie_data << ['Medium',med_total.to_i,'orange'] if @options[:severity] <= 2 and med_total.to_i > 0
+			pie_data << ['High',high_total.to_i,'red'] if @options[:severity] <= 3 and high_total.to_i > 0
+			pie_data << ['Critical',crit_total.to_i,'purple'] if @options[:severity] <= 4 and crit_total.to_i > 0
 
 			pie_js(f,"pie_graph2","Total Vunerability Breakdown","Total Vuln Breakdown",pie_data,"document.location = href= 'vuln_overview.html';")
 
@@ -131,9 +131,13 @@ class Htmlout < Baseout
 
 			close_html_header(f)
 
+			unless @options[:indexfile].nil?
+				IO.copy_stream(File.open(@options[:indexfile]),f)
+			end
+
 			body = '<div style="width: 800px; margin-left: auto; margin-right: auto; padding-top: 30px;">'
-			body += '<div id="pie_graph" style="min-width: 300px; height: 300px; margin: 0 auto; float: left"></div>'
-			body += '<div id="pie_graph2" style="min-width: 300px; height: 300px; margin: 0 auto; float: left"></div>'
+			body += '<div id="pie_graph" style="min-width: 375px; height: 375px; margin: 0 auto; float: left"></div>'
+			body += '<div id="pie_graph2" style="min-width: 375px; height: 375px; margin: 0 auto; float: left"></div>'
 			body += '</div>'
 			body += '<div style="clear: both;"></div>'
 			body += '<div id="bar_graph" style="min-width: 400px; height: 900px; margin: 0 auto"></div>'
@@ -145,10 +149,21 @@ class Htmlout < Baseout
 				ips << host[1][:ip]
 			end
 
-			body += '<table id="hosts_table" class="display"><thead><tr><th>IP</th><th>Hostname</th><th>OS</th><th>Number of vulns (Low to Critical)</th></tr></thead><tbody>'
+			body += '<table id="hosts_table" class="display"><thead><tr><th>IP</th><th>Hostname</th><th>OS</th><th>Vulnerability Count (Low to Critical)</th></tr></thead><tbody>'
 			ips.sort_by{|ip| ip.split('.').map{|octet| octet.to_i}}.each do |ip|
 				@hosts.select{|k,v| v[:ip] == ip}.each do |k,v|
-					body += '<tr><td><a href="host_' + k.to_s + '.html">' + ip + '</a></td><td>' + v[:hostname] + '</td><td>' + v[:os] + '</td><td>' + v[:total_excl_info].to_s + '</td></tr>'
+					tmp_actual_v_count = 0
+					tmp_actual_v_count += v[:low].to_i if @options[:severity] <= 1 and v[:low].to_i > 0
+					tmp_actual_v_count += v[:med].to_i if @options[:severity] <= 2 and v[:med].to_i > 0
+					tmp_actual_v_count += v[:high].to_i if @options[:severity] <= 3 and v[:high].to_i > 0
+					tmp_actual_v_count += v[:crit].to_i if @options[:severity] <= 4 and v[:crit].to_i > 0
+					body += '<tr><td>'
+					if tmp_actual_v_count > 0
+						body += '<a href="host_' + k.to_s + '.html">' + ip + '</a>'
+					else
+						body += ip
+					end
+					body += '</td><td>' + v[:hostname] + '</td><td>' + v[:os] + '</td><td>' + v[:total_excl_info].to_s + '</td></tr>'
 				end
 			end
 			body += '</tbody></table>'
@@ -179,7 +194,7 @@ class Htmlout < Baseout
 
 			close_html_header(f)
 
-			body = '<a href="index.html">Home</a><br /><div id="vulns"><h2>Vulns</h2>'
+			body = '<a href="index.html">Home</a><br /><div id="vulns"><h2>Vulnerabilities</h2>'
 
 			body += '<table id="vulns_table" class="display"><thead><tr><th>Nessus ID</th><th>Severity</th><th>Name</th><th>Family</th><th>Ports</th><th>Number of impacted hosts</th></tr></thead><tbody>'
 			@events.each do |k,v| 
@@ -291,10 +306,10 @@ class Htmlout < Baseout
 					pie_js(f,"pie_graph","Criticality Breakdown","Criticality Breakdown",[['Informational ONLY',values[:info].to_i,'blue']])					
 				else
 					pie_data = []
-					pie_data << ['Low',values[:low].to_i,'green'] if @options[:severity] <= 1
-					pie_data << ['Medium',values[:med].to_i,'orange'] if @options[:severity] <= 2
-					pie_data << ['High',values[:high].to_i,'red'] if @options[:severity] <= 3
-					pie_data << ['Critical',values[:crit].to_i,'purple'] if @options[:severity] <= 4
+					pie_data << ['Low',values[:low].to_i,'green'] if @options[:severity] <= 1 and values[:low].to_i > 0
+					pie_data << ['Medium',values[:med].to_i,'orange'] if @options[:severity] <= 2 and values[:med].to_i > 0
+					pie_data << ['High',values[:high].to_i,'red'] if @options[:severity] <= 3 and values[:high].to_i > 0
+					pie_data << ['Critical',values[:crit].to_i,'purple'] if @options[:severity] <= 4 and values[:crit].to_i > 0
 					pie_js(f,"pie_graph","Criticality Breakdown","Criticality Breakdown",pie_data,"document.location.href = '#' + event.point.name;")
 				end
 
@@ -305,10 +320,10 @@ class Htmlout < Baseout
 				body += '<div id="pie_graph" style="min-width: 400px; height: 400px; margin: 0 auto"></div>'
 				body += '</div>'
 
-				body += '<div id="vulns"><h2>Vulns</h2>'
+				body += '<div id="vulns"><h2>Vulnerabilities</h2>'
 
 
-				if @options[:severity] <= 4
+				if @options[:severity] <= 4 and values[:crit].to_i > 0
 					body += '<div id="critical"><a name="Critical"></a><h3>Critical</h3>'
 
 					body += '<table id="critical_table" class="display"><thead><tr><th>Nessus ID</th><th>Name</th><th>Synopsis</th><th>Result</th><th>Family</th><th>Port</th></tr></thead><tbody>'
@@ -325,7 +340,7 @@ class Htmlout < Baseout
 					body += '</tbody></table></div>'
 				end
 
-				if @options[:severity] <= 3
+				if @options[:severity] <= 3 and values[:high].to_i > 0
 
 					body += '<div id="high"><a name="High"></a><h3>High</h3>'
 
@@ -342,7 +357,7 @@ class Htmlout < Baseout
 					body += '</tbody></table></div>'
 				end
 
-				if @options[:severity] <= 2
+				if @options[:severity] <= 2 and values[:med].to_i > 0
 
 					body += '<div id="medium"><a name="Medium"></a><h3>Medium</h3>'
 
@@ -360,7 +375,7 @@ class Htmlout < Baseout
 
 				end
 
-				if @options[:severity] <= 1
+				if @options[:severity] <= 1 and values[:low].to_i > 0
 
 					body += '<div id="low"><a name="Low"></a><h3>Low</h3>'
 
@@ -377,7 +392,7 @@ class Htmlout < Baseout
 					body += '</tbody></table></div>'
 				end
 
-				if @options[:severity] <= 0
+				if @options[:severity] <= 0 and values[:info].to_i > 0
 
 					body += '<div id="informational"><a name="Informational"></a><h3>Informational</h3>'
 
@@ -396,11 +411,11 @@ class Htmlout < Baseout
 
 
 				body += "<script>$(document).ready(function() {\n ";
-				body += "$('#critical_table').dataTable({\"bPaginate\": false});\n" if @options[:severity] > 4
-				body += "$('#high_table').dataTable({\"bPaginate\": false});\n" if @options[:severity] > 3
-				body += "$('#medium_table').dataTable({\"bPaginate\": false});\n" if @options[:severity] > 2
-				body += "$('#low_table').dataTable({\"bPaginate\": false});\n" if @options[:severity] > 1
-				body += "$('#informational_table').dataTable({\"bPaginate\": false});\n" if @options[:severity] > 0
+				body += "$('#critical_table').dataTable({\"bPaginate\": false});\n" if @options[:severity] <= 4
+				body += "$('#high_table').dataTable({\"bPaginate\": false});\n" if @options[:severity] <= 3
+				body += "$('#medium_table').dataTable({\"bPaginate\": false});\n" if @options[:severity] <= 2
+				body += "$('#low_table').dataTable({\"bPaginate\": false});\n" if @options[:severity] <= 1
+				body += "$('#informational_table').dataTable({\"bPaginate\": false});\n" if @options[:severity] <= 0
 				body += "});</script>"
 
 				body += '</div></div>'
@@ -571,6 +586,9 @@ class Htmlout < Baseout
 		    var chart;
 		    $(document).ready(function() {
 		        chart = new Highcharts.Chart({
+		        	credits: {
+		        		enabled: false
+		        	},
 		            chart: {
 		                renderTo: '#{renderto}',
 		                type: 'bar'
@@ -598,6 +616,7 @@ class Htmlout < Baseout
             },
             yAxis: {
                 min: 0,
+                allowDecimals: false,
                 title: {
                     text: 'Findings'
                 }
@@ -615,11 +634,17 @@ class Htmlout < Baseout
             plotOptions: {
                 series: {
                     stacking: 'normal',
+                    //threshold: 1,
                     dataLabels: {
                     	enabled: true,
                     	color: '#000000',
                     	x: 0,
-                    	align: 'center'
+                    	align: 'center',
+                    	formatter: function() {
+                    		if (this.y !=0) {
+                    			return this.y;
+                    		}
+                    	}
                     },
                     events: {
                     	click: function(event) {
@@ -727,6 +752,9 @@ class Htmlout < Baseout
 		    var chart;
 		    $(document).ready(function() {
 		        chart = new Highcharts.Chart({
+		        	credits: {
+		        		enabled: false
+		        	},
 		            chart: {
 		                renderTo: '#{renderto}',
 		                plotBackgroundColor: null,
@@ -738,11 +766,12 @@ class Htmlout < Baseout
 		            },
 		            tooltip: {
 		                formatter: function() {
-		                    return '<b>'+ this.point.name +'</b>: '+ this.percentage +' %';
+		                    return '<b>'+ this.point.name +'</b>: '+ Math.round(this.percentage) +' %';
 		                }
 		            },
 		            plotOptions: {
 		                pie: {
+		                	size: '60%',
 		                    allowPointSelect: true,
 		                    cursor: 'pointer',
 		                    dataLabels: {
@@ -751,11 +780,12 @@ class Htmlout < Baseout
 		                        connectorColor: '#000000',
 		                        formatter: function() {
 		                            return '<b>'+ this.point.name +'</b>: '+ this.y;
-		                        }
+		                        },
+		                        distance: 20
 		                    }
 		eos
 
-		if not clickfunction.nil?
+		unless clickfunction.nil?
 			fp.puts ',events: { click: function(event) { ' + clickfunction + '} }'
 		end 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prenus
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow