risu 1.7.9 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4323f4148eb935a7f7fbe855eac75da1e721f5c4
-  data.tar.gz: a2e2f82eb2a95c8459a785ba92bcd260a758935c
+  metadata.gz: accf90c8309d4a0ccc6b26f830b8830458855492
+  data.tar.gz: d05b1dde76b40f7fdc5c30961b44ec1cc2d55848
 SHA512:
-  metadata.gz: c7b1dd24e54f291b8fc317e6f05945dd16b2cc7190d28b4aa8ce602fceceb6e81151ba74459c5b7377722928cdac1ced1f49cf0384273d89a0dc2cebb683ce73
-  data.tar.gz: 8a580555cf942fe6b7f3964ec11024911e83d7958e056d7f559bc4b35d3762debf997c1b61ec475b105386709bb242b27b32f73474680403ab04091a73eb2d69
+  metadata.gz: c5631c1e7ca724d503e77b8505b7451529bccf01ea088b6acdc80becc1512a6ca2dcffd32df537c20d7ab2dad62d82bcc175dad0214341b189dce836ea35bc0c
+  data.tar.gz: 5755fa9507c02125832f8b4fed8642cd75e71454838772ae252d6aa03fc749e524c09a6a7dea019d8c41f0785df6a19e9de1690d8a7636114615f1f2ee1485d5

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2016 Arxopia LLC.
+Copyright (c) 2010-2017 Jacob Hammack.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.markdown

@@ -1,4 +1,9 @@
-# risu [![Gem Version](https://badge.fury.io/rb/risu.png)](http://badge.fury.io/rb/risu) [![Build Status](https://travis-ci.org/arxopia/risu.png?branch=master)](https://travis-ci.org/arxopia/risu)  [![Code Climate](https://codeclimate.com/github/arxopia/risu/badges/gpa.svg)](https://codeclimate.com/github/arxopia/risu) [![Inline docs](http://inch-ci.org/github/arxopia/risu.png)](http://inch-ci.org/github/arxopia/risu) 
+# risu
+
+[![Gem Version](https://badge.fury.io/rb/risu.png)](http://badge.fury.io/rb/risu)
+[![Build Status](https://travis-ci.org/hammackj/risu.png?branch=master)](https://travis-ci.org/hammackj/risu)  
+[![Code Climate](https://codeclimate.com/github/hammackj/risu/badges/gpa.svg)](https://codeclimate.com/github/hammackj/risu)
+[![Inline docs](http://inch-ci.org/github/hammackj/risu.png)](http://inch-ci.org/github/hammackj/risu)
 
 Risu is [Nessus](http://www.nessus.org) parser, that converts Nessus .nessus xml files into a [ActiveRecord](http://api.rubyonrails.org/classes/ActiveRecord/Base.html) database, this allows for easy report generation and vulnerability verification.
 
@@ -32,6 +37,11 @@ Installation is really easy just gem install!
 
 	% gem install risu
 
+## Installation with gem signature verification
+
+	% gem cert --add <(curl -Ls https://raw.github.com/hammackj/risu/master/certs/hammackj.pem
+	% gem install risu -P MediumSecurity
+
 ### Runtime 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:
@@ -94,10 +104,10 @@ Using the risu Console is just like using Rails. You can access all of the Activ
 
 	risu Console v1.7.2
 	>> Host.first
-	=> #<Risu::Models::Host id: 1, report_id: 1, name: "10.69.69.74", os: "Linux Kernel 2.6 on Debian 4.0 (etch)", mac: "XX:XX:XX:XX:XX:XX", start: "2011-04-20 16:29:37", end: "2011-04-20 16:32:14", ip: "10.69.69.74", fqdn: "redada.arxopia.net", netbios: "REDADA", local_checks_proto: nil, smb_login_used: nil, ssh_auth_meth: nil, ssh_login_used: nil, pci_dss_compliance: nil, notes: nil>
+	=> #<Risu::Models::Host id: 1, report_id: 1, name: "10.69.69.74", os: "Linux Kernel 2.6 on Debian 4.0 (etch)", mac: "XX:XX:XX:XX:XX:XX", start: "2011-04-20 16:29:37", end: "2011-04-20 16:32:14", ip: "10.69.69.74", fqdn: "redada.hammackj.net", netbios: "REDADA", local_checks_proto: nil, smb_login_used: nil, ssh_auth_meth: nil, ssh_login_used: nil, pci_dss_compliance: nil, notes: nil>
 
 ## Templates
-Several templates are included:
+Several templates are included, but is recommend you build your own based on what you need.
 
 	$ risu -l
     Available Templates
@@ -125,12 +135,10 @@ Several templates are included:
 The templates are written in ruby using [prawn](http://prawn.majesticseacreature.com/), they are fairly easy to make. I will add any templates as requested. See the 'template' example for creating your own template.
 
 # Contributing
-If you would like to contribute templates/bug fixes/etc to risu. The easiest way is to fork the project on [github](http://github.com/arxopia/risu) and make the changes in your fork and the submit a pull request to the project on the dev branch. Please include unit tests for anything non trivial.
+If you would like to contribute templates/bug fixes/etc to risu. The easiest way is to fork the project on [github](http://github.com/hammackj/risu) and make the changes in your fork and the submit a pull request to the project on the dev branch. Please include unit tests for anything non trivial.
 
 # Issues
-If you have any problems, bugs or feature requests please use the [github issue tracker](http://github.com/arxopia/risu/issues).
+If you have any problems, bugs or feature requests please use the [github issue tracker](http://github.com/hammackj/risu/issues).
 
 # Contact
-You can reach me at jacob.hammack[at]arxopia[dot]com.
-
-You can also contact me on IRC as hammackj on irc.freenode.net, #risu
+You can reach me at jacob.hammack[at]hammackj[dot]com. You can also contact me on IRC as hammackj on irc.freenode.net, #risu

data/Rakefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2016 Arxopia LLC.
+# Copyright (c) 2010-2017 Jacob Hammack.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -24,11 +24,21 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require "risu"
 require 'rake'
 require 'rake/testtask'
+require 'digest/sha2'
 
 task :build do
 	system "gem build #{Risu::APP_NAME}.gemspec"
 end
 
+task :checksum do
+	built_gem_path = "#{Risu::APP_NAME}-#{Risu::VERSION}.gem"
+	checksum = Digest::SHA512.new.hexdigest(File.read(built_gem_path))
+	checksum_path = "checksum/#{Risu::APP_NAME}-#{Risu::VERSION}.gem.sha512"
+	File.open(checksum_path, 'w' ) {|f| f.write(checksum) }
+	system "git add #{checksum_path}"
+	system "git commit #{checksum_path} -m 'Added #{Risu::APP_NAME}-#{Risu::VERSION}.gem checksum'"
+end
+
 task :tag_and_bag do
 	system "git tag -a v#{Risu::VERSION} -m 'version #{Risu::VERSION}'"
 	system "git push --tags"
@@ -45,8 +55,7 @@ task :tweet do
 	puts "Just released #{Risu::APP_NAME} v#{Risu::VERSION}. #{Risu::APP_NAME} is an Nessus XML parser/database/report generator. More information at #{Risu::HOME_PAGE}"
 end
 
-task :release => [:tag_and_bag, :build, :push, :tweet] do
-
+task :release => [:build, :checksum, :tag_and_bag, :push, :tweet] do
 end
 
 task :clean do

data/bin/risu

@@ -1,6 +1,6 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -W0
 
-# Copyright (c) 2010-2016 Arxopia LLC.
+# Copyright (c) 2010-2017 Jacob Hammack.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/docs/NEWS.markdown

@@ -1,5 +1,28 @@
 # News
 
+# 1.8.0 (March 1, 2017)
+- **Moved repo from http://github.com/arxopia/risu to http://github.com/hammackj/risu**
+- **Upgraded to Rails 5**
+- Added gem signing
+- Lots of clean up for Rails 5 and Ruby 2.4
+- Various improvements / fixes [@abenson]
+- Post Processing Updates
+	- Added 7-Zip
+	- Added Foxit Phantom PDF
+	- Added RealPlayer
+	- Added Skype
+	- Updated OpenSSH plugin list
+	- Updated VMware ESXi plugin list
+	- Updated Apple QuickTime
+	- Updated Cisco AnyConnect
+	- Updated Firefox
+	- Updated Foxit Reader
+	- Updated Google Chrome
+	- Updated Java
+	- Updated Libre Office
+	- Updated Windows updates
+	- Updated Wireshark
+
 # 1.7.9 (July 1, 2016)
 - Updated RootCauses
 - Fixed issue #99 with the FindingsHost template enumerating the wrong findings. [@ghuisman]
@@ -114,7 +137,7 @@
 # 1.7.0 (September 12, 2014)
 - Update Copyrights to 2014
 - Wiki
-	- New page for installing on [OSX]((https://github.com/arxopia/risu/wiki/OSX-Installation-Guide)
+	- New page for installing on [OSX]((https://github.com/hammackj/risu/wiki/OSX-Installation-Guide)
 - Models
 	- Host Model
 		- Changed the field type of 'mac' from string to text to increase the size
@@ -236,7 +259,7 @@
 		it is rough at the moment but good for viewing all the findings. It requires
 		that local checks were run, for the plugin to fire during the Nessus scan.
 - Wiki
-	- New page for installing on [Kali Linux](https://github.com/arxopia/risu/wiki/Kali-Linux-Risu-Installation-Guide)
+	- New page for installing on [Kali Linux](https://github.com/hammackj/risu/wiki/Kali-Linux-Risu-Installation-Guide)
 - Post Processing (Alpha Support)
 	- Started to develop a method for doing post processing on all the findings
 		- Initial RiskScore plugin to calculate a risk score for Plugins / Findings / Hosts
@@ -328,10 +351,10 @@
 	- template
 		- cleaned up and updated to use the TemplateHelper mixin
 - Wiki Pages
-	- New page for installing on [Fedora](https://github.com/arxopia/risu/wiki/Fedora-Installation-Guide)
-	- New page for installing on [CentOS](https://github.com/arxopia/risu/wiki/CentOS-Installation-Guide)
-	- New page for installing on [Gentoo](https://github.com/arxopia/risu/wiki/Gentoo-Installation-Guide)
-	- New page for installing on [ArchLinux](https://github.com/arxopia/risu/wiki/Arch-Linux-Install-Guide)
+	- New page for installing on [Fedora](https://github.com/hammackj/risu/wiki/Fedora-Installation-Guide)
+	- New page for installing on [CentOS](https://github.com/hammackj/risu/wiki/CentOS-Installation-Guide)
+	- New page for installing on [Gentoo](https://github.com/hammackj/risu/wiki/Gentoo-Installation-Guide)
+	- New page for installing on [ArchLinux](https://github.com/hammackj/risu/wiki/Arch-Linux-Install-Guide)
 
 #1.5.3 (August 29, 2012)
 - New Parsed Tags
@@ -470,14 +493,14 @@
 - Fixed a bug on the exec_summary_detailed detailed report
 - A quick reference for Microsoft findings can now be found in the Patch model,
 You are able to get host_id, name(patch name, ie MS01-001), value (plugin_id)
-- Please report any missing tags that risu outputs to risu[@]arxopia[.]com, I expect a ton of Microsoft Patch tags missing
+- Please report any missing tags that risu outputs to jacob.hammack[@]hammackj[.]com, I expect a ton of Microsoft Patch tags missing
 
 #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 risu[@]arxopia[.]com, I expect a ton of Microsoft Patch tags missing
+- Please report any missing tags that risu outputs to jacob.hammack[@]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
@@ -510,7 +533,7 @@ You can access it via `Host.first.patches` or `Patch.all`
 
 #1.4.3 (May 23, 2011)
 
-**This is the last release under the NessusDB name, I received a legal notice to change the name. They gave me a few weeks to change the name but I do not have a new name yet. If you have any suggestions please submit them to risu[@]arxopia[.]com**
+**This is the last release under the NessusDB name, I received a legal notice to change the name. They gave me a few weeks to change the name but I do not have a new name yet. If you have any suggestions please submit them to jacob.hammack[@]hammackj[.]com**
 
 - Fixed small bug in Windows/Other OS graphs
 - Increased the verboseness of Error messages Ticket #29

data/lib/risu.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2016 Arxopia LLC.
+# Copyright (c) 2010-2017 Jacob Hammack.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 
 
 module Risu
-	# @TODO 1.8 - move graph variables to graphs.rb
+	# @TODO 1.8.1 - move graph variables to graphs.rb
 	GRAPH_WIDTH = 750
 	#                  red     orange  yellow  green    blue   purple        grey           pink
 	GRAPH_COLORS = %w(#d2403f #ec9241 #fcc343 #50ad51 #397bbb #8E6B8E black #cccccc brown #e52d89)

data/lib/risu/base.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2016 Arxopia LLC.
+# Copyright (c) 2010-2017 Jacob Hammack.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/risu/base/graph_template_helper.rb

@@ -1,40 +1,34 @@
-# Copyright (c) 2012-2016 Arxopia LLC.
-# All rights reserved.
+# Copyright (c) 2010-2017 Jacob Hammack.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#     * 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 module Risu
 	module Templates
 		module GraphTemplateHelper
-			
+
 			#
 			def other_os_graph_page
 				if Host.other_os_graph_has_data?
 					new_page
 					@output.image Host.other_os_graph, :width => 500, :height => 375, :position => :center
 					text Host.other_os_graph_text
-				end				
+				end
 			end
 
 			#
@@ -65,7 +59,7 @@ module Risu
 				new_page
 				@output.image Item.risks_by_severity_graph, :width => 500, :height => 375, :position => :center
 				text Item.risks_by_severity_graph_text, :inline_format => true
-			end				
+			end
 		end
 	end
-end
+end

data/lib/risu/base/host_template_helper.rb

@@ -1,35 +1,29 @@
-# Copyright (c) 2012-2016 Arxopia LLC.
-# All rights reserved.
+# Copyright (c) 2010-2017 Jacob Hammack.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#     * 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 module Risu
 	module Templates
 		module HostTemplateHelper
 
 			#
-			def unsupported_os(title, plugin_name)
+			def unsupported_os title, plugin_name
 				if item_count_by_plugin_name(plugin_name) <= 0
 					return
 				end

data/lib/risu/base/malware_template_helper.rb

@@ -1,28 +1,22 @@
-# Copyright (c) 2012-2016 Arxopia LLC.
-# All rights reserved.
+# Copyright (c) 2010-2017 Jacob Hammack.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#     * 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 module Risu
 	module Templates
@@ -32,7 +26,7 @@ module Risu
 			def conficker_count
 				begin
 					return Item.where(:plugin_id => Plugin.where(:plugin_name => "Conficker Worm Detection (uncredentialed check)").first.id).count
-				rescue => e
+				rescue
 					return 0
 				end
 			end
@@ -88,7 +82,7 @@ module Risu
 			def known_malicious_process_count
 				begin
 					return Item.where(:plugin_id => 59275).count
-				rescue => e
+				rescue
 					return 0
 				end
 			end

data/lib/risu/base/post_process_base.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2016 Arxopia LLC.
+# Copyright (c) 2010-2017 Jacob Hammack.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -34,11 +34,11 @@ module Risu
 			attr_accessor :info
 
 			#
-			def self.inherited(child)
+			def self.inherited child
 				possible_postprocesses << child
 			end
 
-			def == (other)
+			def == other
 
 				if self.info == nil || self.info[:plugin_id] == nil
 					false
@@ -49,7 +49,7 @@ module Risu
 				end
 			end
 
-			def <=> (other)
+			def <=> other
 				if self.info[:plugin_id] < other.info[:plugin_id]
 					-1
 				elsif self.info[:plugin_id] > other.info[:plugin_id]
@@ -59,72 +59,110 @@ module Risu
 				end
 			end
 
-			#
-			#def initialize
-			#	@info = {}
-			#end
+			# Create a plugin based on a combination of all plugins
+			# to be rolled up.
+			def create_plugin
 
-			# NOTE:
-			#looks like its working
-			def newest_reader_plugin
-				newest = DateTime.new(0001, 01, 01)
-				newest_plugin = nil
+				plugin = Plugin.find_by_id(@info[:plugin_id])
 
-				@info[:plugin_ids].each do |id|
-					plugin = Plugin.find_by_id(id)
+				if plugin == nil
+					plugin = Plugin.new
+				end
 
-					if plugin == nil || plugin.plugin_modification_date == nil
-						next
+				# Populate items from post process module
+				plugin.id = @info[:plugin_id]
+				plugin.plugin_name = @info[:plugin_name]
+				plugin.description = @info[:description]
+				plugin.plugin_version = @info[:version]
+				plugin.plugin_publication_date = @info[:publication_date]
+				plugin.plugin_modification_date = @info[:modification_date]
+
+				# Boiler plate for all roll up plugins
+				plugin.family_name = "Risu Rollup Plugins"
+				plugin.synopsis = "Software often has vulnerabilities that are corrected in newer versions. It was determined that an older version of the software is installed on this system."
+				plugin.solution = "If possible, update to the latest version of the software."
+				plugin.plugin_type = "Rollup"
+				plugin.rollup = true
+				plugin.compliance = false
+
+				# Find oldest vuln date.
+				begin
+					p = Plugin.where(:id => @info[:plugin_ids]).where.not(:vuln_publication_date => nil).order(:vuln_publication_date).first
+					unless p.nil?
+						plugin.vuln_publication_date = p.vuln_publication_date
 					end
+				end
 
-					if plugin.plugin_modification_date >= newest
-						newest = plugin.plugin_modification_date if plugin.plugin_modification_date != nil
-						newest_plugin = plugin
+				begin
+					p = Plugin.where(:id => @info[:plugin_ids]).where.not(:cvss_base_score => nil).order(:cvss_base_score).last
+					unless p.nil?
+						plugin.cvss_base_score = p.cvss_base_score
+						plugin.cvss_vector = p.cvss_vector
 					end
 				end
 
-				return newest_plugin
-			end
+				begin
+					p = Plugin.where(:id => @info[:plugin_ids]).where.not(:cvss_temporal_score => nil).order(:cvss_temporal_score).last
+					unless p.nil?
+						plugin.cvss_temporal_score = p.cvss_temporal_score
+						plugin.cvss_temporal_vector = p.cvss_temporal_vector
+					end
+				end
 
-			# Creates a rollup plugin based on the newest Adobe Reader
-			#
-			def create_plugin
+				if Plugin.where(:id => @info[:plugin_ids], :exploit_available => true).count > 0
+					plugin.exploit_available = true
+				end
 
-				plugin = Plugin.find_by_id(@info[:plugin_id])
+				if Plugin.where(:id => @info[:plugin_ids], :exploit_framework_core => "true").count > 0
+					plugin.exploit_framework_core = true
+				end
 
-				newest_plugin = newest_reader_plugin()
+				if Plugin.where(:id => @info[:plugin_ids], :exploit_framework_metasploit => "true").count > 0
+					plugin.exploit_framework_metasploit = true
+				end
 
-				if newest_plugin == nil
-					return
+				if Plugin.where(:id => @info[:plugin_ids], :exploit_framework_canvas => "true").count > 0
+					plugin.exploit_framework_canvas = true
 				end
 
-				if plugin == nil
-					plugin = Plugin.new
+				if Plugin.where(:id => @info[:plugin_ids], :exploit_framework_exploithub => "true").count > 0
+					plugin.exploit_framework_exploithub = true
 				end
 
-				plugin.id = @info[:plugin_id]
-				plugin.plugin_name = @info[:plugin_name]
-				plugin.family_name = "Risu Rollup Plugins"
-				plugin.description = newest_plugin.description || ""
-				plugin.plugin_version = newest_plugin.plugin_version || ""
-				plugin.plugin_publication_date = newest_plugin.plugin_publication_date
-				plugin.plugin_modification_date = newest_plugin.plugin_modification_date
-				plugin.vuln_publication_date = newest_plugin.vuln_publication_date
-				plugin.cvss_vector = newest_plugin.cvss_vector || ""
-				plugin.cvss_base_score = newest_plugin.cvss_base_score
-				plugin.cvss_temporal_score = newest_plugin.cvss_temporal_score
-				plugin.cvss_temporal_vector = newest_plugin.cvss_temporal_vector
-				plugin.risk_factor = newest_plugin.risk_factor
-				plugin.solution = newest_plugin.solution
-				plugin.synopsis = newest_plugin.synopsis
-				plugin.plugin_type = "Rollup"
-				plugin.rollup = true
+				if Plugin.where(:id => @info[:plugin_ids], :exploit_framework_d2_elliot => "true").count > 0
+					plugin.exploit_framework_d2_elliot = true
+				end
+
+				if Plugin.where(:id => @info[:plugin_ids], :in_the_news => true).count > 0
+					plugin.in_the_news = true
+				end
+
+				if Plugin.where(:id => @info[:plugin_ids], :exploited_by_malware => "true").count > 0
+					plugin.exploited_by_malware = true
+				end
+
+				["Critical", "High", "Medium", "Low", "Info"].each do |risk|
+					if Plugin.where(:id => @info[:plugin_ids], :risk_factor => risk).size > 0
+						plugin.risk_factor = risk
+						break
+					end
+				end
+
+				begin
+					p = Plugin.where(:id => @info[:plugin_ids]).where.not(:stig_severity => nil).order(:stig_severity).first
+					unless p.nil?
+						plugin.stig_severity = p.stig_severity
+					end
+				end
+
+				# Broken
+				#plugin.references << References.where(:plugin_id => @info[:plugin_ids], :reference_name => "cve")
 
 				plugin.save
 			end
 
 			#
-			def create_item(host_id, severity)
+			def create_item host_id, severity
 				item = Item.new
 
 					item.host_id = host_id
@@ -138,24 +176,12 @@ module Risu
 			end
 
 			#
-			def has_reader_findings
-				@info[:plugin_ids].each do |plugin_id|
-					if Item.where(:plugin_id => plugin_id)
-						return true
-					end
-				end
-
-				return false
+			def has_findings
+				Item.where(:plugin_id => @info[:plugin_ids]).count > 0
 			end
 
-			def has_host_reader_findings (host_id)
-				@info[:plugin_ids].each do |plugin_id|
-					if Item.where(:plugin_id => plugin_id).where(:host_id => host_id).count >= 1
-						return true
-					end
-				end
-
-				return false
+			def has_host_findings(host_id)
+				Item.where(:plugin_id => @info[:plugin_ids]).where(:host_id => host_id).count > 0
 			end
 
 			#
@@ -169,20 +195,20 @@ module Risu
 
 			#
 			def run
-				if !has_reader_findings()
+				if !has_findings()
 					return
 				end
 
-				#Create the dummy plugin
-				create_plugin()
+				# If this is a "roll up" post-process, create a plugin
+				if Plugin.where(:id => @info[:plugin_ids]).count > 0
+					create_plugin()
+				end
 
 				Host.all.each do |host|
-					if !has_host_reader_findings(host.id)
+					if !has_host_findings(host.id)
 						next
 					end
 
-					#puts "Found host with reader finding #{host.ip}"
-
 					finding_severity = 0
 
 					@info[:plugin_ids].each do |plugin_id|