risu 1.4.7 → 1.4.8

data/NEWS.markdown

@@ -1,9 +1,15 @@
 # News
 
+#1.4.8 (August 21, 2011)
+- Fixed a gemspec dependency error reported by mlpotgieter
+- Fixed a parser error related to Microsoft Bulletins report by stevelodin
+- Added a Table for all host related patches, currently only has Microsoft Bulletins
+You can access it via `Host.first.patches` or `Patch.all`
+- Please report any missing tags that risu outputs to jacob[dot]hammackj[@]hammackj[.]com, I expect a ton of Microsoft Patch tags missing
+
 #1.4.7 (August 13, 2011)
 - Fixed issue #39 Ruby 1.8.7 Syntax error reported by mlpotgieter 
 - Ruby 1.8.7 will no longer be supported in v1.5, please upgrade your ruby installs.
-- 
 
 #1.4.6 (July 12, 2011)
 - Added pcidss:dns_zone_transfer to the Nessus parser

data/TODO.markdown

@@ -2,7 +2,7 @@
 
 **Release dates are estimates, and features can be changed at any time.**
 
-## 1.4.7
+## 1.4.9
 - Make sure all classification headers are upcase
 - Ensure font sizes are standard in the templates
 - The font in tech findings could be 1 size smaller
@@ -12,6 +12,8 @@
 - pcidss:directory_browsing
 - pcidss:known_credentials
 - pcidss:compromised_host:worm
+- Add tests for Patch model
+-
 
 ## 1.5 (8/4/2011)
 - Rework the blacklisting of plugins/hosts add to the config file
@@ -52,6 +54,7 @@
 - Sort Technical Findings Report by count/score
 - Add template validation and more error checking
 - Colorize the reports with better style
+- Added TOC/Index to the technical findings report, issue 15
 	
 ##1.5.2 (11/4/2011) - Parser work
 - Add Schema checks to make sure the schema is compatible with the version of risu
@@ -77,6 +80,7 @@
 - Add Parser for Nexpose xml
 - Add Parser for Qualys xml
 - Look at moving to nokogiri for xml parsing, current benchmarks so it faster than libxml-ruby; http://nokogiri.org
+- Easier way to select the Scan to generate reports from
 
 ## 2.0 (?)
 - Rails FrontEnd to Risu

data/lib/risu.rb

@@ -1,6 +1,6 @@
 module Risu
 	APP_NAME = "risu"
-	VERSION = "1.4.7"
+	VERSION = "1.4.8"
 	GRAPH_WIDTH = 750
 	EMAIL = "jacob.hammack@hammackj.com"
 	CONFIG_FILE = "./risu.cfg"

data/lib/risu/base/schema.rb

@@ -133,6 +133,12 @@ module Risu
 				t.string :description
 			end
 			
+			create_table :patches do |t|
+				t.integer :host_id
+				t.string :name
+				t.string :value
+			end
+			
 			ServiceDescription.create :name => "www", :description => ""
 			ServiceDescription.create :name => "cifs", :description => ""
 			ServiceDescription.create :name => "smb", :description => ""
@@ -160,6 +166,7 @@ module Risu
 			drop_table :references
 			drop_table :versions
 			drop_table :service_descriptions
+			drop_table :patches
 		end
 
 	end

data/lib/risu/models.rb

@@ -15,3 +15,4 @@ require 'risu/models/reference'
 require 'risu/models/policy'
 require 'risu/models/version'
 require 'risu/models/servicedescription'
+require 'risu/models/patch'

data/lib/risu/models/host.rb

@@ -6,6 +6,7 @@ module Risu
 		class Host < ActiveRecord::Base
 			belongs_to :report
 			has_many :items
+			has_many :patches
 
 			class << self
 

data/lib/risu/models/patch.rb

@@ -0,0 +1,11 @@
+module Risu
+	module Models
+
+		# Version Model for the DB
+		#
+		# @author Jacob Hammack
+		class Patch < ActiveRecord::Base
+			belongs_to :host
+		end
+	end
+end

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

@@ -56,27 +56,158 @@ module Risu
 							"pcidss:obsolete_operating_system" => :pcidss_obsolete_operating_system,
 							"pcidss:dns_zone_transfer" => :pcidss_dns_zone_transfer
 						}
-
-						@valid_ms_patches = {
-							"MS11-030" => :ms11_030,
-							"MS11-026" => :ms11_026,
-							"MS11-034" => :ms11_034,
-							"MS11-021" => :ms11_021,
-							"MS11-029" => :ms11_029,
-							"MS11-023" => :ms11_023,
-							"MS11-022" => :ms11_022,
-							"MS09-027" => :ms09_027,
-							"MS11-033" => :ms11_033,
-							"MS11-019" => :ms11_019,
-							"MS11-024" => :ms11_024,
-							"MS11-031" => :ms11_031,
-							"MS11-020" => :ms11_020,
-							"MS11-018" => :ms11_018,
-							"MS11-028" => :ms11_028,
-							"MS11-032" => :ms11_032,
-							"MS040-016" => :ms040_016,
-							"MS08-50" => :ms08_50
-						}
+						#@todo change this to an array and use a dynamic ms_patches table
+						@valid_ms_patches = [
+							"MS11-030",
+							"MS11-026",
+							"MS11-034",
+							"MS11-021",
+							"MS11-029",
+							"MS11-023",
+							"MS11-022",
+							"MS09-027",
+							"MS11-033",
+							"MS11-019",
+							"MS11-024",
+							"MS11-031",
+							"MS11-020",
+							"MS11-018",
+							"MS11-028",
+							"MS11-032",
+							"MS040-016",
+							"MS08-50",
+							"MS09-055",
+							"MS10-008",
+							"MS10-034",
+							"MS10-082",
+							"MS11-003",
+							"MS07-021",
+							"MS09-062",
+							"MS07-022",
+							"MS10-096",
+							"MS09-062",
+							"MS07-017",
+							"MS07-031",
+							"MS08-020",
+							"MS10-002",
+							"MS10-035",
+							"MS11-007",
+							"MS10-018",
+							"MS09-069",
+							"MS09-001",
+							"MS10-073",
+							"MS09-044",
+							"MS08-021",
+							"MS08-001",
+							"MS11-011",
+							"MS07-004",
+							"MS07-006",
+							"MS07-007",
+							"MS07-008",
+							"MS07-009",
+							"MS07-011",
+							"MS07-012",
+							"MS07-013",
+							"MS07-016",
+							"MS07-019",
+							"MS07-020",
+							"MS07-027",
+							"MS08-002",
+							"MS08-007",
+							"MS08-008",
+							"MS08-010",
+							"MS08-022",
+							"MS09-006",
+							"MS09-007",
+							"MS09-010",
+							"MS09-011",
+							"MS09-012",
+							"MS09-013",
+							"MS09-014",
+							"MS09-015",
+							"MS09-019",
+							"MS09-022",
+							"MS09-025",
+							"MS09-026",
+							"MS09-034",
+							"MS09-037",
+							"MS09-038",
+							"MS09-040",
+							"MS09-041",
+							"MS09-042",
+							"MS09-045",
+							"MS09-046",
+							"MS09-047",
+							"MS09-048",
+							"MS09-051",
+							"MS09-052",
+							"MS09-054",
+							"MS09-056",
+							"MS09-057",
+							"MS09-058",
+							"MS09-065",
+							"MS09-071",
+							"MS09-072",
+							"MS09-073",
+							"MS10-001",
+							"MS10-005",
+							"MS10-006",
+							"MS10-011",
+							"MS10-012",
+							"MS10-013",
+							"MS10-015",
+							"MS10-016",
+							"MS10-019",
+							"MS10-020",
+							"MS10-021",
+							"MS10-022",
+							"MS10-026",
+							"MS10-027",
+							"MS10-029",
+							"MS10-030",
+							"MS10-032",
+							"MS10-033",
+							"MS10-037",
+							"MS10-041",
+							"MS10-042",
+							"MS10-046",
+							"MS10-047",
+							"MS10-048",
+							"MS10-049",
+							"MS10-050",
+							"MS10-051",
+							"MS10-052",
+							"MS10-053",
+							"MS10-054",
+							"MS10-055",
+							"MS10-061",
+							"MS10-062",
+							"MS10-063",
+							"MS10-066",
+							"MS10-067",
+							"MS10-069",
+							"MS10-070",
+							"MS10-071",
+							"MS10-074",
+							"MS10-076",
+							"MS10-078",
+							"MS10-081",
+							"MS10-083",
+							"MS10-084",
+							"MS10-090",
+							"MS10-091",
+							"MS10-097",
+							"MS10-098",
+							"MS10-099",
+							"MS11-002",
+							"MS11-006",
+							"MS11-010",
+							"MS11-012",
+							"MS11-013",
+							"MS11-014",
+							"MS11-015",
+							"MS11-017"
+						]
 				end
 
 				# Callback for when the start of a xml element is reached
@@ -116,14 +247,23 @@ module Risu
 							@rh.name = attributes["name"]
 							@rh.save
 						when "tag"
-							unless attributes["name"] =~ /(MS\d\d-\d\d\d)/
-									@attr = if @valid_host_properties.keys.include?(attributes["name"])
-													attributes["name"]
-											else
-													nil
-											end
-									puts "New HostProperties attribute: #{attributes["name"]}. Please report this to jacob.hammack@hammackj.com\n" if @attr.nil?
+							@attr = nil
+
+							if attributes["name"] =~ /[M|m][S|s]\d{2}-\d{2,}/
+								@attr = if @valid_ms_patches.include?(attributes["name"])
+										attributes["name"]
+									else
+										nil
+									end
+							else
+								@attr = if @valid_host_properties.keys.include?(attributes["name"])
+										attributes["name"]
+									else
+										nil
+									end
 							end
+
+							puts "New HostProperties attribute: #{attributes["name"]}. Please report this to jacob.hammack@hammackj.com\n" if @attr.nil?
 						when "ReportItem"
 							@vals = Hash.new # have to clear this out or everything has the same references
 							@ri = @rh.items.create
@@ -222,8 +362,15 @@ module Risu
 
 							@plugin_selection.save
 						when "tag"
-							@rh.attributes = {@valid_host_properties[@attr] => @vals["tag"].gsub("\n", ",") } if @valid_host_properties.keys.include?(@attr)
-							@rh.save
+							if @attr =~ /[M|m][S|s]\d{2}-\d{2,}/
+								@patch = @rh.patches.create
+								@patch.name = @attr
+								@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.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
 						#parser. To solve this we do the references before the final plugin data

data/risu.gemspec

@@ -27,18 +27,18 @@ Gem::Specification.new do |s|
 	s.required_rubygems_version = ">= 1.6.0"
 	s.rubyforge_project	= "#{Risu::APP_NAME}"
 
-	s.add_development_dependency("rspec", "= 2.5.0")
-	s.add_development_dependency("rcov", ">= 0.9.9")
-	s.add_development_dependency("yard", ">= 0.6.4")
-	s.add_development_dependency("machinist", ">= 1.0.6")
-	s.add_development_dependency("sham", ">= 0.4.0")
-	s.add_development_dependency("faker", ">= 0.9.5")
-
-	s.add_dependency('rails', '>= 3.0.7')
-	s.add_dependency('libxml-ruby', '>= 1.1.4')
-	s.add_dependency('prawn', '>= 0.11.1')
-	s.add_dependency('gruff', '>= 0.3.6')
-	s.add_dependency('mysql', '>= 2.8.1')
-	s.add_dependency('rmagick', ">= 2.13.1")
-	s.add_dependency('sqlite3', ">= 1.3.3")
+	s.add_development_dependency("rspec", ["~> 2.5.0"])
+	s.add_development_dependency("rcov", [">= 0.9.9"])
+	s.add_development_dependency("yard", [">= 0.6.4"])
+	s.add_development_dependency("machinist", [">= 1.0.6"])
+	s.add_development_dependency("sham", [">= 0.4.0"])
+	s.add_development_dependency("faker", [">= 0.9.5"])
+
+	s.add_dependency('rails', ['>= 3.0.7'])
+	s.add_dependency('libxml-ruby', ['>= 1.1.4'])
+	s.add_dependency('prawn', ['>= 0.11.1'])
+	s.add_dependency('gruff', ['>= 0.3.6'])
+	s.add_dependency('mysql', ['>= 2.8.1'])
+	s.add_dependency('rmagick', [">= 2.13.1"])
+	s.add_dependency('sqlite3', [">= 1.3.3"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: risu
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-13 00:00:00.000000000Z
+date: 2011-08-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70222431373580 !ruby/object:Gem::Requirement
+  requirement: &70350051680640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70222431373580
+  version_requirements: *70350051680640
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70222431373000 !ruby/object:Gem::Requirement
+  requirement: &70350051680040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *70222431373000
+  version_requirements: *70350051680040
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70222431372420 !ruby/object:Gem::Requirement
+  requirement: &70350051679420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *70222431372420
+  version_requirements: *70350051679420
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70222431371900 !ruby/object:Gem::Requirement
+  requirement: &70350051678780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70222431371900
+  version_requirements: *70350051678780
 - !ruby/object:Gem::Dependency
   name: sham
-  requirement: &70222431371240 !ruby/object:Gem::Requirement
+  requirement: &70350051678160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70222431371240
+  version_requirements: *70350051678160
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70222431370740 !ruby/object:Gem::Requirement
+  requirement: &70350051677560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70222431370740
+  version_requirements: *70350051677560
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70222431370160 !ruby/object:Gem::Requirement
+  requirement: &70350051676960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70222431370160
+  version_requirements: *70350051676960
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
-  requirement: &70222431369480 !ruby/object:Gem::Requirement
+  requirement: &70350051644920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70222431369480
+  version_requirements: *70350051644920
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &70222431369020 !ruby/object:Gem::Requirement
+  requirement: &70350051644400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.11.1
   type: :runtime
   prerelease: false
-  version_requirements: *70222431369020
+  version_requirements: *70350051644400
 - !ruby/object:Gem::Dependency
   name: gruff
-  requirement: &70222431368460 !ruby/object:Gem::Requirement
+  requirement: &70350051643920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70222431368460
+  version_requirements: *70350051643920
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &70222431367900 !ruby/object:Gem::Requirement
+  requirement: &70350051643420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 2.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70222431367900
+  version_requirements: *70350051643420
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70222431367320 !ruby/object:Gem::Requirement
+  requirement: &70350051642920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 2.13.1
   type: :runtime
   prerelease: false
-  version_requirements: *70222431367320
+  version_requirements: *70350051642920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70222431366740 !ruby/object:Gem::Requirement
+  requirement: &70350051642420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70222431366740
+  version_requirements: *70350051642420
 description: risu is a Nessus .nessus xml parser and report generation tool
 email: jacob.hammack@hammackj.com
 executables:
@@ -187,6 +187,7 @@ files:
 - lib/risu/models/host.rb
 - lib/risu/models/individualpluginselection.rb
 - lib/risu/models/item.rb
+- lib/risu/models/patch.rb
 - lib/risu/models/plugin.rb
 - lib/risu/models/pluginspreference.rb
 - lib/risu/models/policy.rb