risu 1.6.0 → 1.6.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2ebb8f4ad04b70d5ae2feb0b759f84f2eae2a32e
+  data.tar.gz: fb2c984de176ee7b70a384eda9a2e5dd177a9151
+SHA512:
+  metadata.gz: cffdae23493c7112b0044e8a53f1fc469b1ff347f337cafd99d3498b066fcd43d781aea24c0aeac4b9a5c3967f82f29336b2b058e2dde925b6bcf02a0cb257a5
+  data.tar.gz: 4604b1a85ed9e2a89c06299fe5d1784b7fae0ae6bdec5175b32d73dae55a1314a91411989d221d25ae91925d3d20b1a9473684e9b6caa0ede721946470916b65

data/NEWS.markdown

@@ -1,6 +1,15 @@
 # News
 
-# 1.6 (2013)
+#1.6.1 (March 1, 2013)
+- Models
+	- Reference Model
+		- Added usn
+	- HostProperty Model ***NEW***
+		- New model for each HostProperty off of ReportHost
+		- The table is name / value for each property
+		- All netstat / traceroute tags will be in this new table there can be up to 65k entries for each protocol and 255 traceroute entries per host
+
+# 1.6 (February 27, 2013)
 ***Official support for Ruby versions less than 1.9.3 has been dropped due to Rails 4***
 
 - Changed all copyright to Arxopia LLC. instead of myself for legal protection, **Nothing changes** the project will always be open source and free (as in cost)

data/README.markdown

@@ -2,7 +2,7 @@
 
 Risu is [Nessus](http://www.nessus.org) parser, that converts the generated reports into a [ActiveRecord](http://api.rubyonrails.org/classes/ActiveRecord/Base.html) database, this allows for easy report generation and vulnerability verification.
 
-Version **1.6.0** is the current release.
+Version **1.6.1** is the current release.
 
 ## Requirements
 
@@ -22,6 +22,11 @@ Risu relies heavily on [RubyGems](http://rubygems.org/) to install other depende
 - mysql2
 - nokogiri
 
+## Installation
+Installation is really easy just gem install!
+
+    % gem install risu
+
 ## Developmental Requirements
 
 These are all available through [RubyGems](http://rubygems.org/). The should be installed automatically when you install risu, If not this command will install them all:
@@ -32,11 +37,6 @@ These are all available through [RubyGems](http://rubygems.org/). The should be
 
 Any database that ActiveRecord supports should work. Risu has been tested with [MySQL](http://www.mysql.com/) and [SQLite3](http://sqlite.org/).
 
-## Installation
-Installation is really easy just gem install!
-
-	% gem install risu
-
 ## Database Setup
 
 	% risu --create-config

data/lib/risu.rb

@@ -26,7 +26,7 @@
 
 module Risu
 	APP_NAME = "risu"
-	VERSION = "1.6.0"
+	VERSION = "1.6.1"
 	GRAPH_WIDTH = 750
 	EMAIL = "risu@arxopia.com"
 	CONFIG_FILE = "./risu.cfg"

data/lib/risu/base/schema.rb

@@ -77,37 +77,15 @@ module Risu
 					t.string :ip
 					t.string :fqdn
 					t.string :netbios
-					t.string :local_checks_proto
-					t.string :smb_login_used
-					t.string :ssh_auth_meth
-					t.string :ssh_login_used
-					t.string :pci_dss_compliance
-					t.string :pci_dss_compliance_
-					t.string :pcidss_compliance_failed
-					t.string :pcidss_compliance_passed
-					t.string :pcidss_deprecated_ssl
-					t.string :pcidss_expired_ssl_certificate
-					t.string :pcidss_obsolete_operating_system
-					t.string :pcidss_dns_zone_transfer
-					t.string :pcidss_high_risk_flaw
-					t.string :pcidss_medium_risk_flaw
-					t.string :pcidss_reachable_db
-					t.string :pcidss_www_xss
-					t.string :pcidss_directory_browsing
-					t.string :pcidss_known_credentials
-					t.string :pcidss_compromised_host_worm
-					t.string :pcidss_unprotected_mssql_db
-					t.string :pcidss_obsolete_software
-					t.string :pcidss_www_sql_injection
-					t.string :pcidss_backup_files
-					t.string :system_type
-					t.string :bios_uuid
-					t.string :traceroute_hop_0
-					t.string :traceroute_hop_1
-					t.string :traceroute_hop_2
 					t.text :notes
 				end
 
+				create_table :host_properties do |t|
+					t.integer :host_id
+					t.string :name
+					t.string :value
+				end
+
 				create_table :items do |t|
 					t.integer :host_id
 					t.integer :plugin_id
@@ -223,6 +201,7 @@ module Risu
 				drop_table :versions
 				drop_table :service_descriptions
 				drop_table :patches
+				drop_table :host_properties
 			end
 		end
 	end

data/lib/risu/models.rb

@@ -42,3 +42,4 @@ require 'risu/models/policy'
 require 'risu/models/version'
 require 'risu/models/servicedescription'
 require 'risu/models/patch'
+require 'risu/models/hostproperty'

data/lib/risu/models/host.rb

@@ -32,6 +32,7 @@ module Risu
 			belongs_to :report
 			has_many :items
 			has_many :patches
+			has_many :host_properties
 
 			class << self
 

data/lib/risu/models/hostproperty.rb

@@ -0,0 +1,36 @@
+# Copyright (c) 2010-2013 Arxopia LLC.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the Arxopia LLC nor the names of its contributors
+#     	may be used to endorse or promote products derived from this software
+#     	without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ARXOPIA LLC BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+#OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+#OF THE POSSIBILITY OF SUCH DAMAGE.
+
+module Risu
+	module Models
+
+		# HostProperty Model
+		#
+		class HostProperty < ActiveRecord::Base
+			belongs_to :host
+		end
+	end
+end

data/lib/risu/models/reference.rb

@@ -230,7 +230,13 @@ module Risu
 				#
 				def msvr
 					where(:reference_name => "msvr").select('DISTINCT value')
-				end				
+				end
+
+				#
+				#
+				def usn
+					where(:reference_name => "usn").select('DISTINCT value')
+				end	
 			end
 		end
 	end

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

@@ -43,7 +43,18 @@ module Risu
 						"osvdb", "cert", "edb-id", "rhsa", "secunia", "suse", "dsa",
 						"owasp", "cwe", "iavb", "iavt", "cisco-sa", "ics-alert",
 						"cisco-bug-id", "cisco-sr", "cert-vu", "vmsa", "apple-sa", 
-						"icsa", "cert-cc", "msvr"
+						"icsa", "cert-cc", "msvr", "usn"
+					]
+
+					@valid_host_properties = Array[
+						"HOST_END", "mac-address", "HOST_START", "operating-system", "host-ip", "host-fqdn", "netbios-name", 
+						"local-checks-proto", "smb-login-used", "ssh-auth-meth", "ssh-login-used", "pci-dss-compliance", 
+						"pci-dss-compliance:", "system-type", "bios-uuid", "pcidss:compliance:failed", "pcidss:compliance:passed", 
+						"pcidss:deprecated_ssl", "pcidss:expired_ssl_certificate", "pcidss:high_risk_flaw", "pcidss:medium_risk_flaw", 
+						"pcidss:reachable_db", "pcidss:www:xss", "pcidss:directory_browsing", "pcidss:known_credentials", 
+						"pcidss:compromised_host:worm", "pcidss:obsolete_operating_system", "pcidss:dns_zone_transfer", 
+						"pcidss:unprotected_mssql_db", "pcidss:obsolete_software", "pcidss:www:sql_injection", "pcidss:backup_files", 
+						"traceroute-hop-0", "traceroute-hop-1", "traceroute-hop-2"
 					]
 
 					@valid_elements = Array["ReportItem", "plugin_version", "risk_factor",
@@ -63,45 +74,15 @@ module Risu
 
 					@valid_elements = @valid_elements + @valid_references
 
-					# 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 = {
+					# These are the more commonly used host properties, mapping them here to store in the host table
+					@host_properties_mapping = {
 						"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
+						"netbios-name" => :netbios
 					}
 				end
 
@@ -143,6 +124,7 @@ module Risu
 							@rh.save
 						when "tag"
 							@attr = nil
+							@hp = @rh.host_properties.create
 
 							if attributes["name"] =~ /[M|m][S|s]\d{2,}-\d{2,}/
 								@attr = if attributes["name"] =~ /[M|m][S|s]\d{2,}-\d{2,}/
@@ -151,14 +133,17 @@ module Risu
 									nil
 								end
 							else
-								@attr = if @valid_host_properties.keys.include?(attributes["name"])
+								@attr = if @valid_host_properties.include?(attributes["name"])
 									attributes["name"]
 								else
 									nil
 								end
 							end
 
-							puts "New HostProperties attribute: #{attributes["name"]}. Please report this to #{Risu::EMAIL}\n" if @attr.nil?
+							if attributes["name"] !~ /(netstat-(?:established|listen)-(?:tcp|udp)\d+-\d+)/ && attributes["name"] !~ /traceroute-hop-\d+/
+								#puts attributes["name"]
+								puts "New HostProperties attribute: #{attributes["name"]}. Please report this to #{Risu::EMAIL}\n" if @attr.nil?
+							end
 						when "ReportItem"
 							@vals = Hash.new # have to clear this out or everything has the same references
 							@ri = @rh.items.create
@@ -168,7 +153,7 @@ module Risu
 								@plugin = Risu::Models::Plugin.find_or_create_by_id(attributes["pluginID"])
 							end
 
-							@ri.port	= attributes["port"]
+							@ri.port = attributes["port"]
 							@ri.svc_name = attributes["svc_name"]
 							@ri.protocol = attributes["protocol"]
 							@ri.severity = attributes["severity"]
@@ -275,8 +260,13 @@ module Risu
 								@patch.value = @vals['tag']
 								@patch.save
 							else
-								@rh.attributes = {@valid_host_properties[@attr] => @vals["tag"].gsub("\n", ",") } if @valid_host_properties.keys.include?(@attr)
+								@rh.attributes = {@host_properties_mapping[@attr] => @vals["tag"].gsub("\n", ",") } if @host_properties_mapping.keys.include?(@attr)
 								@rh.save
+
+								@hp.name = @attr
+								@hp.value = @vals['tag']
+								@hp.save
+
 							end if @attr != nil
 						#We cannot handle the references in the same block as the rest of the ReportItem tag because
 						#there tends to be more than of the different types of reference per ReportItem, this causes issue for a sax

data/lib/risu/templates/pci_compliance.rb

@@ -34,7 +34,7 @@ module Risu
 				{
 					:name => "pci_compliance",
 					:author => "hammackj",
-					:version => "0.0.4",
+					:version => "0.0.5",
 					:description => "Generates a PCI Compliance Overview Report"
 				}
 			end
@@ -49,9 +49,12 @@ module Risu
 
 				text "\n\n\n"
 
-				@hosts_count = Host.find(:all, :conditions => ["pci_dss_compliance is not null"]).count
-				@hosts_passed = Host.find(:all, :conditions => ["pci_dss_compliance like 'passed'"])
-				@hosts_failed = Host.find(:all, :conditions => ["pci_dss_compliance like 'failed'"])
+				#@hosts_count = Host.find(:all, :conditions => ["pci_dss_compliance is not null"]).count
+				@hosts_count = HostProperty.where(:name => "pci_dss_compliance").count
+				#@hosts_passed = Host.find(:all, :conditions => ["pci_dss_compliance like 'passed'"])
+				@hosts_passed = HostProperty.where(:name => "pci_dss_compliance").where(:value => "passed")
+				#@hosts_failed = Host.find(:all, :conditions => ["pci_dss_compliance like 'failed'"])
+				@hosts_failed = HostProperty.where(:name => "pci_dss_compliance").where(:value => "failed")
 
 				output.font_size(20) do
 					output.text "Summary\n", :style => :bold

metadata

@@ -1,174 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: risu
 version: !ruby/object:Gem::Version
-  version: 1.6.0
-  prerelease: 
+  version: 1.6.1
 platform: ruby
 authors:
 - Jacob Hammack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: gruff
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.11
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.13.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.7
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.6
 description: risu is a Nessus .nessus XML parser and report generation tool
@@ -225,6 +204,7 @@ files:
 - lib/risu/templates/ms_update_summary.rb
 - lib/risu/templates/technical_findings.rb
 - lib/risu/templates/findings_summary.rb
+- lib/risu/models/hostproperty.rb
 - lib/risu/models/host.rb
 - lib/risu/models/item.rb
 - lib/risu/models/servicedescription.rb
@@ -244,27 +224,25 @@ files:
 homepage: http://www.arxopia.com/projects/risu
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.24
 requirements: []
 rubyforge_project: risu
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: risu
 test_files: []
-has_rdoc: yard