uirusu 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf7de8705fa6a0e595f9c1a1781dd4936ea9df91
-  data.tar.gz: 698407a8dddc1a1b8fb9aac9de18afb33b2c4248
+  metadata.gz: cd1b2173bea70412a787d51e6968bfefe2a5af9b
+  data.tar.gz: 9c00e08d2ccc82b620f7ba1670f4c0c2b30f35c6
 SHA512:
-  metadata.gz: 1e9dc51ae0271f2640578e26572e76014d78c29125d47bab199c1715b56d273e68402da9d317ee4e47be21af698bd776359cb56138b9edba5338cd632888cf5d
-  data.tar.gz: c86b7afc18da01de6482f0eb824684fa9534207e1f19fb1bee5993031f0fe1c2425ce9401ffb5b8cd42404589d88802c3670a76f89ccf70816c0bbb863ce5cb9
+  metadata.gz: 83754cc68a7631fded5d617588239bcb5928ccd7f536bfff6c0ec46644ec85c4b04d46e77a847aef182f0d2ee3fa2b503665e0e2a07550b700de315029dbdd93
+  data.tar.gz: ffbe2e9e701597b5b47384f076c1b7b993a90c937a150f6278172627543ce8f70e56b3d2a61e4995c17938d8b315a51403d5b77a51711176c77444e805a9f350

data/NEWS.markdown

@@ -1,5 +1,9 @@
 # News
 
+# 0.0.5 (June 14, 2013)
+- Merged Pull request from [jfx41]
+- Lots of cleanup from jfx41
+
 # 0.0.4 (April 11, 2013)
 - Added Proxy support [abenson]
 - Copyright date updates

data/Rakefile

@@ -34,11 +34,11 @@ require 'rake'
 require 'rake/testtask'
 
 task :build do
-  system "gem build #{Uirusu::APP_NAME}.gemspec"
+	system "gem build #{Uirusu::APP_NAME}.gemspec"
 end
 
 task :release => :build do
-  system "gem push #{Uirusu::APP_NAME}-#{Uirusu::VERSION}.gem"
+	system "gem push #{Uirusu::APP_NAME}-#{Uirusu::VERSION}.gem"
 	puts "Just released #{Uirusu::APP_NAME} v#{Uirusu::VERSION}. #{Uirusu::APP_NAME} is rubygem for using the Virustotal web service! More information at http://arxopia.com/projects/uirusu/"
 end
 
@@ -51,6 +51,6 @@ task :default => [:test]
 
 Rake::TestTask.new("test") do |t|
 	t.libs << "test"
-  t.pattern = 'test/*/*_test.rb'
-  t.verbose = true
+	t.pattern = 'test/*/*_test.rb'
+	t.verbose = true
 end

data/lib/uirusu.rb

@@ -28,8 +28,10 @@
 
 module Uirusu
 	APP_NAME = "uirusu"
-	VERSION = "0.0.4"
+	VERSION = "0.0.5"
 	CONFIG_FILE = "~/.uirusu"
+	VT_API = "https://www.virustotal.com/vtapi/v2"
+	RESULT_FIELDS = [ :hash, :scanner, :version, :detected, :result, :md5, :sha1, :sha256, :update, :permalink, ]
 end
 
 require 'json'

data/lib/uirusu/cli/application.rb

@@ -1,20 +1,20 @@
 # Copyright (c) 2012-2013 Arxopia LLC.
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
-# Redistributions of source code must retain the above copyright notice, 
+#
+# 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 
+# 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 project's author nor the names of its contributors 
-# may be used to endorse or promote products derived from this software 
+# Neither the name of the project's author nor the names of its contributors
+# may be used to endorse or promote products derived from this software
 # without specific prior written permission.
-# 
+#
 # 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
@@ -29,7 +29,7 @@
 module Uirusu
 	module CLI
 		class Application
-		
+
 			# Creates a new instance of the [Application] class
 			#
 			def initialize
@@ -40,38 +40,44 @@ module Uirusu
 				@sites = Array.new
 				@uploads = Array.new
 			end
-		
+
 			# Parses the command the line options and returns the parsed options hash
 			#
 			# @return [Hash] of the parsed options
 			def parse_options(args)
 				begin
-					@options['output'] = :stdout
+					@options['output']  = :stdout
 					@options['verbose'] = false
-					@options[:timeout] = 25
-				
+					@options['rescan']  = false
+					@options[:timeout]  = 25
+
 					opt = OptionParser.new do |opt|
-						opt.banner =	"#{APP_NAME} v#{VERSION}\nJacob Hammack\nhttp://www.hammackj.com\n\n"
+						opt.banner = "#{APP_NAME} v#{VERSION}\nJacob Hammack\nhttp://www.arxopia.com\n\n"
 						opt.banner << "Usage: #{APP_NAME} <options>"
 						opt.separator('')
-						opt.separator("File Options")
-				
-						opt.on('-h HASH', '--search-hash HASH', 'Searches a single hash on virustotal.com') do |hash| 
+						opt.separator('File Options')
+
+						opt.on('-h HASH', '--search-hash HASH', 'Searches a single hash on virustotal.com') do |hash|
+							@hashes.push(hash)
+						end
+
+						opt.on('-r HASH[,HASH]', '--rescan-hash HASH[,HASH]', 'Requests a rescan of a single hash, or multiple hashes (comma separated), by virustotal.com') do |hash|
+							@options['rescan'] = true
 							@hashes.push(hash)
 						end
 
 						opt.on('-f FILE', '--search-hash-file FILE', 'Searches a each hash in a file of hashes on virustotal.com') do |file|
 							if File.exists?(file)
-								puts "[+] Adding file #{file}" if @options["verbose"]
+								puts "[+] Adding file #{file}" if @options['verbose']
 								@files_of_hashes.push(file)
 							else
 								puts "[!] #{file} does not exist, please check your input!\n"
 							end
 						end
-					
+
 						opt.on('-u FILE', '--upload-file FILE', 'Uploads a file to virustotal.com for analysis') do |file|
 							if File.exists?(file)
-								puts "[+] Adding file #{file}" if @options["verbose"]
+								puts "[+] Adding file #{file}" if @options['verbose']
 								@uploads.push(file)
 							else
 								puts "[!] #{file} does not exist, please check your input!\n"
@@ -80,22 +86,26 @@ module Uirusu
 
 						opt.separator('')
 						opt.separator("Url Options")
-						
-						opt.on('-s SITE', '--search-site SITE', 'Searches for a single url on virustotal.com') { |site| 
+
+						opt.on('-s SITE', '--search-site SITE', 'Searches for a single url on virustotal.com') { |site|
 							@sites.push(site)
 						}
-												
+
 						opt.separator('')
 						opt.separator('Output Options')
 
+						opt.on('-j', '--json-output', 'Print results as json to stdout') do
+							@options['output'] = :json
+						end
+
 						opt.on('-x', '--xml-output', 'Print results as xml to stdout') do
-							@options["output"] = :xml
+							@options['output'] = :xml
 						end
-			
+
 						opt.on('-y', '--yaml-output', 'Print results as yaml to stdout') do
 							@options['output'] = :yaml
 						end
-					
+
 						opt.on('--stdout-output', 'Print results as normal text line to stdout, this is default') do
 							@options['output'] = :stdout
 						end
@@ -103,10 +113,10 @@ module Uirusu
 						opt.separator ''
 						opt.separator 'Advanced Options'
 
-						opt.on('-c', '--create-config', 'Creates a skeleton config file to use') do					
+						opt.on('-c', '--create-config', 'Creates a skeleton config file to use') do
 							if File.exists?(File.expand_path(CONFIG_FILE)) == false
-								File.open(File.expand_path(CONFIG_FILE), 'w+') do |f| 
-									f.write("virustotal: \n  api-key: \n  timeout: 25\n\n") 
+								File.open(File.expand_path(CONFIG_FILE), 'w+') do |f|
+									f.write("virustotal: \n  api-key: \n  timeout: 25\n\n")
 								end
 
 								puts "[*] An empty #{File.expand_path(CONFIG_FILE)} has been created. Please edit and fill in the correct values."
@@ -122,35 +132,35 @@ module Uirusu
 						end
 
 						opt.on('--[no-]verbose', 'Print verbose information') do |v|
-							@options["verbose"] = v
+							@options['verbose'] = v
 						end
-				
+
 						opt.separator ''
 						opt.separator 'Other Options'
-				
-						opt.on('-v', '--version', "Shows application version information") do
+
+						opt.on('-v', '--version', 'Shows application version information') do
 							puts "#{APP_NAME} - #{VERSION}"
 							exit
 						end
 
-						opt.on_tail("-?", "--help", "Show this message") { |help|
+						opt.on_tail('-?', '--help', 'Show this message') { |help|
 							puts opt.to_s + "\n"
 							exit
-						} 
+						}
 					end
-							
-				  if ARGV.length != 0 
+
+				  if ARGV.length != 0
 				    opt.parse!
 				  else
 				    puts opt.to_s + "\n"
 					  exit
-					end		
+					end
 				rescue OptionParser::MissingArgument => m
 					puts opt.to_s + "\n"
 					exit
 				end
 			end
-			
+
 			# Loads the .uirusu config file for the api key
 			#
 			def load_config
@@ -161,9 +171,9 @@ module Uirusu
 					exit
 				end
 
-				@options[:timeout] = @config["virustotal"]["timeout"] if @config["virustotal"]["timeout"] != nil
+				@options[:timeout] = @config['virustotal']['timeout'] if @config['virustotal']['timeout'] != nil
 			end
-			
+
 			# Submits a file/url and waits for analysis to be complete and returns the results.
 			#
 			# @param mod
@@ -173,65 +183,91 @@ module Uirusu
 			def scan_and_wait(mod, resource, attempts)
 				method = nil
 				retries = attempts
-				
+
 				if mod.name == "Uirusu::VTFile"
-					method = mod.method :scan_file
+					STDERR.puts "[*] Attempting to rescan #{resource}" if  @options['verbose']
+					method = @options['rescan'] ? mod.method(:rescan_file) : mod.method(:scan_file)
 				else
+					STDERR.puts "[*] Attempting to upload file #{resource}" if  @options['verbose']
 					method = mod.method :scan_url
 				end
 
 				begin
-					STDERR.puts "[*] Attempting to upload file #{resource}" if  @options["verbose"]
-					result = method.call(@config["virustotal"]["api-key"], resource)					
+					result = method.call(@config['virustotal']['api-key'], resource)
 				rescue => e
-					STDERR.puts "[!] An error has occured uploading the file. Retrying 60 seconds up #{retries} retries.\n" if  @options["verbose"]
+					if @options['rescan']
+						STDERR.puts "[!] An error has occurred with the rescan request.  Retrying 60 seconds up #{retries} retries: #{e.message}\n" if  @options['verbose']
+					else
+						STDERR.puts "[!] An error has occurred uploading the file. Retrying 60 seconds up #{retries} retries.\n" if  @options['verbose']
+					end
+
 					if retries >= 0
 						sleep 60
 						retry
 						retries = retries - 1
 					end
 				end
-				
+
 				begin
-					if result['response_code']	== 1
-						results = mod.query_report(@config["virustotal"]["api-key"], result['resource'])
-						
-						while results["response_code"] != 1
-							STDERR.puts "[*] File has not been analyized yet, waiting 60 seconds to try again" if  @options["verbose"]
-							sleep 60				
-							results = mod.query_report(@config["virustotal"]["api-key"], result['resource'])
+
+					# Convert all single result replies to an array.  This is because
+					# rescan_file returns an array of results if more than one hash
+					# is requested to be rescanned.
+					result_array = result.is_a?(Array) ? result : [ result ]
+
+					result_array.collect do |result|
+						if result['response_code'] == 1
+							STDERR.puts "[*] Attempting to parse the results for: #{result['resource']}" if @options['verbose']
+							results = mod.query_report(@config['virustotal']['api-key'], result['resource'])
+
+							while results['response_code'] != 1
+								STDERR.puts "[*] File has not been analyized yet, waiting 60 seconds to try again" if  @options['verbose']
+								sleep 60
+								results = mod.query_report(@config['virustotal']['api-key'], result['resource'])
+							end
+
+							[result['resource'], results]
+							#return [result['resource'], results]
+
+						elsif result['response_code'] == 0 and @options['rescan']
+							STDERR.puts "[!] Unknown Virustotal error for rescan of #{result['resource']}." if @options['verbose']
+							next
+
+						elsif result['response_code'] == -1 and @options['rescan']
+							STDERR.puts "[!] Virustotal does not have a sample of #{result['resource']}." if @options['verbose']
+							next
+
+						elsif result['response_code'] == -2
+							STDERR.puts "[!] Virustotal limits exceeded, ***do not edit the timeout values.***"
+							exit(1)
+						else
+							nil
 						end
-					
-						return [result['resource'], results]
-					elsif result['response_code']	== -2
-						STDERR.puts "[!] Virustotal limits exceeded, ***do not edit the timeout values.***" 
-						exit(1)
-					else
-						nil
-					end	
-				rescue => e					
-					STDERR.puts "[!] An error has occurred retrieving the report. Retrying 60 seconds up #{retries} retries.\n" if  @options["verbose"]
+					end
+				rescue => e
+					STDERR.puts "[!] An error has occurred retrieving the report. Retrying 60 seconds up #{retries} retries. #{e.message}\n" if  @options['verbose']
 					if retries >= 0
 						sleep 60
 						retry
 						retries = retries - 1
-					end				
+					end
 				end
 			end
-			
+
 			#
 			#
 			def main(args)
 				parse_options(args)
 				load_config
-				
+
 				if @options['output'] == :stdout
 					output_method = :to_stdout
+				elsif @options['output'] == :json
+					output_method = :to_json
 				elsif @options['output'] == :yaml
 					output_method = :to_yaml
 				elsif @options['output'] == :xml
 					output_method = :to_xml
-					print "<results>\n"
 				end
 
 				if @options['proxy'] != nil
@@ -242,16 +278,21 @@ module Uirusu
 					@files_of_hashes.each do |file|
 						f = File.open(file, 'r')
 
-					  f.each do |hash|
-					  	hash.chomp!
-					    @hashes.push hash
-					  end
+						f.each do |hash|
+							hash.chomp!
+							@hashes.push hash
+						end
 					end
-				end		
+				end
 
 				if @hashes != nil
 					@hashes.each_with_index do |hash, index|
-						results = Uirusu::VTFile.query_report(@config["virustotal"]["api-key"], hash)
+						if @options['rescan']
+							results = scan_and_wait(Uirusu::VTFile, hash, 5)
+						else
+							results = Uirusu::VTFile.query_report(@config['virustotal']['api-key'], hash)
+						end
+
 						result = Uirusu::VTResult.new(hash, results)
 						print result.send output_method if result != nil
 						sleep @options[:timeout] if index != @hashes.length - 1
@@ -270,16 +311,13 @@ module Uirusu
 				if @uploads != nil
 					@uploads.each_with_index do |upload, index|
 						results = scan_and_wait(Uirusu::VTFile, upload, 5)
-						result = Uirusu::VTResult.new(results[0], results[1])						
+						result = Uirusu::VTResult.new(results[0], results[1])
 						print result.send output_method if result != nil
 						sleep @options[:timeout] if index != @uploads.length - 1
 					end
 				end
-
-				if @options['output'] == :xml
-					print "</results>\n"
-				end
 			end
 		end
 	end
-end
+end
+

data/lib/uirusu/vtcomment.rb

@@ -15,7 +15,7 @@
 # may be used to endorse or promote products derived from this software 
 # without specific prior written permission.
 # 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# 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 THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
@@ -30,7 +30,7 @@ module Uirusu
 	# Module for submiting comments to Virustotal.com resources using the
 	# Virustotal.com public API
 	module VTComment
-		POST_URL = "https://www.virustotal.com/vtapi/v2/comments/put"
+		POST_URL = Uirusu::VT_API + "/comments/put"
 		
 		# Submits a comment to Virustotal.com for a specific resource
 		#

data/lib/uirusu/vtfile.rb

@@ -15,7 +15,7 @@
 # may be used to endorse or promote products derived from this software
 # without specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# 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 THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
@@ -31,8 +31,9 @@ module Uirusu
 	# Module for Accessing the File scan and report functionalities of the
 	# Virustotal.com public API
 	module VTFile
-		SCAN_URL = "http://www.virustotal.com/vtapi/v2/file/scan"
-		REPORT_URL = "https://www.virustotal.com/vtapi/v2/file/report"
+		SCAN_URL   = Uirusu::VT_API + "/file/scan"
+		RESCAN_URL = Uirusu::VT_API + "/file/rescan"
+		REPORT_URL = Uirusu::VT_API + "/file/report"
 
 		# Queries a report from Virustotal.com
 		#
@@ -60,6 +61,8 @@ module Uirusu
 					JSON.parse(response)
 				when 500
 					nil
+				else
+					raise "Unknown Server error."
 			end
 		end
 
@@ -91,5 +94,36 @@ module Uirusu
 					raise "Unknown Server error."
 			end
 		end
+
+		# Requests an existing file to be rescanned.
+		#
+		# @param api_key Virustotal.com API key
+		# @param resource MD5/sha1/sha256/scan_id to rescan
+		#
+		# @return [JSON] Parsed response
+		def self.rescan_file(api_key, resource)
+			if api_key == nil
+				raise "Invalid API Key"
+			end
+
+			if resource == nil
+				raise "Invalid resource, must be md5/sha1/sha256/scan_id"
+			end
+
+			response = RestClient.post RESCAN_URL, :apikey => api_key, :resource => resource
+
+			case response.code
+				when 429
+					raise "Virustotal limit reached. Try again later."
+				when 403
+					raise "Invalid privileges, please check your API key."
+				when 200
+					JSON.parse(response)
+				when 500
+					nil
+				else
+					raise "Unknown Server error."
+			end
+		end
 	end
 end

data/lib/uirusu/vtresult.rb

@@ -28,61 +28,65 @@
 
 module Uirusu
 
-	#A wrapper class to hold all of the data for a single Virus total result
+	# A wrapper class to hold all of the data for a single Virus total result
 	class VTResult
-		def initialize hash, result
-			if result == nil
+		RESULT_FIELDS = Uirusu::RESULT_FIELDS
+
+		def initialize hash, results
+			if results == nil or results.empty?
 				return
+
+			# Take into consideration being passed an array of results.
+			# For instance, rescan_file will return an array if more than
+			# one sample is given.  This ensures single results work.
+			elsif not results.is_a? Array
+				results = [ [ hash, results ] ]
 			end
 
 			@results = Array.new
 
-			if result["response_code"] == 0
-				res = Hash.new
-				res['hash'] = hash
-				res['scanner'] = '-'
-				res['md5'] = '-'
-				res['sha1'] = '-'
-				res['sha256'] = '-'
-				res['detected'] = '-'
-				res['version'] = '-'
-				res['result']  = '-'
-				res['update'] = '-'
-				res['permalink'] = '-'
-				res['result'] = result["verbose_msg"]
-
-				@results.push res
-			elsif result["response_code"] == 0
-				puts "[!] Invalid API KEY! Please correct this! Check ~/.uirusu"
-				exit
-			else
-				permalink = result["permalink"]
-				date = result["scan_date"]
-				md5 = result["md5"]
-				sha1 = result["sha1"]
-				sha256 = result["sha256"]
-
-				result["scans"].each do |scanner, value|
-					if value != ''
-						res = Hash.new
-						res['hash'] = hash
-						res['md5'] = md5
-						res['sha1'] = sha1
-						res['sha256'] = sha256
-						res['scanner'] = scanner
-						res['detected'] = value["detected"]
-						res['version'] = value["version"]
-
-						if value["result"] == nil
-							res['result'] = "Nothing detected"
-						else
-							res['result']  = value["result"]
+			# Results will be an array of: [ [resource, result hash ] ]
+			results.each do |entry|
+				hash   = entry.first # Grab the resource (checksum hash)
+				result = entry.last  # Grab the query report
+
+				if result['response_code'] == 0
+					res = Hash.new
+					RESULT_FIELDS.each{|field| res[field] = '-' }
+					res['result'] = result['verbose_msg']
+					@results.push res
+
+				elsif result['response_code'] == 0
+					abort "[!] Invalid API KEY! Please correct this! Check ~/.uirusu"
+				else
+					permalink = result['permalink']
+					date = result['scan_date']
+					md5 = result['md5']
+					sha1 = result['sha1']
+					sha256 = result['sha256']
+	
+					result['scans'].each do |scanner, value|
+						if value != ''
+							res = Hash.new
+							res[:hash] = hash
+							res[:md5] = md5
+							res[:sha1] = sha1
+							res[:sha256] = sha256
+							res[:scanner] = scanner
+							res[:detected] = value['detected']
+							res[:version] = value['version']
+	
+							if value['result'] == nil
+								res[:result] = "Nothing detected"
+							else
+								res[:result] = value['result']
+							end
+	
+							res[:update] = value['update']
+							res[:permalink] = permalink unless permalink == nil
+	
+							@results.push res
 						end
-
-						res['update'] = value['update']
-						res['permalink'] = permalink unless permalink == nil
-
-						@results.push res
 					end
 				end
 			end
@@ -90,17 +94,8 @@ module Uirusu
 			#if we didn't have any results lets create a fake not found
 			if @results.size == 0
 				res = Hash.new
-				res['hash'] = hash
-				res['scanner'] = '-'
-				res['md5'] = '-'
-				res['sha1'] = '-'
-				res['sha256'] = '-'
-				res['permalink'] = '-'
-				res['detected'] = '-'
-				res['version'] = '-'
-				res['result']  = '-'
-				res['update'] = '-'
-				res['result'] = result["verbose_msg"]
+				RESULT_FIELDS.each{|field| res[field] = '-' }
+				res['result'] = result['verbose_msg']
 				@results.push res
 			end
 		end
@@ -109,52 +104,46 @@ module Uirusu
 		#
 		def to_stdout
 			result_string = String.new
-			@results.each do |result|
-				result_string << "#{result['hash']}: Scanner: #{result['scanner']} Result: #{result['result']}\n"
+			hashes = Array.new
+
+			@results.sort_by {|k| k[:scanner] }.each do |result|
+				unless hashes.include? result[:hash].downcase
+					result_string << "#{result[:hash]}:\n"
+					hashes << result[:hash].downcase
+				end
+				result_string << "#{result[:scanner]}: ".rjust(25) + "#{result[:result]}\n"
 			end if @results != nil
 
-			print result_string
+			result_string
 		end
 
 		#
 		#
-		def to_yaml
-			result_string = String.new
-			@results.each do |result|
-				result_string << "vtresult:\n"
-				result_string << "  hash: #{result['hash']}\n"
-				result_string << "  md5: #{result['md5']}\n"
-				result_string << "  sha1: #{result['sha1']}\n"
-				result_string << "  sha256: #{result['sha256']}\n"
-				result_string << "  scanner: #{result['scanner']}\n"
-				result_string << "  detected: #{result['detected']}\n"
-				result_string << "  date: #{result['date']}\n"
-				result_string << "  permalink: #{result['permalink']}\n" unless result['permalink'] == nil
-				result_string << "  result: #{result['result']}\n\n"
-			end if @results != nil
+		def to_json
+			JSON::pretty_generate(@results.map{|entry| { :vtresult => entry } })
+		end
 
-			print result_string
+		#
+		#
+		def to_yaml
+			@results.map{|entry| { :vtresult => entry } }.to_yaml
 		end
 
 		#
 		#
 		def to_xml
 			result_string = String.new
+			result_string << "<results>\n"
 			@results.each do |result|
 				result_string << "\t<vtresult>\n"
-				result_string << "\t\t<hash>#{result['hash']}</hash>\n"
-				result_string << "\t\t<md5>#{result['md5']}</md5>\n"
-				result_string << "\t\t<sha1>#{result['sha1']}</sha1>\n"
-				result_string << "\t\t<sha256>#{result['sha256']}</sha256>\n"
-				result_string << "\t\t<scanner>#{result['scanner']}</scanner>\n"
-				result_string << "\t\t<detected>#{result['detected']}</detected>\n"
-				result_string << "\t\t<date>#{result['date']}</date>\n"
-				result_string << "\t\t<permalink>#{result['permalink']}</permalink>\n" unless result['permalink'] == nil
-				result_string << "\t\t<result>#{result['result']}</result>\n"
+				RESULT_FIELDS.each{|field|
+					result_string << "\t\t<#{field.to_s}>#{result[field]}</#{field.to_s}>\n" unless field == :permalink and result['permalink'].nil?
+				}
 				result_string << "\t</vtresult>\n"
 			end if @results != nil
+			result_string << "</results>\n"
 
-			print result_string
+			result_string
 		end
 	end
 end

data/lib/uirusu/vturl.rb

@@ -30,8 +30,8 @@ module Uirusu
 	#
 	#
 	module VTUrl
-		SCAN_URL = "https://www.virustotal.com/vtapi/v2/url/scan"
-		REPORT_URL = "http://www.virustotal.com/vtapi/v2/url/report"
+		SCAN_URL   = Uirusu::VT_API + "/url/scan"
+		REPORT_URL = Uirusu::VT_API + "/url/report"
 
 		# Submits a URL to be scanned by Virustotal.com
 		#
@@ -91,4 +91,5 @@ module Uirusu
 			end
 		end
 	end
-end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uirusu
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jacob Hammack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json