Signed-off-by: Ryan B <randomrhythm@rhythmengineering.com>

Author: RandomRhythm

Cuckoo/Single_Query_Module/tia.py

@@ -1,5 +1,4 @@
 #Copyright (c) 2018 Ryan Boyle randomrhythm@rhythmengineering.com.
-#All rights reserved.
 
 #This program is free software: you can redistribute it and/or modify
 #it under the terms of the GNU General Public License as published by

Cuckoo/tia.py

@@ -1,5 +1,4 @@
 #Copyright (c) 2018 Ryan Boyle randomrhythm@rhythmengineering.com.
-#All rights reserved.
 
 #This program is free software: you can redistribute it and/or modify
 #it under the terms of the GNU General Public License as published by
@@ -27,8 +26,7 @@ def run(self):
 		dictTIA = {'BitDefender': None, 'TrendMicro': None, 'Symantec': None, 'F-Secure': None, 'ESET-NOD32': None, 'DrWeb': None, 'Avira': None, 'AntiVir': None, 'Microsoft': None, 'Sophos': None, 'Panda': None, 'BitDefender': None, 'McAfee': None, 'ClamAV': None}
 		key = self.options.get("key", None)
 		if not key:
-				raise CuckooProcessingError("TIA API key not "
-											"configured, skip")
+				raise CuckooProcessingError("TIA API key not configured, skip")
 		response_data = ""
 		queryStringPart = ""
 		#print self.results["virustotal"]["results"]
@@ -50,7 +48,7 @@ def run(self):
 		try:
 			json_object = json.loads(response_data)
 		except ValueError, e:
-			CuckooProcessingError("TIA error processing combined JSON: " + response_data)
+			raise CuckooProcessingError("TIA error processing combined JSON: " + response_data)
 		#print json_object
 		return json_object
 
@@ -59,19 +57,18 @@ def tia_request(vendorQueryString, apikey): #performs HTTP GET against TIA API a
 	data = {"ApiKey": apikey}
 	timeout = 60
 	try:
-		r = requests.get(url, params=data, verify=True, timeout=int(timeout))
+		r = requests.get(url, params=data, verify=True, timeout=timeout) #set verify=False to bypass certificate verification 
 
 	except requests.exceptions.RequestException as e:
-		raise CuckooProcessingError("Unable to complete connection "
-									"to TIA: {0}".format(e))
+		raise CuckooProcessingError("Unable to complete connection to TIA: {0}".format(e))
 	return r.content
 
 def combineTIAresults(queryStringPart, vendorname, detectionName):
 	queryStringPieces = queryStringPart
 	if queryStringPieces == "":
-		queryStringPieces = vendorname + "=" + detectionName
+		queryStringPieces = "%s=%s" % (vendorname, detectionName)
 	else:
-		queryStringPieces = queryStringPieces + "&" + vendorname + "=" + detectionName	
+		queryStringPieces = queryStringPieces + "&" + "%s=%s" % (vendorname, detectionName)	
 	return queryStringPieces
 
 def is_json(myjson):

README.md

@@ -44,9 +44,10 @@ Result example from query:
 If you provide an invalid API key you will received a 401 error:
 
 `HTTP/1.1 401 Unauthorized
-<Error><Message>Authorization has been denied for this request.</Message></Error>`
+{"Message":"Authorization has been denied for this request."}`
 
 If you  go over API threshold limit of 48 a minute you will receive a 402 error:
 
-    <string>Rate limit exceeded</string>
+`"Rate limit exceeded"`
+    
 All API provided dates are in UTC. 

TIA_Example.py

@@ -1,6 +1,5 @@
 #TIA API Example
 #Copyright (c) 2018 Ryan Boyle randomrhythm@rhythmengineering.com.
-#All rights reserved.
 
 #This program is free software: you can redistribute it and/or modify
 #it under the terms of the GNU General Public License as published by

TIA_Python_Demo/TIA_Demo.py

@@ -1,5 +1,4 @@
 #Copyright (c) 2018 Ryan Boyle randomrhythm@rhythmengineering.com.
-#All rights reserved.
 
 #This program is free software: you can redistribute it and/or modify
 #it under the terms of the GNU General Public License as published by

TIA_Python_Demo/TIA__Multi_Demo.py

@@ -1,5 +1,4 @@
 #Copyright (c) 2018 Ryan Boyle randomrhythm@rhythmengineering.com.
-#All rights reserved.
 
 #This program is free software: you can redistribute it and/or modify
 #it under the terms of the GNU General Public License as published by

VBScript Example/tia.vbs

@@ -2,7 +2,6 @@
 'Looks up vendor and detection name to return URL if one exists in TIA database
 
 'Copyright (c) 2017 Ryan Boyle randomrhythm@rhythmengineering.com.
-'All rights reserved.
 
 'This program is free software: you can redistribute it and/or modify
 'it under the terms of the GNU General Public License as published by