risu 1.4.4 → 1.4.5

data/lib/risu/models/item.rb

@@ -2,14 +2,14 @@
 
 module Risu
 	module Models
-		
+
 		# Item Model
 		#
 		# @author Jacob Hammack <jacob.hammack@hammackj.com>
 		class Item < ActiveRecord::Base
 			belongs_to :host
 			belongs_to :plugin
-		
+
 			class << self
 
 				# Queries for all risks in the database
@@ -18,98 +18,98 @@ module Risu
 				def risks
 					where(:severity => [0,1,2,3])
 				end
-			
+
 				# Queries for all the high risks in the database
-				# 
+				#
 				# @return [ActiveRecord::Relation] with the query results
 				def high_risks
 					where(:severity => 3)
 				end
-			
+
 				# Queries for all the medium risks in the database
 				#
-				# @return [ActiveRecord::Relation] with the query results 
+				# @return [ActiveRecord::Relation] with the query results
 				def medium_risks
 					where(:severity => 2)
 				end
-				
+
 				# Queries for all the low risks in the database
 				#
 				# @return [ActiveRecord::Relation] with the query results
 				def low_risks
 					where(:severity => 1)
 				end
-				
+
 				# Queries for all the info risks in the database
 				#
 				# @return [ActiveRecord::Relation] with the query results
 				def info_risks
 					where(:severity => 0)
 				end
-				
+
 				# Queries for all the unique high risks in the database
 				#
 				# @return [ActiveRecord::Relation] with the query results
 				def high_risks_unique
 					where(:severity => 3).joins(:plugin).order("plugins.cvss_base_score").group(:plugin_id)
 				end
-				
+
 				# Queries for all the unique high findings and sorts them by count
-				# 
+				#
 				# @return [ActiveRecord::Relation] with the query results
 				def high_risks_unique_sorted
 					select("items.*").select("count(*) as count_all").where(:severity => 3).group(:plugin_id).order("count_all DESC")
 				end
-				
+
 				# Queries for all the unique medium risks in the database
 				#
 				# @return [ActiveRecord::Relation] with the query results
 				def medium_risks_unique
 					where(:severity => 2).joins(:plugin).order(:cvss_base_score).group(:plugin_id)
 				end
-				
+
 				# Queries for all the unique medium findings and sorts them by count
-				# 
+				#
 				# @return [ActiveRecord::Relation] with the query results
 				def medium_risks_unique_sorted
 					select("items.*").select("count(*) as count_all").where(:severity => 2).group(:plugin_id).order("count_all DESC")
 				end
-				
+
 				# Queries for all the unique low risks in the database
 				#
 				# @return [ActiveRecord::Relation] with the query results
 				def low_risks_unique
 					where(:severity => 1).joins(:plugin).order(:cvss_base_score).group(:plugin_id)
 				end
-				
+
 				# Queries for all the unique low findings and sorts them by count
-				# 
+				#
 				# @return [ActiveRecord::Relation] with the query results
 				def low_risks_unique_sorted
 					select("items.*").select("count(*) as count_all").where(:severity => 1).group(:plugin_id).order("count_all DESC")
 				end
-				
+
 				# Queries for all the unique info risks in the database
 				#
 				# @return [ActiveRecord::Relation] with the query results
 				def info_risks_unique
 					where(:severity => 0).joins(:plugin).order(:cvss_base_score).group(:plugin_id)
 				end
-				
+
 				# Queries for all the unique info findings and sorts them by count
-				# 
+				#
 				# @return [ActiveRecord::Relation] with the query results
 				def info_risks_unique_sorted
 					select("items.*").select("count(*) as count_all").where(:severity => 0).group(:plugin_id).order("count_all DESC")
 				end
-				
+
 				# Queries for all the risks grouped by service type, used for the Vulnerbilities by Service graph
 				#
 				# @return [ActiveRecord::Relation] with the query results
 				def risks_by_service(limit=10)
 					select("items.*").select("count(*) as count_all").where("svc_name != 'unknown' and svc_name != 'general'").group(:svc_name).order("count_all DESC").limit(limit)
 				end
-				
+
 				# Queries for all the high risks by plugin
 				#
 				# @todo update this
@@ -118,64 +118,152 @@ module Risu
 				def risks_by_plugin(limit=10)
 					select("items.*").select("count(*) as count_all").joins(:plugin).where("plugin_id != 1").where(:severity => 3).group(:plugin_id).order("count_all DESC").limit(limit)
 				end
-				
+
 				# Queries for all the risks by host
 				#
 				# @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)
 				end
-				
+
 				# Queries for all the hosts with the Microsoft patch summary plugin (38153)
 				#
 				# @return [ActiveRecord::Relation] with the query results
 				def ms_patches
 					where(:plugin_id => 38153).joins(:host)
 				end
-				
+
 				# Queries for all host with the Microsoft Update Summary plugin(12028)
 				#
 				# @return [ActiveRecord::Relation] with the query results
 				def ms_update
 					where(:plugin_id => 12028).joins(:host)
 				end
-				
+
 				# Generates a Graph of all the risks by service
-				# 
+				#
 				# @return [StringIO] Object containing the generated PNG image
 				def risks_by_service_graph(limit=10)
 					g = Gruff::Pie.new(GRAPH_WIDTH)
-					g.title = sprintf "Top %d Findings By Service", Item.risks_by_service(limit).all.count
+					g.title = sprintf "Top %d Services By Vulnerability", Item.risks_by_service(limit).all.count
 					g.sort = false
 					g.theme = {
-						:colors => %w(red green blue orange yellow purple black grey brown pink),
+						:colors => %w(red orange yellow blue green purple black grey brown pink),
 						:background_colors => %w(white white)
 					}
 
-					Item.risks_by_service(limit).all.each { |service| 
+					Item.risks_by_service(limit).all.each { |service|
 						g.data(service.svc_name, Item.find(:all, :conditions => {:svc_name => service.svc_name}).count)
 					}
 
 					StringIO.new(g.to_blob)
 				end
 				
+				def risks_by_service_graph_text
+					"This graph is a representation of the findings found by service. This graph can help " +
+					"understand what services are running on the network and if they are vulnerable, where " +
+					"the risks are and how they should be protected."
+					
+				end
+				
+
 				# Generates a Graph of all the risks by severity
 				#
 				# @return [StringIO] Object containing the generated PNG image
 				def risks_by_severity_graph
-				  g = Gruff::Bar.new(GRAPH_WIDTH)
-				  g.title = "Findings By Severity"
-				  g.sort = false
-				  g.theme = {
-				     :background_colors => %w(white white)
-				  }
-
-				  g.data("High", Item.high_risks.count, "red") unless Item.high_risks.count == 0
-				  g.data("Medium", Item.medium_risks.count, "orange") unless Item.medium_risks.count == 0
-				  g.data("Low", Item.low_risks.count, "yellow") unless Item.low_risks.count == 0
-				  g.data("Info", Item.info_risks.count, "blue") unless Item.info_risks.count == 0
-
-				  StringIO.new(g.to_blob)
+					g = Gruff::Bar.new(GRAPH_WIDTH)
+					g.title = "Risks By Severity"
+					g.sort = false
+					g.theme = {
+						:colors => %w(red orange yellow blue green purple black grey brown pink),
+						:background_colors => %w(white white)
+					}
+
+					high = Item.high_risks.count
+					medium = Item.medium_risks.count
+					low = Item.low_risks.count
+					info = Item.info_risks.count
+					
+					if high == nil then high = 0 end
+					if medium == nil then medium = 0 end
+					if low == nil then low = 0 end		
+					if info == nil then info = 0 end
+
+					g.data("High", high, "red")
+					g.data("Medium", medium, "orange")
+					g.data("Low", low, "yellow")
+					g.data("Open Ports", info, "blue")
+
+					StringIO.new(g.to_blob)
+				end
+
+				# @todo change Report.title to a real variable
+				#
+				def risks_by_severity_graph_text
+					high = Item.high_risks.count
+					medium = Item.medium_risks.count
+					
+					if high == nil then high = 0 end
+					if medium == nil then medium = 0 end
+						
+					percentage = high
+					
+					adjective = case percentage
+						when 0..5
+							"excellent"
+						when 6..10
+							"great"
+						when 11..20
+							"very good"
+						when 21..30
+							"good"
+						when 31..40
+							"fair"
+						else
+							"poor"
+					end
+					
+					hosts_with_high = Hash.new
+					
+					Item.high_risks.all.each do |item|
+						ip = Host.find_by_id(item.host_id).name
+						if hosts_with_high[ip] == nil
+							hosts_with_high[ip] = 1
+						end
+								
+						hosts_with_high[ip] = hosts_with_high[ip] + 1
+					end
+					
+					host_percent = (hosts_with_high.count.to_f / Host.all.count.to_f) * 100
+					
+					percent_text = case host_percent
+						when 0..5			
+							"This implies that only a handful of computers are missing patches, and the current patch management is working well."
+						when 6..20
+							"This implies that there is a minor patch management issue. If there is a patch management system, it should be checked for problems. " +
+							"Each host should also be inspected to be certain it can receive patches."
+						else
+							"This implies that there is a significant patch management problem on the network. Any patch management solutions should " +
+							"be inspected for issues and they should be correct as soon as possible. Each host should also be inspected to be certain it can receive patches."
+					end
+							
+					graph_text = "This bar graph is a representation of the findings by severity; the " +
+					"graph shows that, overall, #{Report.title} has a #{adjective} handle on the patch " +
+					"management of the network.\n\n"
+					
+					graph_text << "The majority of the high findings were found on #{host_percent.round}% of the total assessed computers. #{percent_text}\n\n"
+					
+					graph_text << "The systems with high vulnerabilities represent the largest threat to the network, " +
+					"so patching this group is paramount to the overall network security. It only takes one high vulnerability " +
+					"to create a security incident.\n\n"
+					
+					graph_text << "It should be noted that low findings and open ports represent the discovery "
+					graph_text << "of network services and open ports. Typically, these are not an indication of "
+					graph_text << "a serious problem and pose little to no threat. However, the correlation of "
+					graph_text << "data between the different severity levels could be used to determine degree "
+					graph_text << "of vulnerability for a given system.\n"
+					
+					return graph_text
 				end
 			end
 		end

data/lib/risu/models/plugin.rb

@@ -64,7 +64,7 @@ module Risu
 					g.title = sprintf "Top %d High Findings By Plugin", Item.risks_by_plugin(limit).all.count
 					g.sort = false
 					g.theme = {
-						:colors => %w(red green blue orange yellow purple black grey brown pink),
+						:colors => %w(red orange yellow blue green purple black grey brown pink),
 						:background_colors => %w(white white)
 					}
 

data/lib/risu/models/report.rb

@@ -18,7 +18,17 @@ module Risu
 				#@scan_date = Host.where("start is not null").first[:start].to_s
 				#
 				def scan_date
-					Host.where("start is not null").first[:start].to_s
+					Host.where("start is not null").first[:start]
+				end
+				
+				#
+				# @todo comment this
+				#
+				def scanner_nessus_ratings_text
+					text = "The vulnerability scanner used by #{Report.company} rates the findings as follows: High, Medium, Low and Open Ports. High findings represents a security hole, initially this is the highest rating a risk can get.  These generally represent vulnerabilities that can lead to full system compromise due to missing security patches. High findings should be the first to be remediated as they generally leave the network wide open. Medium findings are considered a security warning; these are not as severe as high but should be evaluated on a risk-by-risk basis. These are typically configuration errors that can lead to information disclosures such as usernames, passwords, and configuration settings. Low findings are identified as security notes; these provide information the scanner discovered during the scanning process. The information includes items such as hostname, domain name, and MAC address. Open Port findings represent the open ports on each system that the scanner found during the scan process. These should be evaluated against firewall settings to test the firewall configurations.\n\n"  
+					text << "After the scanner is complete, the scanner evaluates each finding and bases it on the Common Vulnerability Scoring System (CVSS) score assigned to each finding. Any findings with a CVSS base score of 10 are upgraded to a Critical finding. These represent vulnerabilities that are trivial to gain administrator access to the system, with little to no effort. For more information on the CVSS scoring system please visit: http://nvd.nist.gov/cvss.cfm.\n\n"
+					
+					return text
 				end
 			end
 		end

data/lib/risu/models/serverpreference.rb

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

data/lib/risu/models/servicedescription.rb

@@ -0,0 +1,10 @@
+module Risu
+	module Models
+
+		# 
+		#
+		# @author Jacob Hammack
+		class ServiceDescription < ActiveRecord::Base
+		end
+	end
+end

data/lib/risu/parsers.rb

@@ -1,8 +1,7 @@
-# encoding: utf-8
-
 module Risu
 	module Parsers
 	end
 end
 
-#require 'risu/parsers/'
+require 'risu/parsers/nessus/nessus_document'
+require 'risu/parsers/nessus/nessus_sax_listener'

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

@@ -0,0 +1,69 @@
+# encoding: utf-8
+
+module Risu
+	module Parsers
+		module Nessus
+			# A Object to represet the Nessus xml file in memory
+			#
+			# @author Jacob Hammack <jacob.hammack@hammackj.com>
+			class NessusDocument
+
+				# Creates a instance of the NessusDocument class
+				#
+				def initialize document
+					@document = document
+				end
+
+				# Checks the validness of a NessusDocument
+				#
+				# @return [Boolean] True if valid, False if invalid
+				def valid?
+					if File.exist?(@document)
+						@parser = LibXML::XML::Parser.file @document
+						doc = @parser.parse
+
+						if doc.root.name == nil
+							return false
+						end
+				
+						if doc.root.name == "NessusClientData_v2"
+							return true
+						elsif doc.root.name == "NessusClientData"
+							return false
+						else
+							return false
+						end
+					else
+						return false
+					end
+				end
+
+				# Invokes the SAX parser on the XML document
+				#
+				def parse
+					@parser = LibXML::XML::SaxParser.file @document
+					@parser.callbacks = NessusSaxListener.new
+					@parser.parse
+				end
+
+				# Fixes the ip field if nil and replaces it with the name if its an ip
+				#
+				def fix_ips
+					@hosts = Host.all
+
+					@hosts.each do |host|
+						if host.ip == nil
+							begin
+								ip = IPAddr.new host.name
+								host.ip = ip.to_string
+								host.save
+							rescue ArgumentError => ae
+								next
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,278 @@
+# encoding: utf-8
+
+require 'risu'
+
+module Risu
+	module Parsers
+		module Nessus
+			# NessusSaxListener
+			#
+			#
+			# @author Jacob Hammack <jacob.hammack@hammackj.com>
+			class NessusSaxListener
+				include LibXML::XML::SaxParser::Callbacks
+
+				# Sets up a array of all valid xml fields
+				#
+				#
+				def initialize
+					@vals = Hash.new
+
+					@valid_elements = Array["see_also", "cve", "ReportItem", "xref", "bid", "plugin_version", "risk_factor",
+						"description", "cvss_base_score", "solution", "item", "plugin_output", "tag", "synopsis", "plugin_modification_date",
+						"FamilyName", "FamilyItem", "Status", "vuln_publication_date", "ReportHost", "HostProperties", "preferenceName",
+						"preferenceValues", "preferenceType", "fullName", "pluginId", "pluginName", "selectedValue", "selectedValue",
+						"name", "value", "preference", "plugin_publication_date", "cvss_vector", "patch_publication_date",
+						"NessusClientData_v2", "Policy", "PluginName", "ServerPreferences", "policyComments", "policyName", "PluginItem",
+						"Report", "Family", "Preferences", "PluginsPreferences", "FamilySelection", "IndividualPluginSelection", "PluginId",
+						"pci-dss-compliance", "exploitability_ease", "cvss_temporal_vector", "exploit_framework_core", "cvss_temporal_score",
+						"exploit_available", "metasploit_name", "exploit_framework_canvas", "canvas_package", "exploit_framework_metasploit",
+						"plugin_type", "cpe"]
+
+						# This makes adding new host properties really easy.
+						@valid_host_properties = {
+							"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_ ,
+							"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,
+							"system-type" => :system_type
+						}
+
+						@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
+						}
+				end
+
+				# Callback for when the start of a xml element is reached
+				#
+				# @param element
+				# @param attributes
+				def on_start_element(element, attributes)
+					@tag = element
+					@vals[@tag] = ""
+
+					if !@valid_elements.include?(element)
+						puts "New XML element detected: #{element}. Please report this to #{Risu::EMAIL}"
+					end
+
+					case element
+						when "Policy"
+							@policy = Risu::Models::Policy.create
+							@policy.save
+						when "preference"
+							@sp = @policy.server_preferences.create
+							@sp.save
+						when "item"
+							@item = @policy.plugins_preferences.create
+							@item.save
+						when "FamilyItem"
+							@family = @policy.family_selections.create
+							@family.save
+						when "PluginItem"
+							@plugin_selection = @policy.individual_plugin_selections.create
+							@plugin_selection.save
+						when "Report"
+							@report = @policy.reports.create
+							@report.name = attributes["name"]
+							@report.save
+						when "ReportHost"
+							@rh = @report.hosts.create
+							@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?
+							end
+						when "ReportItem"
+							@vals = Hash.new # have to clear this out or everything has the same references
+							@ri = @rh.items.create
+							if attributes["pluginID"] == "0"
+								@plugin = Risu::Models::Plugin.find_or_create_by_id(1)
+							else
+								@plugin = Risu::Models::Plugin.find_or_create_by_id(attributes["pluginID"])
+							end
+
+							@ri.port	= attributes["port"]
+							@ri.svc_name = attributes["svc_name"]
+							@ri.protocol = attributes["protocol"]
+							@ri.severity = attributes["severity"]
+
+							@ri.plugin_id = @plugin.id
+							@plugin.plugin_name = attributes["pluginName"]
+							@plugin.family_name = attributes["pluginFamily"]
+							@plugin.save
+							@ri.save
+					end
+				end
+
+				# Called when the inner text of a element is reached
+				#
+				# @param text
+				def on_characters(text)
+					if @vals[@tag] == nil then
+						@vals[@tag] = text
+					else
+						@vals[@tag] << text
+					end
+				end
+
+				# Called when the end of the xml element is reached
+				#
+				# @param element
+				def on_end_element(element)
+					@tag = nil
+					case element
+						when "policyName"
+							@policy.attributes = {
+								:name => @vals["policyName"]
+							}
+
+							@policy.save
+						when "policyComments"
+							@policy.attributes = {
+								:comments => @vals["policyComments"]
+							}
+
+							@policy.save
+						when "preference"
+							@sp.attributes = {
+								:name => @vals["name"],
+								:value => @vals["value"]
+							}
+							@sp.save
+
+							#This takes a really long time, there is about 34,000 pluginIDs in this
+							#field and it takes about 36 minutes to parse just this info =\
+							#lets prepopulate the plugins table with the known pluginid's
+							#if @vals["name"] == "plugin_set"
+							#	 @all_plugins = @vals["value"].split(";")
+							#
+							#	 @all_plugins.each { |p|
+							#			@plug = Plugin.find_or_create_by_id(p)
+							#			@plug.save
+							#	 }
+							#end
+						when "item"
+							@item.attributes = {
+								:plugin_name => @vals["pluginName"],
+								:plugin_id => @vals["pluginId"],
+								:fullname => @vals["fullName"],
+								:preference_name => @vals["preferenceName"],
+								:preference_type => @vals["preferenceType"],
+								:preference_values => @vals["preferenceValues"],
+								:selected_values => @vals["selectedValue"]
+							}
+
+							@item.save
+						when "FamilyItem"
+							@family.attributes = {
+								:family_name => @vals["FamilyName"],
+								:status => @vals["Status"]
+							}
+
+							@family.save
+						when "PluginItem"
+							@plugin_selection.attributes = {
+								:plugin_id => @vals["PluginId"],
+								:plugin_name => @vals["PluginName"],
+								:family => @vals["Family"],
+								:status => @vals["Status"]
+							}
+
+							@plugin_selection.save
+						when "tag"
+							@rh.attributes = {@valid_host_properties[@attr] => @vals["tag"].gsub("\n", ",") } if @valid_host_properties.keys.include?(@attr)
+							@rh.save
+						#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
+						when "cve"
+							@cve = @plugin.references.create
+							@cve.reference_name = "cve"
+							@cve.value = @vals["cve"]
+							@cve.save
+						when "bid"
+							@bid = @plugin.references.create
+							@bid.reference_name = "bid"
+							@bid.value = @vals["bid"]
+							@bid.save
+						when "see_also"
+							@see_also = @plugin.references.create
+							@see_also.reference_name = "see_also"
+							@see_also.value = @vals["see_also"]
+							@see_also.save
+						when "xref"
+							@xref = @plugin.references.create
+							@xref.reference_name = "xref"
+							@xref.value = @vals["xref"]
+							@xref.save
+						when "ReportItem"
+							@ri.plugin_output = @vals["plugin_output"]
+							@ri.save
+
+							@plugin.attributes = {
+								:solution => @vals["solution"],
+								:risk_factor => @vals["risk_factor"],
+								:description => @vals["description"],
+								:plugin_publication_date => @vals["plugin_publication_date"],
+								:synopsis => @vals["synopsis"],
+								:plugin_type => @vals["plugin_type"],
+								:cvss_vector => @vals["cvss_vector"],
+								:cvss_base_score => @vals["cvss_base_score"],
+								:vuln_publication_date => @vals["vuln_publication_date"],
+								:plugin_version => @vals["plugin_version"],
+								:cvss_temporal_score => @vals["cvss_temporal_score"],
+								:cvss_temporal_vector => @vals["cvss_temporal_vector"],
+								:exploitability_ease => @vals["exploitability_ease"],
+								:exploit_framework_core => @vals["exploit_framework_core"],
+								:exploit_available => @vals["exploit_available"],
+								:exploit_framework_metasploit => @vals["exploit_framework_metasploit"],
+								:metasploit_name => @vals["metasploit_name"],
+								:exploit_framework_canvas => @vals["exploit_framework_canvas"],
+								:canvas_package => @vals["canvas_package"],
+								:cpe => @vals["cpe"]
+							}
+							@plugin.save
+					end
+				end
+			end
+		end
+	end
+end