risu 1.4.5 → 1.4.6

data/NEWS.markdown

@@ -1,5 +1,11 @@
 # News
 
+#1.4.6 (July, 2011)
+- Added pcidss:dns_zone_transfer to the Nessus parser
+- Added pcidss:obsolete_operating_system to the Nessus parser
+- Removed warnings about several Microsoft patch tags, not sure what to do with them at the moment.
+- Added a user template directory. Risu will scan ~/.risu/templates for user templates.
+
 #1.4.5 (July 4, 2011)
 - Implemented an modular template system, **breaks all existing templates**.
 	- All templates are now implemented as Ruby classes this allows them to be dynamically loaded and removes the need to type the entire path to the template

data/Rakefile

@@ -12,7 +12,7 @@ end
 task :release => :build do
   system "gem push #{Risu::APP_NAME}-#{Risu::VERSION}.gem"
 
-	puts "Just released #{Risu::APP_NAME} v#{Risu::VERSION}. #{Risu::APP_NAME} is always available in RubyGems!"
+	puts "Just released #{Risu::APP_NAME} v#{Risu::VERSION}. #{Risu::APP_NAME} is always available in RubyGems! More information at http://hammackj.com/projects/risu/"
 end
 
 task :clean do

data/TODO.markdown

@@ -2,9 +2,12 @@
 
 **Release dates are estimates, and features can be changed at any time.**
 
+## 1.4.6
+
+
 ## 1.5 (7/4/2011)
-- Comment all named scope from 1.2
-- Clean up code
+- Rework the blacklisting of plugins/hosts add to the config file
+- Complete comments for all existing code
 - Create rSpec tests for everything (95%+ code coverage goal)
 	- Parser tests
 		- Add test for new xml element
@@ -31,7 +34,6 @@
 		- ms update summary
 		- pci compliance
 		- tech findings
-- Rework the blacklisting of plugins/hosts add to the config file
 
 ##1.5.1 (8/4/2011) - Template work
 - Provide more templates

data/lib/risu.rb

@@ -1,8 +1,6 @@
-# encoding: utf-8
-
 module Risu
 	APP_NAME = "risu"
-	VERSION = "1.4.5"
+	VERSION = "1.4.6"
 	GRAPH_WIDTH = 750
 	EMAIL = "jacob.hammack@hammackj.com"
 	CONFIG_FILE = "./risu.cfg"

data/lib/risu/base.rb

@@ -1,10 +1,9 @@
-# encoding: utf-8
-
 module Risu
 	module Base
 	end
 end
 
+#Remove this by 1.5 as it doesn't seem to be needed
 #if ActiveRecord::Base.connected? == true
 #	require 'risu/base/schema'
 #end

data/lib/risu/base/schema.rb

@@ -63,6 +63,8 @@ module Risu
 				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

data/lib/risu/base/template_manager.rb

@@ -3,21 +3,28 @@ module Risu
 		class TemplateManager
 			attr_accessor :registered_templates
 
+			# Creates new instance of TemplateManager
 			#
+			# @param path Path relative to the base_dir of risu
 			#
+			# @return New instance of the template manager with templates loaded.
 			def initialize (path)
 			  @registered_templates = Array.new
 				@templates = Array.new
 				
-				load_templates(path)
+				base_dir = __FILE__.gsub("risu/base/template_manager.rb", "")
+				
+				load_templates(base_dir + path)
+				load_templates(File.expand_path(USER_TEMPLATES_DIR)) if File.exists?(File.expand_path(USER_TEMPLATES_DIR)) && File.directory?(File.expand_path(USER_TEMPLATES_DIR))
 			end
 
+			# Loads templates from a specific path
 			#
+			# @param path Path to templates to load
 			#
-			def load_templates(path)
+			def load_templates(path)				
 				begin
-					base_dir = __FILE__.gsub("risu/base/template_manager.rb", "")
-				  Dir["#{base_dir + path}/**/*.rb"].each do |x| 
+				  Dir["#{path}/**/*.rb"].each do |x| 
 						begin
 							load x
 						rescue => e
@@ -27,28 +34,23 @@ module Risu
 
 				  TemplateBase.possible_templates.each do |p|
 				    if validate(p) ==  true
-				      @registered_templates << p
+				      @registered_templates << p if @registered_templates.include?(p) == false
 				    end
 				  end
 				rescue => e
-					puts "Bad plugin"
+					puts "[!] Invalid template path"
 				end
 			end
 
+			# Validates that a template is a valid template
 			#
+			# @param template The template to validate
 			#
 			def validate(template)
 			  t = template.new
-
-			  if t == nil
-			    return false
-			  end
-
-			  if t.respond_to?(:render) == false
-			    return false
-			  end
-
-			  return true
+				
+				return false if t == nil
+			  return t.respond_to?(:render)
 			end
 
 			#
@@ -71,11 +73,14 @@ module Risu
 			def register_template(plugin)
 			  load plugin
 
-			  @templates.push(plugin)
+			  @templates.push(plugin) if @templates.include?(plugin) == false
 			end
 			
+			# Finds a template by its name
 			#
+			# @param name Name of the template to find
 			#
+			# @return the instance of the template or nil if not found
 			def find_template_by_name(name)
 				@registered_templates.each do |template|
 					t = template.new
@@ -87,7 +92,7 @@ module Risu
 				return nil
 			end
 			
-			#
+			# Displays a list of all the templates
 			#
 			def display_templates
 				puts "Available Templates"

data/lib/risu/cli.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Risu
 	module CLI
 	end

data/lib/risu/cli/banner.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 #Cool random banner stuff for the cli, based on the metasploit random banner stuff
 
 module Risu

data/lib/risu/exceptions/invaliddocument.rb

@@ -1,10 +1,7 @@
-
-# encoding: utf-8
-
 module Risu
 	module Exceptions
 		class InvalidDocument < StandardError
 	
 		end
 	end
-end
+end

data/lib/risu/models/familyselection.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Risu
 	module Models	
 		# FamilySelection Model

data/lib/risu/models/host.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Risu
 	module Models
 		# Host Model

data/lib/risu/models/individualpluginselection.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Risu
 	module Models
 

data/lib/risu/models/item.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Risu
 	module Models
 
@@ -112,7 +110,7 @@ module Risu
 
 				# Queries for all the high risks by plugin
 				#
-				# @todo update this
+				# @param limit Limits the result to a specific number, default 10
 				#
 				# @return [ActiveRecord::Relation] with the query results
 				def risks_by_plugin(limit=10)
@@ -121,6 +119,8 @@ module Risu
 
 				# Queries for all the risks by host
 				#
+				# @param limit Limits the result to a specific number, default 10
+				#
 				# @return [ActiveRecord::Relation] with the query results
 				def risks_by_host(limit=10)
 					select("items.*").select("count(*) as count_all").joins(:host).where("plugin_id != 1").where(:severity => [3, 2]).group(:host_id).order("count_all DESC").limit(limit)
@@ -142,6 +142,8 @@ module Risu
 
 				# Generates a Graph of all the risks by service
 				#
+				# @param limit Limits the result to a specific number, default 10
+				#
 				# @return [StringIO] Object containing the generated PNG image
 				def risks_by_service_graph(limit=10)
 					g = Gruff::Pie.new(GRAPH_WIDTH)
@@ -152,9 +154,9 @@ module Risu
 						:background_colors => %w(white white)
 					}
 
-					Item.risks_by_service(limit).all.each { |service|
+					Item.risks_by_service(limit).all.each do |service|
 						g.data(service.svc_name, Item.find(:all, :conditions => {:svc_name => service.svc_name}).count)
-					}
+					end
 
 					StringIO.new(g.to_blob)
 				end

data/lib/risu/models/plugin.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Risu
 	module Models
 

data/lib/risu/models/policy.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Risu
 	module Models
 		

data/lib/risu/models/reference.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Risu
 	module Models
 		

data/lib/risu/models/report.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Risu
 	module Models
 		

data/lib/risu/models/servicedescription.rb

@@ -1,7 +1,7 @@
 module Risu
 	module Models
 
-		# 
+		# Service Description Model; Use for creating generic text for service descriptions
 		#
 		# @author Jacob Hammack
 		class ServiceDescription < ActiveRecord::Base

data/lib/risu/models/version.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Risu
 	module Models
 

data/lib/risu/parsers.rb

@@ -4,4 +4,4 @@ module Risu
 end
 
 require 'risu/parsers/nessus/nessus_document'
-require 'risu/parsers/nessus/nessus_sax_listener'
+require 'risu/parsers/nessus/nessus_sax_listener'

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

@@ -52,7 +52,9 @@ module Risu
 							"pcidss:medium_risk_flaw" => :pcidss_medium_risk_flaw,
 							"pcidss:reachable_db" => :pcidss_reachable_db,
 							"pcidss:www:xss" => :pcidss_www_xss,
-							"system-type" => :system_type
+							"system-type" => :system_type,
+							"pcidss:obsolete_operating_system" => :pcidss_obsolete_operating_system,
+							"pcidss:dns_zone_transfer" => :pcidss_dns_zone_transfer
 						}
 
 						@valid_ms_patches = {
@@ -71,7 +73,9 @@ module Risu
 							"MS11-020" => :ms11_020,
 							"MS11-018" => :ms11_018,
 							"MS11-028" => :ms11_028,
-							"MS11-032" => :ms11_032
+							"MS11-032" => :ms11_032,
+							"MS040-016" => :ms040_016,
+							"MS08-50" => :ms08_50
 						}
 				end
 

metadata

@@ -2,7 +2,7 @@
 name: risu
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors: 
 - Jacob Hammack
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 -05:00
+date: 2011-07-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency