risu 1.5.3 → 1.6.0

data/lib/risu/models/patch.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/models/plugin.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
@@ -35,6 +35,14 @@ module Risu
 			has_many :references
 			has_many :individual_plugin_selections
 
+			def cvss_base_score=(cvss_base_score)
+				write_attribute(:cvss_base_score, cvss_base_score.to_f)
+			end
+
+			def cvss_base_score
+				read_attribute(:cvss_base_score).to_s
+			end
+
 			class << self
 
 				# Queries for all risks based on Plugin.risk_factor

data/lib/risu/models/pluginspreference.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/models/policy.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/models/reference.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
@@ -28,12 +28,48 @@ module Risu
 	module Models
 
 		# Reference Model
-		#
 		class Reference < ActiveRecord::Base
 		  has_many :plugins
 
 			class << self
 
+				#Generates a full string of all the references
+				#
+				# @returns [String] of all the references with in-line formatting for
+				# direct output to the report
+				def reference_string
+					reference_names = ["cve", "cpe", "bid", "see_also", "iava", "msft",
+						"osvdb", "cert", "edbid", "rhsa", "secunia", "suse", "dsa",
+						"owasp", "cwe", "iavb", "iavt", "cisco_sa", "ics_alert",
+						"cisco_bug_id", "cisco_sr", "cert_vu", "vmsa", "cert_cc",
+						"msvr", "apple_sa", "icsa"
+					]
+
+					ref_string = ""
+
+					reference_names.each do |type|
+						ref = reference_string_by self.send(type)
+
+						ref_string << "<b>#{type}</b>: #{ref}\n" if ref.length != 0
+					end
+
+					ref_string
+				end
+
+				# Generates a string of all the references of the specified type
+				#
+				# @param type Result of a [Reference] model reference accessors
+				#
+				# @return [String] containing all references of type comma separated
+				def reference_string_by type
+					rstring = []
+					type.each do |ref|
+						rstring << ref.value
+					end
+
+					rstring.join(", ")
+				end
+
 				# Queries all unique CVEs
 				#
 				def cve
@@ -82,43 +118,43 @@ module Risu
 					where(:reference_name => "cert").select('DISTINCT value')
 				end
 
-				#
+				# Queries all unique edbid refs
 				#
 				def edbid
 					where(:reference_name => "edb-id").select('DISTINCT value')
 				end
 
-				#
+				# Queries all unique rhsa refs
 				#
 				def rhsa
 					where(:reference_name => "rhsa").select('DISTINCT value')
 				end
 
-				#
+				# Queries all unique secunia refs
 				#
 				def secunia
 					where(:reference_name => "secunia").select('DISTINCT value')
 				end
 
-				#
+				# Queries all unique suse refs
 				#
 				def suse
 					where(:reference_name => "suse").select('DISTINCT value')
 				end
 
-				#
+				# Queries all unique dsa refs
 				#
 				def dsa
 					where(:reference_name => "dsa").select('DISTINCT value')
 				end
 
-				#
+				# Queries all unique owasp refs
 				#
 				def owasp
 					where(:reference_name => "owasp").select('DISTINCT value')
 				end
 
-				#
+				# Queries all unique cwe refs
 				#
 				def cwe
 					where(:reference_name => "cwe").select('DISTINCT value')
@@ -171,6 +207,30 @@ module Risu
 				def vmsa
 					where(:reference_name => "vmsa").select('DISTINCT value')
 				end
+
+				#
+				#
+				def cert_cc
+					where(:reference_name => "cert-cc").select('DISTINCT value')
+				end
+
+				#
+				#
+				def apple_sa
+					where(:reference_name => "apple-sa").select('DISTINCT value')
+				end
+				
+				#
+				#
+				def icsa
+					where(:reference_name => "icsa").select('DISTINCT value')
+				end
+
+				#
+				#
+				def msvr
+					where(:reference_name => "msvr").select('DISTINCT value')
+				end				
 			end
 		end
 	end

data/lib/risu/models/report.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/models/serverpreference.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/models/servicedescription.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/models/version.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/parsers.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/parsers/nessus/nessus_document.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/parsers/nessus/nessus_sax_listener.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
@@ -42,7 +42,8 @@ module Risu
 						"cpe", "bid", "see_also", "xref", "cve", "iava", "msft",
 						"osvdb", "cert", "edb-id", "rhsa", "secunia", "suse", "dsa",
 						"owasp", "cwe", "iavb", "iavt", "cisco-sa", "ics-alert",
-						"cisco-bug-id", "cisco-sr", "cert-vu", "vmsa"
+						"cisco-bug-id", "cisco-sr", "cert-vu", "vmsa", "apple-sa", 
+						"icsa", "cert-cc", "msvr"
 					]
 
 					@valid_elements = Array["ReportItem", "plugin_version", "risk_factor",
@@ -56,46 +57,52 @@ module Risu
 						"exploit_available", "metasploit_name", "exploit_framework_canvas", "canvas_package", "exploit_framework_metasploit",
 						"plugin_type", "exploithub_sku", "exploit_framework_exploithub", "stig_severity", "plugin_name", "fname", "always_run",
 						"cm:compliance-info", "cm:compliance-actual-value", "cm:compliance-check-id", "cm:compliance-policy-value",
-						"cm:compliance-audit-file", "cm:compliance-check-name", "cm:compliance-result", "cm:compliance-output"
+						"cm:compliance-audit-file", "cm:compliance-check-name", "cm:compliance-result", "cm:compliance-output", "policyOwner",
+						"visibility"
 					]
 
-						@valid_elements = @valid_elements + @valid_references
+					@valid_elements = @valid_elements + @valid_references
 
-						# This makes adding new host properties really easy, except for the
-						#MS patch numbers, this are handled differently.
-						@valid_host_properties = {
-							"HOST_END" => :end,
-							"mac-address" => :mac,
-							"HOST_START" => :start,
-							"operating-system" => :os,
-							"host-ip" => :ip,
-							"host-fqdn" => :fqdn,
-							"netbios-name" => :netbios,
-							"local-checks-proto" => :local_checks_proto,
-							"smb-login-used" => :smb_login_used,
-							"ssh-auth-meth" => :ssh_auth_meth,
-							"ssh-login-used" => :ssh_login_used,
-							"pci-dss-compliance" => :pci_dss_compliance,
-							"pci-dss-compliance:" => :pci_dss_compliance_ , #I think this is a Tenable bug~
-							"system-type" => :system_type,
-							"pcidss:compliance:failed" => :pcidss_compliance_failed,
-							"pcidss:compliance:passed" => :pcidss_compliance_passed,
-							"pcidss:deprecated_ssl" => :pcidss_deprecated_ssl,
-							"pcidss:expired_ssl_certificate" => :pcidss_expired_ssl_certificate,
-							"pcidss:high_risk_flaw" => :pcidss_high_risk_flaw,
-							"pcidss:medium_risk_flaw" => :pcidss_medium_risk_flaw,
-							"pcidss:reachable_db" => :pcidss_reachable_db,
-							"pcidss:www:xss" => :pcidss_www_xss,
-							"pcidss:directory_browsing" => :pcidss_directory_browsing,
-							"pcidss:known_credentials" => :pcidss_known_credentials,
-							"pcidss:compromised_host:worm" => :pcidss_compromised_host_worm,
-							"pcidss:obsolete_operating_system" => :pcidss_obsolete_operating_system,
-							"pcidss:dns_zone_transfer" => :pcidss_dns_zone_transfer,
-							"pcidss:unprotected_mssql_db" => :pcidss_unprotected_mssql_db,
-							"pcidss:obsolete_software" => :pcidss_obsolete_software,
-							"pcidss:www:sql_injection" => :pcidss_www_sql_injection,
-							"pcidss:backup_files" => :pcidss_backup_files
-						}
+					# This makes adding new host properties really easy, except for the
+					#MS patch numbers, this are handled differently.
+					# @todo this needs to become a sql hash table with accessors for the common ones
+					@valid_host_properties = {
+						"HOST_END" => :end,
+						"mac-address" => :mac,
+						"HOST_START" => :start,
+						"operating-system" => :os,
+						"host-ip" => :ip,
+						"host-fqdn" => :fqdn,
+						"netbios-name" => :netbios,
+						"local-checks-proto" => :local_checks_proto,
+						"smb-login-used" => :smb_login_used,
+						"ssh-auth-meth" => :ssh_auth_meth,
+						"ssh-login-used" => :ssh_login_used,
+						"pci-dss-compliance" => :pci_dss_compliance,
+						"pci-dss-compliance:" => :pci_dss_compliance_ , #I think this is a Tenable bug~
+						"system-type" => :system_type,
+						"bios-uuid" => :bios_uuid,
+						"pcidss:compliance:failed" => :pcidss_compliance_failed,
+						"pcidss:compliance:passed" => :pcidss_compliance_passed,
+						"pcidss:deprecated_ssl" => :pcidss_deprecated_ssl,
+						"pcidss:expired_ssl_certificate" => :pcidss_expired_ssl_certificate,
+						"pcidss:high_risk_flaw" => :pcidss_high_risk_flaw,
+						"pcidss:medium_risk_flaw" => :pcidss_medium_risk_flaw,
+						"pcidss:reachable_db" => :pcidss_reachable_db,
+						"pcidss:www:xss" => :pcidss_www_xss,
+						"pcidss:directory_browsing" => :pcidss_directory_browsing,
+						"pcidss:known_credentials" => :pcidss_known_credentials,
+						"pcidss:compromised_host:worm" => :pcidss_compromised_host_worm,
+						"pcidss:obsolete_operating_system" => :pcidss_obsolete_operating_system,
+						"pcidss:dns_zone_transfer" => :pcidss_dns_zone_transfer,
+						"pcidss:unprotected_mssql_db" => :pcidss_unprotected_mssql_db,
+						"pcidss:obsolete_software" => :pcidss_obsolete_software,
+						"pcidss:www:sql_injection" => :pcidss_www_sql_injection,
+						"pcidss:backup_files" => :pcidss_backup_files,
+						"traceroute-hop-0" => :traceroute_hop_0,
+						"traceroute-hop-1" => :traceroute_hop_1,
+						"traceroute-hop-2" => :traceroute_hop_2
+					}
 				end
 
 				# Callback for when the start of a XML element is reached
@@ -139,19 +146,19 @@ module Risu
 
 							if attributes["name"] =~ /[M|m][S|s]\d{2,}-\d{2,}/
 								@attr = if attributes["name"] =~ /[M|m][S|s]\d{2,}-\d{2,}/
-										attributes["name"]
-									else
-										nil
-									end
+									attributes["name"]
+								else
+									nil
+								end
 							else
 								@attr = if @valid_host_properties.keys.include?(attributes["name"])
-										attributes["name"]
-									else
-										nil
-									end
+									attributes["name"]
+								else
+									nil
+								end
 							end
 
-							puts "New HostProperties attribute: #{attributes["name"]}. Please report this to jacob.hammack@hammackj.com\n" if @attr.nil?
+							puts "New HostProperties attribute: #{attributes["name"]}. Please report this to #{Risu::EMAIL}\n" if @attr.nil?
 						when "ReportItem"
 							@vals = Hash.new # have to clear this out or everything has the same references
 							@ri = @rh.items.create
@@ -195,14 +202,26 @@ module Risu
 							@policy.attributes = {
 								:name => @vals["policyName"]
 							}
-
 							@policy.save
+
 						when "policyComments"
 							@policy.attributes = {
 								:comments => @vals["policyComments"]
 							}
+							@policy.save
+
+						when "policyOwner"
+							@policy.attributes = {
+								:owner => @vals["policyOwner"]
+							}
+							@policy.save
 
+						when "visibility"
+							@policy.attributes = {
+								:visibility => @vals["visibility"]
+							}
 							@policy.save
+
 						when "preference"
 							@sp.attributes = {
 								:name => @vals["name"],
@@ -292,7 +311,7 @@ module Risu
 								:synopsis => @vals["synopsis"],
 								:plugin_type => @vals["plugin_type"],
 								:cvss_vector => @vals["cvss_vector"],
-								:cvss_base_score => @vals["cvss_base_score"],
+								:cvss_base_score => @vals["cvss_base_score"].to_f,
 								:vuln_publication_date => @vals["vuln_publication_date"],
 								:plugin_version => @vals["plugin_version"],
 								:cvss_temporal_score => @vals["cvss_temporal_score"],

data/lib/risu/parsers/nexpose/nexpose_document.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 Parsers
 		module Nexpose
+
 			# A Object to represent the Nexpose xml file in memory
-			#
-			# @author Jacob Hammack <jacob.hammack@hammackj.com>
 			class NexposeDocument
 
 				# Creates a instance of the NexposeDocument class
@@ -61,7 +60,6 @@ module Risu
 				end
 
 				# Invokes the SAX parser on the XML document
-				#
 				def parse
 					@parser = LibXML::XML::SaxParser.file @document
 					@parser.callbacks = SimpleNexpose.new
@@ -69,7 +67,6 @@ module Risu
 				end
 
 				# Fixes the ip field if nil and replaces it with the name if its an ip
-				#
 				def fix_ips
 					@hosts = Host.all
 

data/lib/risu/parsers/nexpose/simple_nexpose.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/renderers.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/renderers/nilrenderer.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/assets.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
@@ -26,51 +26,39 @@
 
 module Risu
 	module Templates
-		class Assets < Risu::Base::TemplateBase
+		class AssetsTemplate < Risu::Base::TemplateBase
+			include TemplateHelper
 
-			#
-			#
 			def initialize ()
 				@template_info =
 				{
 					:name => "assets",
 					:author => "hammackj",
-					:version => "0.0.1",
+					:version => "0.0.2",
 					:description => "Generates a Assets Summary Report"
 				}
 			end
 
-			# @todo comment
-			#
 			def render(output)
-				output.font_size 10
+				text Report.classification.upcase, :align => :center
+				text "\n"
 
-				output.text Report.classification.upcase, :align => :center
-				output.text "\n"
+				report_title Report.title
+				report_subtitle "Networked Assets"
+				report_author "This report was prepared by\n#{Report.author}"
 
-				output.font_size(22) do
-					output.text Report.title, :align => :center
-				end
-
-				output.font_size(18) do
-					output.text "Networked Assets", :align => :center
-					output.text "\n"
-					output.text "This report was prepared by\n#{Report.author}", :align => :center
-				end
-
-				output.text "\n\n"
+				text "\n\n\n"
 
 				Host.sorted.each do |host|
-					output.text "Name: #{host.name}\n"
-					output.text "FQDN: #{host.fqdn}\n" unless host.fqdn == nil
-					output.text "IP Address: #{host.ip}\n" unless host.ip == nil
-					output.text "NetBios: #{host.netbios}\n" unless host.netbios == nil
-					output.text sprintf "Mac Address: %s\n", host.mac.chomp.gsub("\n", ", ") unless host.mac == nil
-					output.text sprintf "Operation System: %s\n", host.os.chomp.gsub("\n", "/") unless host.os == nil
-					output.text "\n"
+					text "Name: #{host.name}\n"
+					text "FQDN: #{host.fqdn}\n" unless host.fqdn == nil
+					text "IP Address: #{host.ip}\n" unless host.ip == nil
+					text "NetBios: #{host.netbios}\n" unless host.netbios == nil
+					text sprintf "Mac Address: %s\n", host.mac.chomp.gsub("\n", ", ") unless host.mac == nil
+					text sprintf "Operation System: %s\n", host.os.chomp.gsub("\n", "/") unless host.os == nil
+					text "\n"
 				end
 			end
 		end
 	end
 end
-