Revert 939e6c7..a59cbc3

This rolls back to commit 939e6c7.

Author: tcstool

nosqlmap.py

@@ -34,7 +34,6 @@
 import re
 from hashlib import md5
 from threading import Thread
-import Queue
 
 #Set a list so we can track whether options are set or not to avoid resetting them in subsequent cals to the options menu.
 global optionSet
@@ -1499,10 +1498,6 @@ def stealDBs(myDB,mongoConn):
 			return
 
 def accessCheck(ip,port,pingIt):
-	global success
-	global versions
-	global creds
-	global commError
 
 	if pingIt == True:
 		test = os.system("ping -c 1 -n -W 1 " + ip + ">/dev/null")
@@ -1515,32 +1510,22 @@ def accessCheck(ip,port,pingIt):
 					dbList = conn.database_names()
 					dbVer = conn.server_info()['version']
 					conn.disconnect()
-					print "Successful default access on " + ip.rstrip() + "(Mongo Version: " + dbVer + ")."
-					success.append(ip.rstrip())
-					versions.append(dbVer)
-					return
+					return [0,dbVer]
 
 				except:
 					if str(sys.exc_info()).find('need to login') != -1:
 						conn.disconnect()
-						print "MongoDB running but credentials required on " + ip.rstrip() + "."
-						creds.append(ip.rstrip()) #Future use
-						return
+						return [1,None]
 
 					else:
 						conn.disconnect()
-						print "Successful MongoDB connection to " + ip.rstrip() + " but error executing command."
-						commError.append(ip.rstrip())
-						return
+						return [2,None]
 
 			except:
-				print "Couldn't connect to " + ip.rstrip() + "."
-				return
-		
+				return [3,None]
 
 		else:
-			print target.rstrip() + " didn't respond to ping."
-			return
+			return [4,None]
 	else:
 		try:
 			conn = pymongo.MongoClient(ip,port,connectTimeoutMS=4000,socketTimeoutMS=4000)
@@ -1549,38 +1534,26 @@ def accessCheck(ip,port,pingIt):
 				dbList = conn.database_names()
 				dbVer = conn.server_info()['version']
 				conn.disconnect()
-				print "Successful default access on " + ip.rstrip() + "(Mongo Version: " + dbVer + ")."
-				success.append(ip.rstrip())
-				versions.append(dbVer)
-				return
+				return [0,dbVer]
 
 			except:
 				if str(sys.exc_info()).find('need to login') != -1:
 					conn.disconnect()
-					print "MongoDB running but credentials required on " + ip.rstrip() + "."
-					creds.append(ip.rstrip()) #Future use
-					return
+					return [1,None]
 
 				else:
 					conn.disconnect()
-					print "Successful MongoDB connection to " + ip.rstrip() + " but error executing command."
-					commError.append(ip.rstrip())
-					return
+					return [2,None]
 
 		except:
-			print "Couldn't connect to " + ip.rstrip() + "."
-			return
+			return [3,None]	
 
 
 def massMongo():
 	global victim
 	optCheck = True
 	loadCheck = False
 	ping = False
-	global success
-	global versions
-	global creds
-	global commError
 	success = []
 	versions = []
 	creds = []
@@ -1635,10 +1608,27 @@ def massMongo():
 
 	print "\n"
 	for target in ipList:
-		#result = accessCheck(target.rstrip(),27017,ping)
+		result = accessCheck(target.rstrip(),27017,ping)
+			
+		if result[0] == 0:
+			print "Successful default access on " + target.rstrip() + "(Mongo Version: " + result[1] + ")."
+			success.append(target.rstrip())
+			versions.append(result[1])
+			
+		elif result[0] == 1:
+			print "MongoDB running but credentials required on " + target.rstrip() + "."
+			creds.append(target.rstrip()) #Future use
+			
+		elif result[0] == 2:
+			print "Successful MongoDB connection to " + target.rstrip() + " but error executing command."
+			commError.append(target.rstrip()) #Future use
 
-		t = Thread(target=accessCheck, args = (target.rstrip(), 27017, ping))
-		t.start()
+		elif result[0] == 3:
+			print "Couldn't connect to " + target.rstrip() + "."
+		
+		elif result[0] == 4:
+			print target.rstrip() + " didn't respond to ping."
+
 
 	print "\n\n"
 	select = True