Land rapid7#2266, @wchen-r7's patch forn [SeeRM rapid7#8345] and [SeeRM rapid7#8344]

Author: jvazquez-r7

modules/auxiliary/gather/corpwatch_lookup_id.rb

@@ -30,7 +30,7 @@ def initialize(info = {})
 		register_options(
 			[
 				OptString.new('CW_ID', [ true, "The CorpWatch ID of the company", ""]),
-				OptString.new('YEAR', [ false, "Year to look up", ""]),
+				OptInt.new('YEAR', [ false, "Year to look up"]),
 				OptBool.new('GET_LOCATIONS', [ false, "Get locations for company", true]),
 				OptBool.new('GET_NAMES', [ false, "Get all registered names ofr the company", true]),
 				OptBool.new('GET_FILINGS', [ false, "Get all filings", false ]),
@@ -58,7 +58,7 @@ def run
 
 		loot = ""
 		uri = "/"
-		uri << (datastore['YEAR']) if datastore['YEAR'] != ""
+		uri << (datastore['YEAR']).to_s if datastore['YEAR'].to_s != ""
 		uri << ("/companies/" + datastore['CW_ID'])
 
 		res = send_request_cgi({

modules/auxiliary/gather/corpwatch_lookup_name.rb

@@ -33,7 +33,7 @@ def initialize(info = {})
 		register_options(
 			[
 				OptString.new('COMPANY_NAME', [ true, "Search for companies with this name", ""]),
-				OptString.new('YEAR', [ false, "Limit results to a specific year", ""]),
+				OptInt.new('YEAR', [ false, "Limit results to a specific year"]),
 				OptString.new('LIMIT', [ true, "Limit the number of results returned", "5"]),
 				OptString.new('CORPWATCH_APIKEY', [ false, "Use this API key when getting the data", ""]),
 			], self.class)
@@ -56,7 +56,7 @@ def run
 		datastore['RPORT'] = 80
 
 		uri = "/"
-		uri << (datastore['YEAR'] + "/") if datastore['YEAR'] != ""
+		uri << (datastore['YEAR'].to_s + "/") if datastore['YEAR'].to_s != ""
 		uri << "companies.xml"
 
 		res = send_request_cgi(