risu 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ebb8f4ad04b70d5ae2feb0b759f84f2eae2a32e
-  data.tar.gz: fb2c984de176ee7b70a384eda9a2e5dd177a9151
+  metadata.gz: b5cd1e3ce6b95cafbd6932d61bf077fe216e4a60
+  data.tar.gz: 6897e5ee7f28b2289f2fa9830522778f3996e5c5
 SHA512:
-  metadata.gz: cffdae23493c7112b0044e8a53f1fc469b1ff347f337cafd99d3498b066fcd43d781aea24c0aeac4b9a5c3967f82f29336b2b058e2dde925b6bcf02a0cb257a5
-  data.tar.gz: 4604b1a85ed9e2a89c06299fe5d1784b7fae0ae6bdec5175b32d73dae55a1314a91411989d221d25ae91925d3d20b1a9473684e9b6caa0ede721946470916b65
+  metadata.gz: 71f8a12245e3cf7378773cafc6d349b8aa0728902c35b0f130c1f7be54f4555d3ef9517855b429fb521a9dab444fbd9ea66d07e24af201e9ef5e4e591dd9b4bd
+  data.tar.gz: 217fa0b9def0e3e267dd5ef0541d261df3f0bc32c6883be5168d8bba5b9a7103a05b6d4221c37e5201d940df928aea4fee8dd4a9054671d4f292db3bb0fac66d

data/NEWS.markdown

@@ -1,5 +1,11 @@
 # News
 
+#1.6.2 (March 13, 2013)
+- pci_compliance template - Correct a bug that prevented it from working. Reported by [jkordish]
+- Added Report.extra to contain any extra risu.config yaml settings to be passed to a report
+	- Check for nil before using it!
+	- It will contain all tags in the report: section of the config file
+
 #1.6.1 (March 1, 2013)
 - Models
 	- Reference Model

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.1** is the current release.
+Version **1.6.2** is the current release.
 
 ## Requirements
 
@@ -75,7 +75,7 @@ Using the risu Console is just like using Rails. You can access all of the Activ
 	|_|  |_|___/\__,_|
 
 
-	risu Console v1.6.0
+	risu Console v1.6.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>
 

data/Rakefile

@@ -21,8 +21,8 @@
 # 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.
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
 
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
@@ -38,6 +38,9 @@ end
 task :tag_and_bag do
 	system "git tag -a v#{Risu::VERSION} -m 'version #{Risu::VERSION}'"
 	system "git push --tags"
+	system "git checkout master"
+	system "git merge #{Risu::VERSION}"
+	system "git push"
 end
 
 task :release => [:tag_and_bag, :build] do

data/lib/risu.rb

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

data/lib/risu/cli/application.rb

@@ -387,6 +387,7 @@ module Risu
 					@findings.title = @report["title"]
 					@findings.company = @report["company"]
 					@findings.classification = @report["classification"]
+					@findings.extra = @report
 
 					template = Templater.new(@options[:template], @findings, @options[:output_file], @template_manager)
 					template.generate

data/lib/risu/models/report.rb

@@ -35,7 +35,7 @@ module Risu
 
 			class << self
 
-				attr_accessor :title, :author, :company, :classification
+				attr_accessor :title, :author, :company, :classification, :extra
 
 				#
 				#@scan_date = Host.where("start is not null").first[:start].to_s

data/lib/risu/templates/pci_compliance.rb

@@ -50,11 +50,11 @@ module Risu
 				text "\n\n\n"
 
 				#@hosts_count = Host.find(:all, :conditions => ["pci_dss_compliance is not null"]).count
-				@hosts_count = HostProperty.where(:name => "pci_dss_compliance").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_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")
+				@hosts_failed = HostProperty.where(:name => "pci-dss-compliance").where(:value => "failed")
 
 				output.font_size(20) do
 					output.text "Summary\n", :style => :bold
@@ -73,7 +73,8 @@ module Risu
 
 					output.text "\n"
 
-					@hosts_passed.each do |host|
+					@hosts_passed.each do |host_prop|
+						host = host_prop.host
 						text "#{host.ip} / #{host.fqdn} - passed\n"
 					end unless @hosts_passed == nil
 
@@ -89,8 +90,9 @@ module Risu
 
 					text "\n"
 
-					@hosts_failed.each do |host|
-						host_id = host.id
+					@hosts_failed.each do |host_prop|
+						host_id = host_prop.host_id
+						host = host_prop.host
 						plugin = Plugin.find(:first, :conditions => { :id => 33929 })
 						item = Item.find(:first, :conditions => { :host_id => host_id, :plugin_id => plugin.id })
 

data/lib/risu/templates/technical_findings.rb

@@ -21,8 +21,8 @@
 # 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.
+# 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 Templates

data/lib/risu/templates/template.rb

@@ -21,8 +21,8 @@
 # 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.
+# 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 Templates

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: risu
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Jacob Hammack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -246,3 +246,4 @@ signing_key:
 specification_version: 4
 summary: risu
 test_files: []
+has_rdoc: yard