spiceworks tab fix

lib/msf/core/db.rb

@@ -2282,6 +2282,9 @@ class DBManager
 		elsif (firstline.index("<NexposeReport"))
 			@import_filedata[:type] = "NeXpose XML Report"
 			return :nexpose_rawxml
+		elsif (firstline.index("Name,Manufacturer,Device Type,Model,IP Address,Serial Number,Location,Operating System"))
+			@import_filedata[:type] = "Spiceworks CSV Export"
+			return :spiceworks_csv
 		elsif (firstline.index("<scanJob>"))
 			@import_filedata[:type] = "Retina XML"
 			return :retina_xml
@@ -2628,6 +2631,37 @@ class DBManager
 		end
 	end
 
+	def import_spiceworks_csv(args={}, &block)
+		data = args[:data]
+		wspace = args[:wspace] || workspace
+		bl = validate_ips(args[:blacklist]) ? args[:blacklist].split : []
+
+		data.each_line do |line|
+			next if line =~ /^Name,Manufacturer,Device/ #header
+
+			split = line.split(',')
+	
+			name = split[0]
+			manufacturer = split[1]
+			device = split[2]
+			model = split[3]
+			ip = split[4]
+			serialno = split[5]
+			location = split[6]
+			os = split[7]
+	
+			conf = {
+			:workspace => wspace,
+			:host      => ip,
+			:os_name   => os,
+			:name      => name
+			}
+	
+			host = report_host(conf)
+			report_import_note(wspace, host)
+		end
+	end
+
 	#
 	# Metasploit PWDump Export
 	#